[SCM] jigsaw packaging branch, master, updated. 482b51da720200eb1d0a7ef24dc8a9758c368927
Guillaume Mazoyer
respawneral at gmail.com
Sat Oct 8 12:23:46 UTC 2011
The following commit has been merged in the master branch:
commit 482b51da720200eb1d0a7ef24dc8a9758c368927
Author: Mandy Chung <mandy.chung at oracle.com>
Date: Sat Oct 8 13:32:42 2011 +0200
Sync with upstream Jigsaw repository.
diff --git a/.hg/cache/branchheads b/.hg/cache/branchheads
index bd5aef1..bd1daf9 100644
--- a/.hg/cache/branchheads
+++ b/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-50c6783c57480b4fd02504e0d58e5083dbf82142 364
-50c6783c57480b4fd02504e0d58e5083dbf82142 default
+3ca12a409ec831a17d5e2d3331686b001d71f780 399
+3ca12a409ec831a17d5e2d3331686b001d71f780 default
diff --git a/.hg/dirstate b/.hg/dirstate
index 209e2be..49a90e2 100644
Binary files a/.hg/dirstate and b/.hg/dirstate differ
diff --git a/.hg/store/00changelog.i b/.hg/store/00changelog.i
index d5b2dc5..b339ffa 100644
Binary files a/.hg/store/00changelog.i and b/.hg/store/00changelog.i differ
diff --git a/.hg/store/00manifest.i b/.hg/store/00manifest.i
index a3a95a4..9edbbc0 100644
Binary files a/.hg/store/00manifest.i and b/.hg/store/00manifest.i differ
diff --git a/.hg/store/data/_makefile.i b/.hg/store/data/_makefile.i
index e66e449..b4aa44a 100644
Binary files a/.hg/store/data/_makefile.i and b/.hg/store/data/_makefile.i differ
diff --git a/.hg/store/data/_r_e_a_d_m_e-builds.html.i b/.hg/store/data/_r_e_a_d_m_e-builds.html.i
index ce88349..a0384a5 100644
Binary files a/.hg/store/data/_r_e_a_d_m_e-builds.html.i and b/.hg/store/data/_r_e_a_d_m_e-builds.html.i differ
diff --git a/.hg/store/data/_r_e_a_d_m_e.i b/.hg/store/data/_r_e_a_d_m_e.i
index 6d0b854..a031796 100644
Binary files a/.hg/store/data/_r_e_a_d_m_e.i and b/.hg/store/data/_r_e_a_d_m_e.i differ
diff --git a/.hg/store/data/make/jdk-rules.gmk.i b/.hg/store/data/make/jdk-rules.gmk.i
index 8e53e1e..3e4d901 100644
Binary files a/.hg/store/data/make/jdk-rules.gmk.i and b/.hg/store/data/make/jdk-rules.gmk.i differ
diff --git a/.hg/store/data/make/jprt.gmk.i b/.hg/store/data/make/jprt.gmk.i
index 97e5381..a8b3d28 100644
Binary files a/.hg/store/data/make/jprt.gmk.i and b/.hg/store/data/make/jprt.gmk.i differ
diff --git a/.hg/store/data/make/jprt.properties.i b/.hg/store/data/make/jprt.properties.i
index 06401ec..b9d8637 100644
Binary files a/.hg/store/data/make/jprt.properties.i and b/.hg/store/data/make/jprt.properties.i differ
diff --git a/.hg/store/data/~2ehgtags.i b/.hg/store/data/~2ehgtags.i
index 4240d52..2e75a97 100644
Binary files a/.hg/store/data/~2ehgtags.i and b/.hg/store/data/~2ehgtags.i differ
diff --git a/.hg/store/undo b/.hg/store/undo
index 04c8da8..f12f787 100644
Binary files a/.hg/store/undo and b/.hg/store/undo differ
diff --git a/jdk/.hg/undo.bookmarks b/.hg/undo.bookmarks
similarity index 100%
copy from jdk/.hg/undo.bookmarks
copy to .hg/undo.bookmarks
diff --git a/.hg/undo.desc b/.hg/undo.desc
index 33091ab..61b9310 100644
--- a/.hg/undo.desc
+++ b/.hg/undo.desc
@@ -1,3 +1,3 @@
-377
+383
pull
http://hg.openjdk.java.net/jigsaw/jigsaw
diff --git a/.hg/undo.dirstate b/.hg/undo.dirstate
index 24a7a71..209e2be 100644
Binary files a/.hg/undo.dirstate and b/.hg/undo.dirstate differ
diff --git a/.hgtags b/.hgtags
index c21575d..c6d0af4 100644
--- a/.hgtags
+++ b/.hgtags
@@ -129,3 +129,10 @@ cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
+69f592185747226a9c765a9fe139c1d34d616f9c jdk8-b02
+587bb549dff83131b65f40aa51864f69562f34a7 jdk8-b03
+0b66a233bfb9ba2ebda1e5cdfdb0373d6c1e3c69 jdk8-b04
+b910aac18c772b823b1f7da03e2c6528725cc6de jdk8-b05
+28cf2aec4dd7c3c75efc1c15078522467c781a6d jdk8-b06
+0db7ae9f2b1017124c779bccd016c976928859a0 jdk8-b07
+fb1bc13260d76447e269e843859eb593fe2a8ab2 jdk8-b08
diff --git a/Makefile b/Makefile
index f36ebe5..b448040 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ OUTPUTDIR_BASENAME-fastdebug = $(ORIG_OUTPUTDIR_BASENAME)-fastdebug
REL_JDK_OUTPUTDIR = ../$(OUTPUTDIR_BASENAME-$(DEBUG_NAME))
# The created jdk image directory (legacy or module image)
-JDK_IMAGE_DIRNAME = j2sdk-image
-ifdef BUILD_MODULES
- JDK_IMAGE_DIRNAME=jdk-module-image
+JDK_IMAGE_DIRNAME=jdk-module-image
+ifdef BUILD_LEGACY
+ JDK_IMAGE_DIRNAME = j2sdk-image
endif
JDK_IMAGE_DIR = $(OUTPUTDIR)/$(JDK_IMAGE_DIRNAME)
@@ -303,25 +303,6 @@ dev-clobber:
$(MAKE) DEV_ONLY=true clobber
#
-# modules builds
-#
-
-ifndef BUILD_MODULES
-MODULES_BUILD_ARGUMENT = BUILD_MODULES=all
-else
-MODULES_BUILD_ARGUMENT = BUILD_MODULES=$(BUILD_MODULES)
-endif
-
-modules: modules-build
-
-modules-build:
- $(MAKE) $(MODULES_BUILD_ARGUMENT) all
-modules-sanity:
- $(MAKE) $(MODULES_BUILD_ARGUMENT) sanity
-modules-clobber:
- $(MAKE) $(MODULES_BUILD_ARGUMENT) clobber
-
-#
# Quick jdk verification build
#
jdk_only:
@@ -371,7 +352,7 @@ help: intro_help target_help variable_help notes_help examples_help
# Intro help message
intro_help:
@$(ECHO) "\
-Makefile for the JDK builds (all the JDK). \n\
+Makefile for the modular JDK builds (all the JDK). \n\
"
# Target help
@@ -379,7 +360,6 @@ target_help:
@$(ECHO) "\
--- Common Targets --- \n\
all -- build the core JDK (default target) \n\
-modules -- build the JDK module images\n\
help -- Print out help information \n\
check -- Check make variable values for correctness \n\
sanity -- Perform detailed sanity checks on system and settings \n\
diff --git a/README b/README
index db7346b..45b71d2 100644
--- a/README
+++ b/README
@@ -9,11 +9,14 @@ README:
will be needed.
This one root repository can be obtained with something like:
- hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7
- To make sure you have all the nested repositories, you can run:
- cd openjdk7 && sh ./get_source.sh
- (This is identical to using the Mercurial Forest Extension command
- 'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7').
+
+ hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8
+
+ To make sure you have all the nested repositories, you can run the
+ get_source.sh script located in the same respository as this file:
+
+ cd openjdk8 && sh ./get_source.sh
+
People unfamiliar with Mercurial should read the first few chapters of
the Mercurial book: http://hgbook.red-bean.com/read/
@@ -22,7 +25,7 @@ README:
Simple Build Instructions:
0. Get the necessary system software/packages installed on your system, see
- http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html
+ http://hg.openjdk.java.net/jdk8/build/raw-file/tip/README-builds.html
1. If you don't have a jdk6 installed, download and install a JDK 6 from
http://java.sun.com/javase/downloads/index.jsp
diff --git a/README-builds.html b/README-builds.html
index 87b7cd8..1761534 100644
--- a/README-builds.html
+++ b/README-builds.html
@@ -126,38 +126,15 @@
<a href="http://openjdk.java.net/guide/repositories.html#installConfig">
Developer Guide: Installing and Configuring Mercurial</a>
section for more information.
- The Forest Extension is not part of the Mercurial install,
- and is optional,
- but can be obtained with the following commands:
- <blockquote>
- <tt>
- hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ <i>YourHgForest</i>
- </tt>
- </blockquote>
- Once you have the file <tt>forest.py</tt>, you need to add these
- lines to your <tt>${HOME}/.hgrc</tt> file:
- <blockquote>
- <tt>
- [extensions]
- <br>forest = <i>YourHgForest</i>/forest.py
- </tt>
- </blockquote>
<!-- ------------------------------------------------------ -->
<h3><a name="get_source">Getting the Source</a></h3>
<blockquote>
To get the entire set of OpenJDK Mercurial repositories
- using the Forest Extension:
- <blockquote>
- <tt>
- hg fclone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
- </tt>
- </blockquote>
- To get the entire set of OpenJDK Mercurial repositories
- without using the Forest Extension:
+ use the script <code>get_source.sh</code> located in the root repository:
<blockquote>
<tt>
- hg clone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
+ hg clone http://hg.openjdk.java.net/jdk8/jdk8 <i>YourOpenJDK</i>
<br>cd <i>YourOpenJDK</i>
<br>sh ./get_source.sh
</tt>
@@ -172,9 +149,6 @@
<br>sh ./make/scripts/hgforest.sh pull -u
</tt>
</blockquote>
- You may find this script <tt>make/scripts/hgforest.sh</tt> faster
- than the <tt>hg</tt> forest commands provided by the
- Forest Extension.
</blockquote>
</blockquote>
@@ -558,7 +532,7 @@
understood that this is not ideal for the open source community.
It is possible this process could change in the future.
<br>
- <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk7/">
+ <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk8/">
Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and
JAX-WS sources.
</p>
@@ -578,7 +552,7 @@
</li>
<li>
The OpenJDK team copies this new bundle into shared
- area (e.g. <tt>/java/devtools/share/jdk7-drops</tt>).
+ area (e.g. <tt>/java/devtools/share/jdk8-drops</tt>).
Older bundles are never deleted so we retain the history.
</li>
<li>
@@ -1726,7 +1700,7 @@
The location of any source drop bundles
(see <a href="#drops">Managing the Source Drops</a>).
The default will be
- <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk7-drops</tt>.
+ <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>.
</dd>
<dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt>
<dd>
@@ -1931,7 +1905,7 @@
PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR
variables set in your shell environment.
These bat files are not easy to use from a shell environment.
- However, there is a script placed in the root jdk7 repository called
+ However, there is a script placed in the root jdk8 repository called
vsvars.sh that can help, it should only be done once in a shell
that will be doing the build, e.g.<br>
<tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>
diff --git a/corba/.hg/cache/branchheads b/corba/.hg/cache/branchheads
index 4a2fd7d..8535165 100644
--- a/corba/.hg/cache/branchheads
+++ b/corba/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-df5c4208ab66e423a6f1d3f4bf93420fb085ae50 300
-df5c4208ab66e423a6f1d3f4bf93420fb085ae50 default
+ea83b73f6983a3081875f3ccf57df394c5b7c344 326
+ea83b73f6983a3081875f3ccf57df394c5b7c344 default
diff --git a/corba/.hg/dirstate b/corba/.hg/dirstate
index 3f88c70..0f48489 100644
Binary files a/corba/.hg/dirstate and b/corba/.hg/dirstate differ
diff --git a/corba/.hg/store/00changelog.i b/corba/.hg/store/00changelog.i
index 3bad6c3..739d61a 100644
Binary files a/corba/.hg/store/00changelog.i and b/corba/.hg/store/00changelog.i differ
diff --git a/corba/.hg/store/00manifest.d b/corba/.hg/store/00manifest.d
index f5a066d..f659c89 100644
Binary files a/corba/.hg/store/00manifest.d and b/corba/.hg/store/00manifest.d differ
diff --git a/corba/.hg/store/00manifest.i b/corba/.hg/store/00manifest.i
index 93f0ebf..a27fd2f 100644
Binary files a/corba/.hg/store/00manifest.i and b/corba/.hg/store/00manifest.i differ
diff --git a/corba/.hg/store/data/~2ehgtags.i b/corba/.hg/store/data/~2ehgtags.i
index 62035ae..4817a05 100644
Binary files a/corba/.hg/store/data/~2ehgtags.i and b/corba/.hg/store/data/~2ehgtags.i differ
diff --git a/corba/.hg/store/undo b/corba/.hg/store/undo
index b9cb2ed..be685b4 100644
Binary files a/corba/.hg/store/undo and b/corba/.hg/store/undo differ
diff --git a/jdk/.hg/undo.bookmarks b/corba/.hg/undo.bookmarks
similarity index 100%
copy from jdk/.hg/undo.bookmarks
copy to corba/.hg/undo.bookmarks
diff --git a/corba/.hg/undo.desc b/corba/.hg/undo.desc
index a83c94a..1a0c757 100644
--- a/corba/.hg/undo.desc
+++ b/corba/.hg/undo.desc
@@ -1,3 +1,3 @@
-315
+318
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/corba
diff --git a/corba/.hg/undo.dirstate b/corba/.hg/undo.dirstate
index ec9bcbd..3f88c70 100644
Binary files a/corba/.hg/undo.dirstate and b/corba/.hg/undo.dirstate differ
diff --git a/corba/.hgtags b/corba/.hgtags
index 7a529a0..89819b5 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -129,3 +129,10 @@ a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01
+ed8d94519a87b4adac270c3eec9134ff1f62bff5 jdk8-b02
+cd0da00694fbce642db9be936d3e4909a71d911d jdk8-b03
+60a68d688e24473cf84dedd1e60901a61ab82555 jdk8-b04
+cc1b599b986a37cb57de4584c5e58169766ca535 jdk8-b05
+45c43dde7ba7f176333a51a98f086275478836fa jdk8-b06
+3d61f0856f349e2163bf98146465dab3b7437f63 jdk8-b07
+0d52b1c87aa8fdea7fdc9c4126ea58f95ca6b351 jdk8-b08
diff --git a/hotspot/.hg/cache/branchheads b/hotspot/.hg/cache/branchheads
index b3b622b..40dee89 100644
--- a/hotspot/.hg/cache/branchheads
+++ b/hotspot/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-738c72d9e3895a28fe349ad7d348d6c8d4cdd156 2534
-738c72d9e3895a28fe349ad7d348d6c8d4cdd156 default
+19c31a07e45edf76746d09a1100fcb20194054b2 2778
+19c31a07e45edf76746d09a1100fcb20194054b2 default
diff --git a/hotspot/.hg/dirstate b/hotspot/.hg/dirstate
index 556ad91..77c959c 100644
Binary files a/hotspot/.hg/dirstate and b/hotspot/.hg/dirstate differ
diff --git a/hotspot/.hg/store/00changelog.d b/hotspot/.hg/store/00changelog.d
index 7d9f198..384747e 100644
Binary files a/hotspot/.hg/store/00changelog.d and b/hotspot/.hg/store/00changelog.d differ
diff --git a/hotspot/.hg/store/00changelog.i b/hotspot/.hg/store/00changelog.i
index 48a9cca..a12e99c 100644
Binary files a/hotspot/.hg/store/00changelog.i and b/hotspot/.hg/store/00changelog.i differ
diff --git a/hotspot/.hg/store/00manifest.d b/hotspot/.hg/store/00manifest.d
index c6cfd5b..8955f95 100644
Binary files a/hotspot/.hg/store/00manifest.d and b/hotspot/.hg/store/00manifest.d differ
diff --git a/hotspot/.hg/store/00manifest.i b/hotspot/.hg/store/00manifest.i
index dd8d7a4..8810b00 100644
Binary files a/hotspot/.hg/store/00manifest.i and b/hotspot/.hg/store/00manifest.i differ
diff --git a/hotspot/.hg/store/data/_t_h_i_r_d___p_a_r_t_y___r_e_a_d_m_e.i b/hotspot/.hg/store/data/_t_h_i_r_d___p_a_r_t_y___r_e_a_d_m_e.i
index 25c6467..821f08e 100644
Binary files a/hotspot/.hg/store/data/_t_h_i_r_d___p_a_r_t_y___r_e_a_d_m_e.i and b/hotspot/.hg/store/data/_t_h_i_r_d___p_a_r_t_y___r_e_a_d_m_e.i differ
diff --git a/hotspot/.hg/store/data/agent/make/_makefile.i b/hotspot/.hg/store/data/agent/make/_makefile.i
index 0e89ee4..66bd094 100644
Binary files a/hotspot/.hg/store/data/agent/make/_makefile.i and b/hotspot/.hg/store/data/agent/make/_makefile.i differ
diff --git a/hotspot/.hg/store/data/agent/make/saenv.sh.i b/hotspot/.hg/store/data/agent/make/saenv.sh.i
index 9d63df9..72ee916 100644
Binary files a/hotspot/.hg/store/data/agent/make/saenv.sh.i and b/hotspot/.hg/store/data/agent/make/saenv.sh.i differ
diff --git a/hotspot/.hg/store/data/agent/make/saenv64.sh.i b/hotspot/.hg/store/data/agent/make/saenv64.sh.i
index bd54462..7496a6a 100644
Binary files a/hotspot/.hg/store/data/agent/make/saenv64.sh.i and b/hotspot/.hg/store/data/agent/make/saenv64.sh.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/_bsd_debugger_local.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/_bsd_debugger_local.c.i
new file mode 100644
index 0000000..cf78623
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/_bsd_debugger_local.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i b/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i
new file mode 100644
index 0000000..88e5eae
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/_makefile.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/_stub_debugger_local.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/_stub_debugger_local.c.i
new file mode 100644
index 0000000..a800c4d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/_stub_debugger_local.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/elfmacros.h.i b/hotspot/.hg/store/data/agent/src/os/bsd/elfmacros.h.i
new file mode 100644
index 0000000..a28f90e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/elfmacros.h.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/libproc.h.i b/hotspot/.hg/store/data/agent/src/os/bsd/libproc.h.i
new file mode 100644
index 0000000..cca7b30
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/libproc.h.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/libproc__impl.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/libproc__impl.c.i
new file mode 100644
index 0000000..bfb089d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/libproc__impl.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/libproc__impl.h.i b/hotspot/.hg/store/data/agent/src/os/bsd/libproc__impl.h.i
new file mode 100644
index 0000000..a0beac1
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/libproc__impl.h.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/mapfile.i b/hotspot/.hg/store/data/agent/src/os/bsd/mapfile.i
new file mode 100644
index 0000000..2577658
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/mapfile.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/ps__core.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/ps__core.c.i
new file mode 100644
index 0000000..6c4d2fd
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/ps__core.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/ps__proc.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/ps__proc.c.i
new file mode 100644
index 0000000..f31731e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/ps__proc.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/salibelf.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/salibelf.c.i
new file mode 100644
index 0000000..6bc1135
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/salibelf.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/salibelf.h.i b/hotspot/.hg/store/data/agent/src/os/bsd/salibelf.h.i
new file mode 100644
index 0000000..d9c11ba
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/salibelf.h.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i
new file mode 100644
index 0000000..f6fb988
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/symtab.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/symtab.h.i b/hotspot/.hg/store/data/agent/src/os/bsd/symtab.h.i
new file mode 100644
index 0000000..37a0a07
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/symtab.h.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/bsd/test.c.i b/hotspot/.hg/store/data/agent/src/os/bsd/test.c.i
new file mode 100644
index 0000000..bdbe6f5
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/os/bsd/test.c.i differ
diff --git a/hotspot/.hg/store/data/agent/src/os/solaris/_makefile.i b/hotspot/.hg/store/data/agent/src/os/solaris/_makefile.i
index 686920a..871e157 100644
Binary files a/hotspot/.hg/store/data/agent/src/os/solaris/_makefile.i and b/hotspot/.hg/store/data/agent/src/os/solaris/_makefile.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_bsd_vtbl_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_bsd_vtbl_access.java.i
new file mode 100644
index 0000000..e0b34ee
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_bsd_vtbl_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_c_l_h_s_d_b.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_c_l_h_s_d_b.java.i
index 021e81e..4ca25f0 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_c_l_h_s_d_b.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_c_l_h_s_d_b.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_command_processor.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_command_processor.java.i
index 5c92efa..aaf2edf 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_command_processor.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_command_processor.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_debug_server.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_debug_server.java.i
index 387c5ef..dace28b 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_debug_server.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_debug_server.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_h_s_d_b.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_h_s_d_b.java.i
index 4ccb4eb..4803a4e 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_h_s_d_b.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_h_s_d_b.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_agent.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_agent.java.i
index c175370..475c4c0 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_agent.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_agent.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_type_data_base.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_type_data_base.java.i
index 94bd3bc..b7c7285 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_type_data_base.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_hot_spot_type_data_base.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_test_debugger.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_test_debugger.java.i
index 2c984dc..83d3344 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_test_debugger.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/_test_debugger.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot.java.i
index 69dc48a..1f7cffd 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot_agent.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot_agent.java.i
index c3332c5..cf64754 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot_agent.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/bugspot/_bug_spot_agent.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_array_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_array_klass.java.i
new file mode 100644
index 0000000..055e4fb
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_array_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_array_klass_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_array_klass_klass.java.i
new file mode 100644
index 0000000..2e9af40
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_array_klass_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_constant.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_constant.java.i
new file mode 100644
index 0000000..6f1253d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_constant.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_env.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_env.java.i
new file mode 100644
index 0000000..a59ca1a
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_env.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_field.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_field.java.i
new file mode 100644
index 0000000..e45cd9b
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_field.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance.java.i
new file mode 100644
index 0000000..e30af73
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance_klass.java.i
new file mode 100644
index 0000000..d85f6ff
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance_klass_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance_klass_klass.java.i
new file mode 100644
index 0000000..28b724f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_instance_klass_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_klass.java.i
new file mode 100644
index 0000000..213cef2
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_klass_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_klass_klass.java.i
new file mode 100644
index 0000000..9669cd0
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_klass_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method.java.i
new file mode 100644
index 0000000..b13279a
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method_data.java.i
new file mode 100644
index 0000000..2498b48
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method_klass.java.i
new file mode 100644
index 0000000..179f53e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_method_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_obj_array_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_obj_array_klass.java.i
new file mode 100644
index 0000000..ea0aac9
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_obj_array_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_obj_array_klass_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_obj_array_klass_klass.java.i
new file mode 100644
index 0000000..009dc28
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_obj_array_klass_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_object.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_object.java.i
new file mode 100644
index 0000000..7a70e24
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_object.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_object_factory.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_object_factory.java.i
new file mode 100644
index 0000000..e1aa358
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_object_factory.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_receiver_type_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_receiver_type_data.java.i
new file mode 100644
index 0000000..9ed6ff8
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_receiver_type_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_symbol.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_symbol.java.i
new file mode 100644
index 0000000..b16e6e2
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_symbol.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type.java.i
new file mode 100644
index 0000000..e55babb
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type_array_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type_array_klass.java.i
new file mode 100644
index 0000000..9e6baf6
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type_array_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type_array_klass_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type_array_klass_klass.java.i
new file mode 100644
index 0000000..525a658
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_type_array_klass_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_virtual_call_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_virtual_call_data.java.i
new file mode 100644
index 0000000..98d2806
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ci/ci_virtual_call_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_blob.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_blob.java.i
index 29f4a60..5b80fb2 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_blob.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_blob.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_cache.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_cache.java.i
index 86e9015..af938d7 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_cache.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_code_cache.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_method_handles_adapter_blob.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_method_handles_adapter_blob.java.i
new file mode 100644
index 0000000..f45a912
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_method_handles_adapter_blob.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_n_method.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_n_method.java.i
index 7dd8061..5f88fa2 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_n_method.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_n_method.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_p_c_desc.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_p_c_desc.java.i
index 2503458..0f982e3 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_p_c_desc.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_p_c_desc.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_ricochet_blob.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_ricochet_blob.java.i
index 7ed028a..a1d18a4 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_ricochet_blob.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_ricochet_blob.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_runtime_stub.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_runtime_stub.java.i
index 894c0d9..27aaa00 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_runtime_stub.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/code/_runtime_stub.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_compile_task.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_compile_task.java.i
new file mode 100644
index 0000000..f07a1f0
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_compile_task.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_oop_map_set.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_oop_map_set.java.i
index bac94ba..00e5280 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_oop_map_set.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/compiler/_oop_map_set.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/_address_exception.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/_address_exception.java.i
index c39aca9..1a4fe2d 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/_address_exception.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/_address_exception.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_address.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_address.java.i
new file mode 100644
index 0000000..e3d7c05
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_address.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_c_debugger.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_c_debugger.java.i
new file mode 100644
index 0000000..b94ef7c
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_c_debugger.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger.java.i
new file mode 100644
index 0000000..bf0697a
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i
new file mode 100644
index 0000000..7a315de
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_debugger_local.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_oop_handle.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_oop_handle.java.i
new file mode 100644
index 0000000..1f0f4c7
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_oop_handle.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_thread.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_thread.java.i
new file mode 100644
index 0000000..f25d7b6
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_thread.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_thread_context_factory.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_thread_context_factory.java.i
new file mode 100644
index 0000000..a45bac1
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_bsd_thread_context_factory.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_shared_object.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_shared_object.java.i
new file mode 100644
index 0000000..921fa86
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/_shared_object.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/_bsd_a_m_d64_c_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/_bsd_a_m_d64_c_frame.java.i
new file mode 100644
index 0000000..f8aa7ba
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/_bsd_a_m_d64_c_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/_bsd_a_m_d64_thread_context.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/_bsd_a_m_d64_thread_context.java.i
new file mode 100644
index 0000000..b84ce46
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/_bsd_a_m_d64_thread_context.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/_bsd_x86_c_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/_bsd_x86_c_frame.java.i
new file mode 100644
index 0000000..6227341
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/_bsd_x86_c_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/_bsd_x86_thread_context.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/_bsd_x86_thread_context.java.i
new file mode 100644
index 0000000..4991b2f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/_bsd_x86_thread_context.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode.java.i
index 53603fa..dbe23d7 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_load_constant.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_load_constant.java.i
index eb1e82a..06f02c9 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_load_constant.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_load_constant.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_stream.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_stream.java.i
index 696d1ac..9cb227b 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_stream.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_stream.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_wideable.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_wideable.java.i
index 953d0f3..914ceb7 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_wideable.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_wideable.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_with_c_p_index.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_with_c_p_index.java.i
index e62d735..52ba609 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_with_c_p_index.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecode_with_c_p_index.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecodes.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecodes.java.i
index d7a13dc..402fb19 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecodes.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/interpreter/_bytecodes.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_reference_type_impl.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_reference_type_impl.java.i
index a6fc92b..be5df58 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_reference_type_impl.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_reference_type_impl.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_s_a_debug_server.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_s_a_debug_server.java.i
index f8b59fb..d0b59b6 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_s_a_debug_server.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_s_a_debug_server.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_stack_frame_impl.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_stack_frame_impl.java.i
index 01b5b4a..30d1b5e 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_stack_frame_impl.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_stack_frame_impl.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_virtual_machine_impl.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_virtual_machine_impl.java.i
index 905b7ff..7f43bf8 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_virtual_machine_impl.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/jdi/_virtual_machine_impl.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i
index c7419d7..683f89f 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/memory/_system_dictionary.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_array_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_array_data.java.i
new file mode 100644
index 0000000..f09b286
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_array_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_bit_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_bit_data.java.i
new file mode 100644
index 0000000..3275305
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_bit_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_branch_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_branch_data.java.i
new file mode 100644
index 0000000..1155968
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_branch_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_c_int_field.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_c_int_field.java.i
index 2d305fd..538ee24 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_c_int_field.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_c_int_field.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_const_method.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_const_method.java.i
index fdafec8..85f8e10 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_const_method.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_const_method.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i
index bad590b..97c40ea 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool_cache.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool_cache.java.i
index 20fa20a..e7627d6 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool_cache.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_constant_pool_cache.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_counter_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_counter_data.java.i
new file mode 100644
index 0000000..340b94c
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_counter_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_data_layout.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_data_layout.java.i
new file mode 100644
index 0000000..73fda7c
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_data_layout.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field.java.i
index 587283f..bc69ce0 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field_type.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field_type.java.i
index 4b39cfb..05f8254 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field_type.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_field_type.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_generate_oop_map.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_generate_oop_map.java.i
index 2edfca9..5e0cc87 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_generate_oop_map.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_generate_oop_map.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_instance_klass.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_instance_klass.java.i
index 2140d3e..5eea3ba 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_instance_klass.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_instance_klass.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_jump_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_jump_data.java.i
new file mode 100644
index 0000000..d4e709f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_jump_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method.java.i
index 6c560d6..c9bd2e0 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method_data.java.i
index a99eede..098deea 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method_data.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_method_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_multi_branch_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_multi_branch_data.java.i
new file mode 100644
index 0000000..140b61e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_multi_branch_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_oop_utilities.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_oop_utilities.java.i
index 8f45b8c..041c0cd 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_oop_utilities.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_oop_utilities.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_profile_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_profile_data.java.i
new file mode 100644
index 0000000..8447490
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_profile_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_receiver_type_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_receiver_type_data.java.i
new file mode 100644
index 0000000..ce238b1
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_receiver_type_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_ret_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_ret_data.java.i
new file mode 100644
index 0000000..841d84f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_ret_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_type_array.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_type_array.java.i
index b552272..ced5ae0 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_type_array.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_type_array.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_virtual_call_data.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_virtual_call_data.java.i
new file mode 100644
index 0000000..2994d5a
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/_virtual_call_data.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/java__lang___class.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/java__lang___class.java.i
index 94de117..dadd8ac 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/java__lang___class.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/oops/java__lang___class.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block.java.i
new file mode 100644
index 0000000..39d330e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block___array.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block___array.java.i
new file mode 100644
index 0000000..624afec
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block___array.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block___list.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block___list.java.i
new file mode 100644
index 0000000..88d466f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_block___list.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_dynamic_java_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_dynamic_java_node.java.i
new file mode 100644
index 0000000..ec8aecd
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_dynamic_java_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_java_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_java_node.java.i
new file mode 100644
index 0000000..7cd76f8
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_java_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_node.java.i
new file mode 100644
index 0000000..5215dc4
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_runtime_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_runtime_node.java.i
new file mode 100644
index 0000000..fe5427d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_runtime_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_static_java_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_static_java_node.java.i
new file mode 100644
index 0000000..3c246d4
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_call_static_java_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_compile.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_compile.java.i
new file mode 100644
index 0000000..7bad5d5
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_compile.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_halt_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_halt_node.java.i
new file mode 100644
index 0000000..34285cf
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_halt_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_inline_tree.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_inline_tree.java.i
new file mode 100644
index 0000000..50234f1
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_inline_tree.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_j_v_m_state.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_j_v_m_state.java.i
new file mode 100644
index 0000000..8bf98ec
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_j_v_m_state.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_loop_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_loop_node.java.i
new file mode 100644
index 0000000..a902cf8
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_loop_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_java_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_java_node.java.i
new file mode 100644
index 0000000..704649d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_java_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_node.java.i
new file mode 100644
index 0000000..bf4c5ca
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_runtime_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_runtime_node.java.i
new file mode 100644
index 0000000..4df3600
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_runtime_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_static_java_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_static_java_node.java.i
new file mode 100644
index 0000000..27afc3d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_call_static_java_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_if_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_if_node.java.i
new file mode 100644
index 0000000..e59687f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_if_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_node.java.i
new file mode 100644
index 0000000..28e152e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_return_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_return_node.java.i
new file mode 100644
index 0000000..ea6511e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_return_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_safe_point_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_safe_point_node.java.i
new file mode 100644
index 0000000..44cbe0e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_mach_safe_point_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_multi_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_multi_node.java.i
new file mode 100644
index 0000000..da2b3bb
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_multi_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node.java.i
new file mode 100644
index 0000000..5509da5
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node___array.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node___array.java.i
new file mode 100644
index 0000000..67859e4
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node___array.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node___list.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node___list.java.i
new file mode 100644
index 0000000..3c2be1d
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_node___list.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase.java.i
new file mode 100644
index 0000000..7253763
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase_c_f_g.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase_c_f_g.java.i
new file mode 100644
index 0000000..f465884
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase_c_f_g.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase_reg_alloc.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase_reg_alloc.java.i
new file mode 100644
index 0000000..8f42946
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phase_reg_alloc.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phi_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phi_node.java.i
new file mode 100644
index 0000000..738cfd0
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_phi_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_proj_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_proj_node.java.i
new file mode 100644
index 0000000..54345b0
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_proj_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_region_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_region_node.java.i
new file mode 100644
index 0000000..d5e5c33
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_region_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_root_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_root_node.java.i
new file mode 100644
index 0000000..d11da42
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_root_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_safe_point_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_safe_point_node.java.i
new file mode 100644
index 0000000..ed303d7
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_safe_point_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_type_node.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_type_node.java.i
new file mode 100644
index 0000000..0172783
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/opto/_type_node.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/prims/_jvmti_export.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/prims/_jvmti_export.java.i
new file mode 100644
index 0000000..945d421
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/prims/_jvmti_export.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiled_v_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiled_v_frame.java.i
index ab22e86..0f64b5c 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiled_v_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiled_v_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiler_thread.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiler_thread.java.i
index a95a8ec..4778175 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiler_thread.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_compiler_thread.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_frame.java.i
index 6dfc45f..5123f9f 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_instance_constructor.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_instance_constructor.java.i
new file mode 100644
index 0000000..00b172a
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_instance_constructor.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_java_v_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_java_v_frame.java.i
index 2dadbb8..dd88f81 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_java_v_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_java_v_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_stack_value.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_stack_value.java.i
index c57cfda..f7ca467 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_stack_value.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_stack_value.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_static_base_constructor.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_static_base_constructor.java.i
new file mode 100644
index 0000000..2a6e24f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_static_base_constructor.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_threads.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_threads.java.i
index b989f14..54aba98 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_threads.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_threads.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_frame.java.i
index b3b7265..75e2b42 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_m.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_m.java.i
index 04835d0..9e5c64c 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_m.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_v_m.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_base_constructor.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_base_constructor.java.i
new file mode 100644
index 0000000..ebf5283
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_base_constructor.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_constructor.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_constructor.java.i
index 496226c..0d586a5 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_constructor.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/_virtual_constructor.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/_a_m_d64_current_frame_guess.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/_a_m_d64_current_frame_guess.java.i
index f0bde4f..4e73382 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/_a_m_d64_current_frame_guess.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/_a_m_d64_current_frame_guess.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/_bsd_signals.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/_bsd_signals.java.i
new file mode 100644
index 0000000..47eaa24
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/_bsd_signals.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__amd64/_bsd_a_m_d64_java_thread_p_d_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__amd64/_bsd_a_m_d64_java_thread_p_d_access.java.i
new file mode 100644
index 0000000..cb9165f
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__amd64/_bsd_a_m_d64_java_thread_p_d_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__x86/_bsd_signals.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__x86/_bsd_signals.java.i
new file mode 100644
index 0000000..774c6c6
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__x86/_bsd_signals.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__x86/_bsd_x86_java_thread_p_d_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__x86/_bsd_x86_java_thread_p_d_access.java.i
new file mode 100644
index 0000000..05127c6
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd__x86/_bsd_x86_java_thread_p_d_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux__amd64/_linux_a_m_d64_java_thread_p_d_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux__amd64/_linux_a_m_d64_java_thread_p_d_access.java.i
index c9b06d3..ecc027f 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux__amd64/_linux_a_m_d64_java_thread_p_d_access.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux__amd64/_linux_a_m_d64_java_thread_p_d_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris__amd64/_solaris_a_m_d64_java_thread_p_d_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris__amd64/_solaris_a_m_d64_java_thread_p_d_access.java.i
index ee981f5..021a218 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris__amd64/_solaris_a_m_d64_java_thread_p_d_access.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris__amd64/_solaris_a_m_d64_java_thread_p_d_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i
index 59cf08a..89aea69 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_ricochet_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_ricochet_frame.java.i
new file mode 100644
index 0000000..46ba7ca
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/_s_p_a_r_c_ricochet_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/vm_symbols.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/vm_symbols.java.i
new file mode 100644
index 0000000..9efd323
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/vm_symbols.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__amd64/_win32_a_m_d64_java_thread_p_d_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__amd64/_win32_a_m_d64_java_thread_p_d_access.java.i
index 91489fe..0c40cde 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__amd64/_win32_a_m_d64_java_thread_p_d_access.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__amd64/_win32_a_m_d64_java_thread_p_d_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__x86/_win32_x86_java_thread_p_d_access.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__x86/_win32_x86_java_thread_p_d_access.java.i
index f045a8e..4037bd8 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__x86/_win32_x86_java_thread_p_d_access.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32__x86/_win32_x86_java_thread_p_d_access.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_frame.java.i
index c8de13f..3264820 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_frame.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_ricochet_frame.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_ricochet_frame.java.i
new file mode 100644
index 0000000..94ed982
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/_x86_ricochet_frame.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_dump.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_dump.java.i
index dcb549d..21a80bd 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_dump.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_dump.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_writer.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_writer.java.i
index 0f1da21..a20ee01 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_writer.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/_class_writer.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/_s_o_q_l.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/_s_o_q_l.java.i
index 1222235..3e072dc 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/_s_o_q_l.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/_s_o_q_l.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/_type_data_base.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/_type_data_base.java.i
index ab1c1c1..3d535bf 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/_type_data_base.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/_type_data_base.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/basic/_basic_type_data_base.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/basic/_basic_type_data_base.java.i
index 3d2d75d..d533b07 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/basic/_basic_type_data_base.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/types/basic/_basic_type_data_base.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/_command_processor_panel.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/_command_processor_panel.java.i
index e75c76d..8c0639b 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/_command_processor_panel.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/_command_processor_panel.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/_h_t_m_l_generator.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/_h_t_m_l_generator.java.i
index 4545d9b..9d709b5 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/_h_t_m_l_generator.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/_h_t_m_l_generator.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_constant_tag.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_constant_tag.java.i
index b7fd167..ba3b0da 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_constant_tag.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_constant_tag.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_generic_growable_array.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_generic_growable_array.java.i
new file mode 100644
index 0000000..2be411e
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_generic_growable_array.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_growable_array.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_growable_array.java.i
new file mode 100644
index 0000000..259fe3c
Binary files /dev/null and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_growable_array.java.i differ
diff --git a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i
index 4e04ffc..f384847 100644
Binary files a/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i and b/hotspot/.hg/store/data/agent/src/share/classes/sun/jvm/hotspot/utilities/_platform_info.java.i differ
diff --git a/hotspot/.hg/store/data/agent/test/jdi/sasanity.sh.i b/hotspot/.hg/store/data/agent/test/jdi/sasanity.sh.i
index e669f71..635ba4e 100644
Binary files a/hotspot/.hg/store/data/agent/test/jdi/sasanity.sh.i and b/hotspot/.hg/store/data/agent/test/jdi/sasanity.sh.i differ
diff --git a/hotspot/.hg/store/data/make/_makefile.i b/hotspot/.hg/store/data/make/_makefile.i
index 4ba4bfa..3cfe310 100644
Binary files a/hotspot/.hg/store/data/make/_makefile.i and b/hotspot/.hg/store/data/make/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/_makefile.i b/hotspot/.hg/store/data/make/bsd/_makefile.i
new file mode 100644
index 0000000..b143108
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/_r_e_a_d_m_e.i b/hotspot/.hg/store/data/make/bsd/_r_e_a_d_m_e.i
new file mode 100644
index 0000000..70694dd
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/_r_e_a_d_m_e.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/adlc__updater.i b/hotspot/.hg/store/data/make/bsd/adlc__updater.i
new file mode 100644
index 0000000..7d08faf
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/adlc__updater.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/build.sh.i b/hotspot/.hg/store/data/make/bsd/build.sh.i
new file mode 100644
index 0000000..ed5716a
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/build.sh.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/adjust-mflags.sh.i b/hotspot/.hg/store/data/make/bsd/makefiles/adjust-mflags.sh.i
new file mode 100644
index 0000000..0e51a44
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/adjust-mflags.sh.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i
new file mode 100644
index 0000000..cd97807
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/adlc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/amd64.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/amd64.make.i
new file mode 100644
index 0000000..a2aab41
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/amd64.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/arm.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/arm.make.i
new file mode 100644
index 0000000..4051599
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/arm.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/build__vm__def.sh.i b/hotspot/.hg/store/data/make/bsd/makefiles/build__vm__def.sh.i
new file mode 100644
index 0000000..d8e5e9a
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/build__vm__def.sh.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i
new file mode 100644
index 0000000..51e88c2
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/compiler1.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/compiler1.make.i
new file mode 100644
index 0000000..9a12c2c
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/compiler1.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/compiler2.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/compiler2.make.i
new file mode 100644
index 0000000..dca2e45
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/compiler2.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/core.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/core.make.i
new file mode 100644
index 0000000..42da6ab
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/core.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/cscope.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/cscope.make.i
new file mode 100644
index 0000000..6f8292e
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/cscope.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/debug.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/debug.make.i
new file mode 100644
index 0000000..a9381eb
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/debug.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i
new file mode 100644
index 0000000..3595e0d
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i
new file mode 100644
index 0000000..84e0140
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/dtrace.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/fastdebug.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/fastdebug.make.i
new file mode 100644
index 0000000..10e0d35
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/fastdebug.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i
new file mode 100644
index 0000000..97ff349
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/hp.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/hp.make.i
new file mode 100644
index 0000000..5b4d5d6
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/hp.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/hp1.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/hp1.make.i
new file mode 100644
index 0000000..c8c8634
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/hp1.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/i486.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/i486.make.i
new file mode 100644
index 0000000..4bc4a7c
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/i486.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/ia64.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/ia64.make.i
new file mode 100644
index 0000000..684829c
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/ia64.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/jsig.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/jsig.make.i
new file mode 100644
index 0000000..33a8f36
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/jsig.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/jvmg.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/jvmg.make.i
new file mode 100644
index 0000000..cfff6ad
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/jvmg.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/jvmti.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/jvmti.make.i
new file mode 100644
index 0000000..1b4df48
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/jvmti.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i
new file mode 100644
index 0000000..9c4daef
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/launcher.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-debug.i b/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-debug.i
new file mode 100644
index 0000000..b8d3366
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-debug.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-jsig.i b/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-jsig.i
new file mode 100644
index 0000000..fce4691
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-jsig.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-product.i b/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-product.i
new file mode 100644
index 0000000..090624f
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/mapfile-vers-product.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/optimized.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/optimized.make.i
new file mode 100644
index 0000000..9b363bd
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/optimized.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/ppc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/ppc.make.i
new file mode 100644
index 0000000..f749ada
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/ppc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i
new file mode 100644
index 0000000..4ddd182
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/profiled.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/profiled.make.i
new file mode 100644
index 0000000..1ec8f64
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/profiled.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i
new file mode 100644
index 0000000..3e7734c
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/rules.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i
new file mode 100644
index 0000000..c4146d0
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i
new file mode 100644
index 0000000..0787b14
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/saproc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/shark.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/shark.make.i
new file mode 100644
index 0000000..316dfdb
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/shark.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sparc.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sparc.make.i
new file mode 100644
index 0000000..13059f7
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/sparc.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i
new file mode 100644
index 0000000..d60fb45
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/sparc_works.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/sparcv9.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/sparcv9.make.i
new file mode 100644
index 0000000..e9c61f5
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/sparcv9.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/tiered.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/tiered.make.i
new file mode 100644
index 0000000..1a42646
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/tiered.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i
new file mode 100644
index 0000000..c646ca6
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/top.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i
new file mode 100644
index 0000000..eb92e32
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/zero.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/zero.make.i
new file mode 100644
index 0000000..cc5e687
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/zero.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/makefiles/zeroshark.make.i b/hotspot/.hg/store/data/make/bsd/makefiles/zeroshark.make.i
new file mode 100644
index 0000000..507cfc5
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/makefiles/zeroshark.make.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__amd64.i b/hotspot/.hg/store/data/make/bsd/platform__amd64.i
new file mode 100644
index 0000000..8015dfb
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__amd64.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__amd64.suncc.i b/hotspot/.hg/store/data/make/bsd/platform__amd64.suncc.i
new file mode 100644
index 0000000..bc08f03
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__amd64.suncc.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__i486.i b/hotspot/.hg/store/data/make/bsd/platform__i486.i
new file mode 100644
index 0000000..16e0c71
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__i486.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__i486.suncc.i b/hotspot/.hg/store/data/make/bsd/platform__i486.suncc.i
new file mode 100644
index 0000000..6254605
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__i486.suncc.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__ia64.i b/hotspot/.hg/store/data/make/bsd/platform__ia64.i
new file mode 100644
index 0000000..4ed05fe
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__ia64.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__sparc.i b/hotspot/.hg/store/data/make/bsd/platform__sparc.i
new file mode 100644
index 0000000..a7b9fe6
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__sparc.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__sparcv9.i b/hotspot/.hg/store/data/make/bsd/platform__sparcv9.i
new file mode 100644
index 0000000..18227e6
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__sparcv9.i differ
diff --git a/hotspot/.hg/store/data/make/bsd/platform__zero.in.i b/hotspot/.hg/store/data/make/bsd/platform__zero.in.i
new file mode 100644
index 0000000..bbe0bc0
Binary files /dev/null and b/hotspot/.hg/store/data/make/bsd/platform__zero.in.i differ
diff --git a/hotspot/.hg/store/data/make/cscope.make.i b/hotspot/.hg/store/data/make/cscope.make.i
index 8a6f8ed..296ce7c 100644
Binary files a/hotspot/.hg/store/data/make/cscope.make.i and b/hotspot/.hg/store/data/make/cscope.make.i differ
diff --git a/hotspot/.hg/store/data/make/defs.make.i b/hotspot/.hg/store/data/make/defs.make.i
index 76b306f..dd8a94b 100644
Binary files a/hotspot/.hg/store/data/make/defs.make.i and b/hotspot/.hg/store/data/make/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/hotspot__version.i b/hotspot/.hg/store/data/make/hotspot__version.i
index 6ac1eaa..bcee8a9 100644
Binary files a/hotspot/.hg/store/data/make/hotspot__version.i and b/hotspot/.hg/store/data/make/hotspot__version.i differ
diff --git a/hotspot/.hg/store/data/make/jprt.gmk.i b/hotspot/.hg/store/data/make/jprt.gmk.i
index 0ab60a0..9bfb12b 100644
Binary files a/hotspot/.hg/store/data/make/jprt.gmk.i and b/hotspot/.hg/store/data/make/jprt.gmk.i differ
diff --git a/hotspot/.hg/store/data/make/linux/_makefile.i b/hotspot/.hg/store/data/make/linux/_makefile.i
index d3a40bd..a636b6d 100644
Binary files a/hotspot/.hg/store/data/make/linux/_makefile.i and b/hotspot/.hg/store/data/make/linux/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/linux/build.sh.i b/hotspot/.hg/store/data/make/linux/build.sh.i
index d85cb77..3f7ac00 100644
Binary files a/hotspot/.hg/store/data/make/linux/build.sh.i and b/hotspot/.hg/store/data/make/linux/build.sh.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/arm.make.i b/hotspot/.hg/store/data/make/linux/makefiles/arm.make.i
index f773bee..044763f 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/arm.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/arm.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/build__vm__def.sh.i b/hotspot/.hg/store/data/make/linux/makefiles/build__vm__def.sh.i
index 78a2c64..c3d801a 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/build__vm__def.sh.i and b/hotspot/.hg/store/data/make/linux/makefiles/build__vm__def.sh.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i
index 9af3b02..2e4f537 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i b/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i
index d69d4e1..af14582 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i
index 3e721f9..de44581 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/gcc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/jsig.make.i b/hotspot/.hg/store/data/make/linux/makefiles/jsig.make.i
index 1ecb20e..ca0cd4c 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/jsig.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/jsig.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-debug.i b/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-debug.i
index dd19939..e98f716 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-debug.i and b/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-debug.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-product.i b/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-product.i
index 9015cfa..124130f 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-product.i and b/hotspot/.hg/store/data/make/linux/makefiles/mapfile-vers-product.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i
index 9638885..e0c2fda 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/ppc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/product.make.i b/hotspot/.hg/store/data/make/linux/makefiles/product.make.i
index 2ec4350..e6fe164 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/product.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/sa.make.i b/hotspot/.hg/store/data/make/linux/makefiles/sa.make.i
index 9130f4e..dcb6703 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/sa.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i b/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i
index 3dfa935..62783d3 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/saproc.make.i differ
diff --git a/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i b/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i
index 4e44aaf..3049d19 100644
Binary files a/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/linux/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/sa.files.i b/hotspot/.hg/store/data/make/sa.files.i
index 23542eb..dacc7b0 100644
Binary files a/hotspot/.hg/store/data/make/sa.files.i and b/hotspot/.hg/store/data/make/sa.files.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/_makefile.i b/hotspot/.hg/store/data/make/solaris/_makefile.i
index 5356ffb..a9b1193 100644
Binary files a/hotspot/.hg/store/data/make/solaris/_makefile.i and b/hotspot/.hg/store/data/make/solaris/_makefile.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/build__vm__def.sh.i b/hotspot/.hg/store/data/make/solaris/makefiles/build__vm__def.sh.i
new file mode 100644
index 0000000..26fd244
Binary files /dev/null and b/hotspot/.hg/store/data/make/solaris/makefiles/build__vm__def.sh.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i
index 6f69b42..5d4ac84 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/buildtree.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/debug.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/debug.make.i
index b3a224d..c5ed893 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/debug.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/debug.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i
index 83bdd50..cf2455c 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i
index eef6214..1d3ea34 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/dtrace.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/fastdebug.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/fastdebug.make.i
index d56c2fc..216908b 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/fastdebug.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/fastdebug.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/jsig.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/jsig.make.i
index d8b62bc..6521e87 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/jsig.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/jsig.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/jvmg.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/jvmg.make.i
index 322973e..3dc25f1 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/jvmg.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/jvmg.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/mapfile-vers.i b/hotspot/.hg/store/data/make/solaris/makefiles/mapfile-vers.i
index 217e241..a88ba91 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/mapfile-vers.i and b/hotspot/.hg/store/data/make/solaris/makefiles/mapfile-vers.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/optimized.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/optimized.make.i
index fe4a006..510f728 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/optimized.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/optimized.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i
index 5a34bd5..20fcb5b 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/product.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/sa.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/sa.make.i
index 8731751..7c3daf2 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/sa.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i
index d8bb07c..fcf0a9c 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/saproc.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i
index 8115809..b8e19c1 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/sparc_works.make.i differ
diff --git a/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i b/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i
index 1b4ad2c..0b7b3cd 100644
Binary files a/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i and b/hotspot/.hg/store/data/make/solaris/makefiles/vm.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i b/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i
index aba5552..93aea6c 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/compile.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i b/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i
index 0acb90f..3452a9a 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/defs.make.i differ
diff --git a/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i b/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i
index f581e74..9d509e6 100644
Binary files a/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i and b/hotspot/.hg/store/data/make/windows/makefiles/sa.make.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.cpp.i
index 9ab2e4b..614f16c 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i
index 343943d..ee9fc44 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i
index 5da1cc9..40775e6 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/assembler__sparc.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i
index 7f9a52b..17a14e6 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___code_stubs__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i
index 0e1e641..8185e6b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_assembler__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_generator__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_generator__sparc.cpp.i
index f8d6304..c696432 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_generator__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___l_i_r_generator__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___macro_assembler__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___macro_assembler__sparc.cpp.i
index ee0be39..7be23d6 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___macro_assembler__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___macro_assembler__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i
index ddcf74f..699908b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/c1___runtime1__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i
index 4567bc3..5d3cabd 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/copy__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i
index edb857e..ae546ea 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/cpp_interpreter__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i
index 2d0dce1..921eae7 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.hpp.i
index 9bf07ba..678491f 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/frame__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.cpp.i
index eaa1cdb..a124f67 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.hpp.i
index 8303215..acbbe94 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/interp__masm__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/interpreter__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/interpreter__sparc.cpp.i
index 66f5a6e..43ef093 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/interpreter__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/interpreter__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i
index ffb23f5..7f7cab4 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/method_handles__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i
index 825a707..90d9c0f 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/shared_runtime__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i
index d064d14..b89c3fb 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/sparc.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/stub_generator__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/stub_generator__sparc.cpp.i
index 747ad95..43f1f74 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/stub_generator__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/stub_generator__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i
index 7fddd36..9d37d12 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/template_interpreter__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/template_table__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/template_table__sparc.cpp.i
index 515fbd8..d65c1f5 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/template_table__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/template_table__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i
index 13fe792..00ae964 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.hpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.hpp.i
index 0514704..7ab964d 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.hpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/vm__version__sparc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/sparc/vm/vtable_stubs__sparc.cpp.i b/hotspot/.hg/store/data/src/cpu/sparc/vm/vtable_stubs__sparc.cpp.i
index 39a25c2..4c76272 100644
Binary files a/hotspot/.hg/store/data/src/cpu/sparc/vm/vtable_stubs__sparc.cpp.i and b/hotspot/.hg/store/data/src/cpu/sparc/vm/vtable_stubs__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i
index 0f0dcbf..b3ba328 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i
index e0df484..ddedbaf 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/assembler__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/bytes__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/bytes__x86.hpp.i
index 8e2e039..9f86a56 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/bytes__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/bytes__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i
index 9d492d6..380d56f 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.hpp.i
index 4d60533..e4d10f9 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_assembler__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_generator__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_generator__x86.cpp.i
index f8616c0..6ef5a62 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_generator__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___l_i_r_generator__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i
index 0a498c9..0c44cb7 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/c1___runtime1__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/copy__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/copy__x86.hpp.i
index b969d0e..b021588 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/copy__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/copy__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i
index 3ead680..c51c9f9 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/frame__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i
index b8f2a8a..e06e5da 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/globals__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.cpp.i
index 9fbae20..ec552b8 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.hpp.i
index c6774c0..903f3b8 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__32.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.cpp.i
index 56ee516..38fd03c 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.hpp.i
index 1b628bb..ca58879 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/interp__masm__x86__64.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i b/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i
index 1d8cb2a..d611c5e 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/jni__x86.h.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i
index 2a001d8..06dd762 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i
index 7094964..411087b 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/method_handles__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i
index eb13669..2d969fe 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i
index c7580af..c8612b1 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/shared_runtime__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__32.cpp.i
index 9828966..748cfef 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i
index daf23b1..71556f5 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_generator__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__32.cpp.i
index 57ebd49..fed2744 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i
index 45940f6..1c37347 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/stub_routines__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__32.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__32.cpp.i
index 3834d84..7ceaf50 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__32.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__32.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__64.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__64.cpp.i
index e3483f4..12c1166 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__64.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/template_table__x86__64.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i
index b429633..df71c1c 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i
index ffbd6b3..f289857 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/vm__version__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i
index 58cf8a3..4644869 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i
index 570b76b..593026a 100644
Binary files a/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i and b/hotspot/.hg/store/data/src/cpu/x86/vm/x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/bytes__zero.hpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/bytes__zero.hpp.i
index 8d44728..0e5eb2e 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/bytes__zero.hpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/bytes__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i
index b028259..ae96c89 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/frame__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/globals__zero.hpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/globals__zero.hpp.i
index b589865..5bdc5e1 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/globals__zero.hpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/globals__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/interp__masm__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/interp__masm__zero.cpp.i
index dfbfc2f..6a3daaf 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/interp__masm__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/interp__masm__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/method_handles__zero.hpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/method_handles__zero.hpp.i
new file mode 100644
index 0000000..042330f
Binary files /dev/null and b/hotspot/.hg/store/data/src/cpu/zero/vm/method_handles__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/shared_runtime__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/shared_runtime__zero.cpp.i
index 3754784..364aa54 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/shared_runtime__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/shared_runtime__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/stack__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/stack__zero.cpp.i
index 7070e29..c514c14 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/stack__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/stack__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/stub_generator__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/stub_generator__zero.cpp.i
index d0b1598..6502102 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/stub_generator__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/stub_generator__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/stub_routines__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/stub_routines__zero.cpp.i
index ef119c7..7568382 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/stub_routines__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/stub_routines__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/cpu/zero/vm/vm__version__zero.cpp.i b/hotspot/.hg/store/data/src/cpu/zero/vm/vm__version__zero.cpp.i
index 9f17442..3a336dd 100644
Binary files a/hotspot/.hg/store/data/src/cpu/zero/vm/vm__version__zero.cpp.i and b/hotspot/.hg/store/data/src/cpu/zero/vm/vm__version__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i
new file mode 100644
index 0000000..aa02958
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/attach_listener__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/c1__globals__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/c1__globals__bsd.hpp.i
new file mode 100644
index 0000000..039a6bc
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/c1__globals__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/c2__globals__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/c2__globals__bsd.hpp.i
new file mode 100644
index 0000000..c5dde31
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/c2__globals__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/chaitin__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/chaitin__bsd.cpp.i
new file mode 100644
index 0000000..7f8c506
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/chaitin__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/decoder__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/decoder__bsd.cpp.i
new file mode 100644
index 0000000..7571f8d
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/decoder__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i
new file mode 100644
index 0000000..b9e26c5
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/dtrace_j_s_d_t__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/globals__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/globals__bsd.hpp.i
new file mode 100644
index 0000000..cc973ee
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/globals__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/interface_support__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/interface_support__bsd.hpp.i
new file mode 100644
index 0000000..28b4d17
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/interface_support__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/jsig.c.i b/hotspot/.hg/store/data/src/os/bsd/vm/jsig.c.i
new file mode 100644
index 0000000..cada7c8
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/jsig.c.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.cpp.i
new file mode 100644
index 0000000..b3dd3cb
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i b/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i
new file mode 100644
index 0000000..9ab8e3e
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/jvm__bsd.h.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/mutex__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/mutex__bsd.cpp.i
new file mode 100644
index 0000000..74c33dd
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/mutex__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/mutex__bsd.inline.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/mutex__bsd.inline.hpp.i
new file mode 100644
index 0000000..fbf90e9
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/mutex__bsd.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i
new file mode 100644
index 0000000..df6cb86
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.hpp.i
new file mode 100644
index 0000000..a8e67e8
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.inline.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.inline.hpp.i
new file mode 100644
index 0000000..52d85b4
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/os__bsd.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os__share__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os__share__bsd.hpp.i
new file mode 100644
index 0000000..e4ad5a0
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/os__share__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i
new file mode 100644
index 0000000..54d1c94
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i
new file mode 100644
index 0000000..1354597
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/os_thread__bsd.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/perf_memory__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/perf_memory__bsd.cpp.i
new file mode 100644
index 0000000..63d5460
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/perf_memory__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/stub_routines__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/stub_routines__bsd.cpp.i
new file mode 100644
index 0000000..284291b
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/stub_routines__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/thread__bsd.inline.hpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/thread__bsd.inline.hpp.i
new file mode 100644
index 0000000..442b886
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/thread__bsd.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/thread_critical__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/thread_critical__bsd.cpp.i
new file mode 100644
index 0000000..4828cb3
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/thread_critical__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/bsd/vm/vm_error__bsd.cpp.i b/hotspot/.hg/store/data/src/os/bsd/vm/vm_error__bsd.cpp.i
new file mode 100644
index 0000000..68d64b7
Binary files /dev/null and b/hotspot/.hg/store/data/src/os/bsd/vm/vm_error__bsd.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i
index b325993..cd66b95 100644
Binary files a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i and b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.hpp.i b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.hpp.i
index 75e1d5d..6202b70 100644
Binary files a/hotspot/.hg/store/data/src/os/linux/vm/os__linux.hpp.i and b/hotspot/.hg/store/data/src/os/linux/vm/os__linux.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i b/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i
index 6441718..7216848 100644
Binary files a/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i and b/hotspot/.hg/store/data/src/os/posix/launcher/java__md.c.i differ
diff --git a/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i b/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i
index 0435740..7901ec2 100644
Binary files a/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i and b/hotspot/.hg/store/data/src/os/posix/launcher/launcher.script.i differ
diff --git a/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i b/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i
index 03dd841..a56a14a 100644
Binary files a/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i and b/hotspot/.hg/store/data/src/os/solaris/vm/os__solaris.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.cpp.i b/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.cpp.i
index 5d00f1f..e81c2c3 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.cpp.i and b/hotspot/.hg/store/data/src/os/windows/vm/decoder__windows.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/jvm__windows.h.i b/hotspot/.hg/store/data/src/os/windows/vm/jvm__windows.h.i
index ccecba9..5dbdbd3 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/jvm__windows.h.i and b/hotspot/.hg/store/data/src/os/windows/vm/jvm__windows.h.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i
index c156139..e33c09d 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i and b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.hpp.i b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.hpp.i
index 95c4d1b..56fe30a 100644
Binary files a/hotspot/.hg/store/data/src/os/windows/vm/os__windows.hpp.i and b/hotspot/.hg/store/data/src/os/windows/vm/os__windows.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/assembler__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/assembler__bsd__x86.cpp.i
new file mode 100644
index 0000000..d476039
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/assembler__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/atomic__bsd__x86.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/atomic__bsd__x86.inline.hpp.i
new file mode 100644
index 0000000..8216423
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/atomic__bsd__x86.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i
new file mode 100644
index 0000000..7accbbe
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i
new file mode 100644
index 0000000..290cad8
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__32.s.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i
new file mode 100644
index 0000000..f3ea081
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.s.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.s.i
new file mode 100644
index 0000000..3be19e6
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bsd__x86__64.s.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bytes__bsd__x86.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bytes__bsd__x86.inline.hpp.i
new file mode 100644
index 0000000..49432bb
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/bytes__bsd__x86.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/copy__bsd__x86.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/copy__bsd__x86.inline.hpp.i
new file mode 100644
index 0000000..b106516
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/copy__bsd__x86.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/globals__bsd__x86.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/globals__bsd__x86.hpp.i
new file mode 100644
index 0000000..66233b9
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/globals__bsd__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/order_access__bsd__x86.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/order_access__bsd__x86.inline.hpp.i
new file mode 100644
index 0000000..10319ad
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/order_access__bsd__x86.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i
new file mode 100644
index 0000000..201db20
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.hpp.i
new file mode 100644
index 0000000..c1ac042
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/os__bsd__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/prefetch__bsd__x86.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/prefetch__bsd__x86.inline.hpp.i
new file mode 100644
index 0000000..55a247d
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/prefetch__bsd__x86.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread__bsd__x86.cpp.i
new file mode 100644
index 0000000..abb75f0
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread__bsd__x86.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread__bsd__x86.hpp.i
new file mode 100644
index 0000000..0aa7ba2
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread__bsd__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread_l_s__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread_l_s__bsd__x86.cpp.i
new file mode 100644
index 0000000..2d4dd10
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread_l_s__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread_l_s__bsd__x86.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread_l_s__bsd__x86.hpp.i
new file mode 100644
index 0000000..978241c
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/thread_l_s__bsd__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm__version__bsd__x86.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm__version__bsd__x86.cpp.i
new file mode 100644
index 0000000..e37a44b
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm__version__bsd__x86.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i
new file mode 100644
index 0000000..98ef22f
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__x86/vm/vm_structs__bsd__x86.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/assembler__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/assembler__bsd__zero.cpp.i
new file mode 100644
index 0000000..52e6951
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/assembler__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/atomic__bsd__zero.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/atomic__bsd__zero.inline.hpp.i
new file mode 100644
index 0000000..97211b1
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/atomic__bsd__zero.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i
new file mode 100644
index 0000000..b273eb0
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/bytes__bsd__zero.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/globals__bsd__zero.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/globals__bsd__zero.hpp.i
new file mode 100644
index 0000000..8940c1b
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/globals__bsd__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/order_access__bsd__zero.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/order_access__bsd__zero.inline.hpp.i
new file mode 100644
index 0000000..73682b1
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/order_access__bsd__zero.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i
new file mode 100644
index 0000000..4031942
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.hpp.i
new file mode 100644
index 0000000..54056b8
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/os__bsd__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/prefetch__bsd__zero.inline.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/prefetch__bsd__zero.inline.hpp.i
new file mode 100644
index 0000000..a3a91f0
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/prefetch__bsd__zero.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread__bsd__zero.cpp.i
new file mode 100644
index 0000000..39550d0
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread__bsd__zero.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread__bsd__zero.hpp.i
new file mode 100644
index 0000000..3db006f
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread__bsd__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread_l_s__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread_l_s__bsd__zero.cpp.i
new file mode 100644
index 0000000..32aaadf
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread_l_s__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread_l_s__bsd__zero.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread_l_s__bsd__zero.hpp.i
new file mode 100644
index 0000000..88a34ba
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/thread_l_s__bsd__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/vm__version__bsd__zero.cpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/vm__version__bsd__zero.cpp.i
new file mode 100644
index 0000000..c61fcdc
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/vm__version__bsd__zero.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/vm_structs__bsd__zero.hpp.i b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/vm_structs__bsd__zero.hpp.i
new file mode 100644
index 0000000..f955c59
Binary files /dev/null and b/hotspot/.hg/store/data/src/os__cpu/bsd__zero/vm/vm_structs__bsd__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i
index fbf5354..17cb285 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i and b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i
index 0de75fc..a787b61 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i and b/hotspot/.hg/store/data/src/os__cpu/linux__x86/vm/linux__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/globals__linux__zero.hpp.i b/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/globals__linux__zero.hpp.i
index fee271a..fd33161 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/globals__linux__zero.hpp.i and b/hotspot/.hg/store/data/src/os__cpu/linux__zero/vm/globals__linux__zero.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/vm__version__solaris__sparc.cpp.i b/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/vm__version__solaris__sparc.cpp.i
index 3c56e9d..b579dc3 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/vm__version__solaris__sparc.cpp.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__sparc/vm/vm__version__solaris__sparc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i
index eb8a8b4..c772f0c 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__32.ad.i differ
diff --git a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i
index c1bdd15..49a2bb6 100644
Binary files a/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i and b/hotspot/.hg/store/data/src/os__cpu/solaris__x86/vm/solaris__x86__64.ad.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_call_site.java.i b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_call_site.java.i
index 86085f4..e69be54 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_call_site.java.i and b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_call_site.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_compilation.java.i b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_compilation.java.i
index e234acc..a6630b8 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_compilation.java.i and b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_compilation.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i
index b5fca99..d14183f 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i and b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_log_parser.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_phase.java.i b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_phase.java.i
index 9e4be37..954fa33 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_phase.java.i and b/hotspot/.hg/store/data/src/share/tools/_log_compilation/src/com/sun/hotspot/tools/compiler/_phase.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/_project_creator/_win_gamma_platform_v_c10.java.i b/hotspot/.hg/store/data/src/share/tools/_project_creator/_win_gamma_platform_v_c10.java.i
index ddbfc21..c523671 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/_project_creator/_win_gamma_platform_v_c10.java.i and b/hotspot/.hg/store/data/src/share/tools/_project_creator/_win_gamma_platform_v_c10.java.i differ
diff --git a/hotspot/.hg/store/data/src/share/tools/hsdis/_r_e_a_d_m_e.i b/hotspot/.hg/store/data/src/share/tools/hsdis/_r_e_a_d_m_e.i
index 8095dff..85adb6f 100644
Binary files a/hotspot/.hg/store/data/src/share/tools/hsdis/_r_e_a_d_m_e.i and b/hotspot/.hg/store/data/src/share/tools/hsdis/_r_e_a_d_m_e.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/adlc.hpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/adlc.hpp.i
index e0a27cb..e781790 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/adlc.hpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/adlc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/adlparse.cpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/adlparse.cpp.i
index 41eb699..0027eb7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/adlparse.cpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/adlparse.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/arch_desc.cpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/arch_desc.cpp.i
index c697a5f..0517fc9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/arch_desc.cpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/arch_desc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/formssel.cpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/formssel.cpp.i
index e3862ae..f9797d1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/formssel.cpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/formssel.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/formssel.hpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/formssel.hpp.i
index 79b5507..7ec439e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/formssel.hpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/formssel.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/output__c.cpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/output__c.cpp.i
index 173df95..fc6c729 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/output__c.cpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/output__c.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/adlc/output__h.cpp.i b/hotspot/.hg/store/data/src/share/vm/adlc/output__h.cpp.i
index df2bea7..2a2332d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/adlc/output__h.cpp.i and b/hotspot/.hg/store/data/src/share/vm/adlc/output__h.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___compilation.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___compilation.cpp.i
index 334b590..c46096a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___compilation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___compilation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i
index 38fcc1b..22ce91e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i
index 590c015..11afce2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___graph_builder.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.cpp.i
index 42d4d9f..2f019ce 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i
index d44cc56..9c36b86 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___instruction.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i
index 07c215a..d0d4c17 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i
index f7fe3f2..bda01ce 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i
index 7f58502..6c0a6e1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i
index 3aea0b2..9e2879b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_assembler.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i
index c73e81f..95d8318 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___l_i_r_generator.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i
index 8d59eef..9d529b3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i
index 726ad32..a9cb18d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___linear_scan.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i
index 330ee15..e97f716 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i
index 5987cb5..522bed3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1___runtime1.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/c1/c1__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/c1/c1__globals.hpp.i
index f88160b..cc77fff 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/c1/c1__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/c1/c1__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_array_klass.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_array_klass.hpp.i
index d2ea393..3a94b20 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_array_klass.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_array_klass.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_call_profile.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_call_profile.hpp.i
index bf16f9f..d366d00 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_call_profile.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_call_profile.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.cpp.i
index 7fe0ef2..1c38641 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.hpp.i
index dd706ef..cd06858 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_call_site.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_class_list.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_class_list.hpp.i
index a851545..b0d1e7e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_class_list.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_class_list.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_constant.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_constant.hpp.i
index 0345c72..469657b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_constant.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_constant.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i
index 3b8171a..e0dda77 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i
index 8668563..1486695 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_env.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_field.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_field.hpp.i
index e482985..1001170 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_field.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_field.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_instance_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_instance_klass.cpp.i
index 07455c3..290b1d4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_instance_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_instance_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i
index 1d20dd6..fac630c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i
index a4f1e96..bf85faa 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i
index 306dc4f..d501788 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i
index 44bcacc..54775a4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_method_handle.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_object.cpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_object.cpp.i
index 38b1f37..80e11bb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_object.cpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_object.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i
index cc21b90..d6e8f5c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_object_factory.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/ci/ci_streams.hpp.i b/hotspot/.hg/store/data/src/share/vm/ci/ci_streams.hpp.i
index c2cd888..de78055 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/ci/ci_streams.hpp.i and b/hotspot/.hg/store/data/src/share/vm/ci/ci_streams.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.cpp.i
index 931a91d..5e7d052 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.hpp.i
index 507dfe6..014b7bd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/class_file_parser.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/class_loader.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/class_loader.cpp.i
index 6da01c7..4d4987e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/class_loader.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/class_loader.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i
index 3a15006..516559a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i
index c18e83b..9ad2433 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/java_classes.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i
index e97bbd9..4a57db9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i
index eb97acd..deac44c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/system_dictionary.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i b/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i
index a1a45e0..b9c8693 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i and b/hotspot/.hg/store/data/src/share/vm/classfile/vm_symbols.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i
index bd45b84..bc096ec 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/dependencies.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/dependencies.hpp.i b/hotspot/.hg/store/data/src/share/vm/code/dependencies.hpp.i
index aca7178..da77e18 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/dependencies.hpp.i and b/hotspot/.hg/store/data/src/share/vm/code/dependencies.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i
index 4cf1ca1..a9e3e07 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/nmethod.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i b/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i
index 204cc0c..f60fb30 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i and b/hotspot/.hg/store/data/src/share/vm/code/nmethod.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/pc_desc.cpp.i b/hotspot/.hg/store/data/src/share/vm/code/pc_desc.cpp.i
index a80fc45..3bdaae8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/pc_desc.cpp.i and b/hotspot/.hg/store/data/src/share/vm/code/pc_desc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/pc_desc.hpp.i b/hotspot/.hg/store/data/src/share/vm/code/pc_desc.hpp.i
index 00f1a9e..7758367 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/pc_desc.hpp.i and b/hotspot/.hg/store/data/src/share/vm/code/pc_desc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/code/stubs.hpp.i b/hotspot/.hg/store/data/src/share/vm/code/stubs.hpp.i
index 812f836..0235dea 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/code/stubs.hpp.i and b/hotspot/.hg/store/data/src/share/vm/code/stubs.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i
index 22eabf8..21cb5f0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i and b/hotspot/.hg/store/data/src/share/vm/compiler/compile_broker.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/compiler/disassembler.hpp.i b/hotspot/.hg/store/data/src/share/vm/compiler/disassembler.hpp.i
index 5208b8a..2f34507 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/compiler/disassembler.hpp.i and b/hotspot/.hg/store/data/src/share/vm/compiler/disassembler.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_adaptive_size_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_adaptive_size_policy.cpp.i
index 5cf0479..acc7c8a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_adaptive_size_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_adaptive_size_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_collector_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_collector_policy.cpp.i
index d2a5460..699a248 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_collector_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/cms_collector_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i
index 529540d..a9d93f5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.hpp.i
index 2abc39f..bd2c0b7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_generation.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.hpp.i
index f0ab89c..5e32360 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/concurrent_mark_sweep_thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/free_block_dictionary.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/free_block_dictionary.cpp.i
index 47a245f..052f7f0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/free_block_dictionary.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/concurrent_mark_sweep/free_block_dictionary.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i
index 3965e12..2648df5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/collection_set_chooser.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_g1_refine_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_g1_refine_thread.cpp.i
index 0c00971..a41c7f0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_g1_refine_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_g1_refine_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i
index 754fc83..116794a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i
index b625f35..40b79e9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i
index 5410f3e..a85b52f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/concurrent_mark_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/dirty_card_queue.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/dirty_card_queue.cpp.i
index d895cba..969c625 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/dirty_card_queue.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/dirty_card_queue.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i
index ac66303..d2fce40 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i
index bdba6f5..9805537 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1__specialized__oop__closures.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.cpp.i
index 7809871..3bdfaa0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.hpp.i
index 295ccde..f98fefe 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_alloc_region.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d
new file mode 100644
index 0000000..51ca870
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.d differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i
index 9e2556b..2922ec9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i
index a28e1bc..6d4c061 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.inline.hpp.i
index 18ae64c..aeb0c92 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collected_heap.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i
index 5a39c6e..565a007 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i
index 2393609..ed9b48f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_collector_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.cpp.i
new file mode 100644
index 0000000..2ab7f8a
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i
new file mode 100644
index 0000000..992d0d6
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_ergo_verbose.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_m_m_u_tracker.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_m_m_u_tracker.cpp.i
index f22e841..4f67ef9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_m_m_u_tracker.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_m_m_u_tracker.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i
index f410075..03a2e3a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_oop_closures.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_s_a_t_b_card_table_mod_ref_b_s.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_s_a_t_b_card_table_mod_ref_b_s.cpp.i
index 8216429..4367e03 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_s_a_t_b_card_table_mod_ref_b_s.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/g1_s_a_t_b_card_table_mod_ref_b_s.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i
index 6ff6d46..fe27788 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i
index a40f8e8..815b592 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i
index 18fffb4..9079486 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/heap_region_rem_set.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/ptr_queue.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/ptr_queue.cpp.i
index ebb8aea..e238327 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/ptr_queue.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/ptr_queue.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i
index a477707..6a7b0a4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/g1/vm__operations__g1.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_card_table_mod_ref_b_s.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_card_table_mod_ref_b_s.cpp.i
index 865e03f..9db6d7f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_card_table_mod_ref_b_s.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/par_new/par_card_table_mod_ref_b_s.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/par_mark_bit_map.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/par_mark_bit_map.cpp.i
index 53f4a46..de15499 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/par_mark_bit_map.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/par_mark_bit_map.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i
index c177d04..649117e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/parallel_scavenge_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.cpp.i
index 290ad05..a6e8af2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.hpp.i
index c0bb16b..ae48b88 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/pc_tasks.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i
index 7bc0d00..d2e2ee4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i
index 34dc220..1c502b1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_parallel_compact.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i
index b89afe4..4e2aa0c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_tasks.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_virtualspace.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_virtualspace.cpp.i
index 4e3dfbd..06c93ad 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_virtualspace.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/parallel_scavenge/ps_virtualspace.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/mutable_n_u_m_a_space.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/mutable_n_u_m_a_space.cpp.i
index 189821e..b5fcc36 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/mutable_n_u_m_a_space.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__implementation/shared/mutable_n_u_m_a_space.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i
index f4c8e38..b083aab 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i
index f6c648e..6d5d983 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.inline.hpp.i
index d2c5d49..ff2b645 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/gc__interface/collected_heap.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/abstract_interpreter.hpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/abstract_interpreter.hpp.i
index 7bff8d9..69eff1e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/abstract_interpreter.hpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/abstract_interpreter.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_interpreter.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_interpreter.cpp.i
index 668c82a..eda5327 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_interpreter.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_interpreter.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i
index cc1ad7c..e2e6b13 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecode_tracer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecodes.hpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecodes.hpp.i
index eecd6b0..3235c0b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/bytecodes.hpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/bytecodes.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i
index 13dc01e..6c9a191 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.hpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.hpp.i
index 9c8ba15..b3ad63e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.hpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/interpreter_runtime.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/link_resolver.cpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/link_resolver.cpp.i
index a80f3fb..d85a92f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/link_resolver.cpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/link_resolver.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/interpreter/template_table.hpp.i b/hotspot/.hg/store/data/src/share/vm/interpreter/template_table.hpp.i
index 4f961bf..7e7be36 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/interpreter/template_table.hpp.i and b/hotspot/.hg/store/data/src/share/vm/interpreter/template_table.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/allocation.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/allocation.cpp.i
index 65a973f..61d287f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/allocation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/allocation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/allocation.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/allocation.hpp.i
index 5fea745..c91ef50 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/allocation.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/allocation.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/collector_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/collector_policy.cpp.i
index 9ae7574..7d38cd5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/collector_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/collector_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i
index 6164eb6..8637d35 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/def_new_generation.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i
index f97e89f..19653c9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gc_locker.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i
index b398f76..8cfc67b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gen_collected_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i
index 94bda9c..57f6624 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/gen_mark_sweep.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.cpp.i
index 35f969a..84088c8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.hpp.i
index 37a4b47..fccfdef 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/oop_factory.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i
index 54498a3..0a0ef2e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i
index a9e73a4..3d60518 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/reference_processor.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/resource_area.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/resource_area.cpp.i
index 7069dff..ce4529e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/resource_area.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/resource_area.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/resource_area.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/resource_area.hpp.i
index 165f332..bf14e95 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/resource_area.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/resource_area.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/shared_heap.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/shared_heap.cpp.i
index cc88597..77e0477 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/shared_heap.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/shared_heap.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/space.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/space.hpp.i
index 4410934..879651e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/space.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/space.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.cpp.i
index 994de92..337d687 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.hpp.i
index ad3d2a9..16875e0 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/thread_local_alloc_buffer.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i b/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i
index 78b057c..4914188 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/universe.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i b/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i
index 5492da1..8d87347 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i and b/hotspot/.hg/store/data/src/share/vm/memory/universe.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/const_method_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/const_method_klass.cpp.i
index 084fc0e..33dd1ec 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/const_method_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/const_method_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i
index 3b76647..3db8c6d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i
index 1e71a69..2375e21 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/constant_pool_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_klass.cpp.i
index 6039a97..72152dd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i
index 27e76a0..c866db2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/cp_cache_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/field_info.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/field_info.hpp.i
new file mode 100644
index 0000000..8966a51
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/oops/field_info.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/field_streams.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/field_streams.hpp.i
new file mode 100644
index 0000000..48eb3b5
Binary files /dev/null and b/hotspot/.hg/store/data/src/share/vm/oops/field_streams.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/generate_oop_map.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/generate_oop_map.cpp.i
index c77ad9b..62d7e1a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/generate_oop_map.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/generate_oop_map.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i
index a6e72b3..6b19659 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i
index 3367b01..dc9c303 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass_klass.cpp.i
index 5e74d2c..a902061 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_klass_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_klass_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/instance_ref_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/instance_ref_klass.cpp.i
index f9ff790..a3f240c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/instance_ref_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/instance_ref_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/klass_oop.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/klass_oop.hpp.i
index 1d32bd6..6c49584 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/klass_oop.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/klass_oop.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/mark_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/mark_oop.cpp.i
index f7da6c8..3124a54 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/mark_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/mark_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/method_data_oop.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/method_data_oop.hpp.i
index c26affb..e5b7b39 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/method_data_oop.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/method_data_oop.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i
index 291a90d..50965dd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/method_oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/oop.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/oop.cpp.i
index d043f5a..ad60742 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/oop.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/oop.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/oop.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/oop.hpp.i
index 2c57cac..955e331 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/oop.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/oop.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/oop.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/oop.inline.hpp.i
index 1fc5ff6..45cbd2d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/oop.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/oop.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/oops_hierarchy.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/oops_hierarchy.cpp.i
index ebfaf83..87fbeb5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/oops_hierarchy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/oops_hierarchy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i b/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i
index 56e6907..c2b1ffb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.hpp.i
index a31b3ee..90e9ec4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/type_array_klass.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/oops/type_array_oop.hpp.i b/hotspot/.hg/store/data/src/share/vm/oops/type_array_oop.hpp.i
index 76fcb2e..0456c7a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/oops/type_array_oop.hpp.i and b/hotspot/.hg/store/data/src/share/vm/oops/type_array_oop.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/block.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/block.cpp.i
index 3c52438..53ccc59 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/block.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/block.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i
index 348cdd6..2242874 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/block.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i
index 5e66a36..dbec344 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/bytecode_info.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i
index 3dc45b6..ab9daa6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/c2__globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i
index 4547d37..dd72bc8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/call_generator.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/call_generator.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/call_generator.hpp.i
index e77a83b..ce06af4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/call_generator.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/call_generator.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i
index 41d90ed..c55abc8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/callnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.cpp.i
index 113eb40..7b59839 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.hpp.i
index a2d3182..115212e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/cfgnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/chaitin.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/chaitin.hpp.i
index df6d56d..0e57b21 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/chaitin.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/chaitin.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/classes.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/classes.hpp.i
index 6ebe8eb..a81abc9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/classes.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/classes.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/coalesce.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/coalesce.cpp.i
index e2f1760..ba3eb6e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/coalesce.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/coalesce.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i
index d94ceab..fb8566c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/compile.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i
index 9463c7c..e39d9fb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/compile.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/connode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/connode.hpp.i
index 3a1d83b..608e2c2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/connode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/connode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i
index 6c58d75..3fbb13d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/do_call.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i
index f317062..da58013 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/gcm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i
index e2f18db..e3e5992 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/graph_kit.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.cpp.i
index c150987..8f26ae4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.hpp.i
index 50617e7..ee6d0a8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/ideal_graph_printer.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/ifnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/ifnode.cpp.i
index 30ef8e6..6ecf688 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/ifnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/ifnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i
index 02956a6..0686689 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/lcm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i
index 52c72f9..7ba3afa 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/library__call.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loop_predicate.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loop_predicate.cpp.i
index aa2facb..25f88f9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loop_predicate.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loop_predicate.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loop_transform.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loop_transform.cpp.i
index 1b998b6..2df3a21 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loop_transform.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loop_transform.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loop_unswitch.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loop_unswitch.cpp.i
index 7e4f0af..392813b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loop_unswitch.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loop_unswitch.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i
index 38268bb..4508e35 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i
index 50108f0..0c591eb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i
index 0afb9bb..dc7c1d4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/loopopts.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i
index 4607df8..885ead8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/machnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/machnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/machnode.hpp.i
index e5a0234..065a134 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/machnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/machnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i
index ee42bce..f3f3014 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/macro.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i
index c578440..bd83980 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/matcher.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i
index 6ba9348..43b66d9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/matcher.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i
index 005f3a4..69f319f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/memnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i
index 38cae30..c32a9ea 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/memnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/mulnode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/mulnode.cpp.i
index 16ea46e..aca10a9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/mulnode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/mulnode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/mulnode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/mulnode.hpp.i
index cf08d6f..a48d48e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/mulnode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/mulnode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/node.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/node.hpp.i
index 5890426..80febef 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/node.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/node.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/optoreg.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/optoreg.hpp.i
index 5246120..32b49b5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/optoreg.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/optoreg.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i
index 5af1ac5..8732968 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/output.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/parse.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/parse.hpp.i
index 56de37c..347f8c2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/parse.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/parse.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/parse2.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/parse2.cpp.i
index 644f7ce..7450e24 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/parse2.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/parse2.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/parse3.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/parse3.cpp.i
index 1ddcc21..d460851 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/parse3.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/parse3.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i
index 3322ec5..9086a31 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/phase_x.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/phase_x.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/phase_x.hpp.i
index bca0138..84b745d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/phase_x.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/phase_x.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/postaloc.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/postaloc.cpp.i
index 90c5bd7..1bb931b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/postaloc.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/postaloc.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/reg__split.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/reg__split.cpp.i
index 2fd9105..055856b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/reg__split.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/reg__split.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/regalloc.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/regalloc.hpp.i
index 01750a6..36d4954 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/regalloc.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/regalloc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i
index ba1dac1..34708c2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i
index 9e620a3..f0c1f9a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/runtime.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/split__if.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/split__if.cpp.i
index e6fce15..a289f85 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/split__if.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/split__if.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/superword.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/superword.cpp.i
index 9d2a844..c2d3dc2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/superword.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/superword.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/superword.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/superword.hpp.i
index a2b4b1e..a36e6be 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/superword.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/superword.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/type.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/type.hpp.i
index 353f752..5db31fb 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/type.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/type.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/vectornode.cpp.i b/hotspot/.hg/store/data/src/share/vm/opto/vectornode.cpp.i
index 5a4a7ab..f0d2095 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/vectornode.cpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/vectornode.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/opto/vectornode.hpp.i b/hotspot/.hg/store/data/src/share/vm/opto/vectornode.hpp.i
index ec92951..6d91c93 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/opto/vectornode.hpp.i and b/hotspot/.hg/store/data/src/share/vm/opto/vectornode.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/precompiled.hpp.i b/hotspot/.hg/store/data/src/share/vm/precompiled.hpp.i
index 41883e9..4b1bd3f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/precompiled.hpp.i and b/hotspot/.hg/store/data/src/share/vm/precompiled.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/forte.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/forte.cpp.i
index 042d406..aa61131 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/forte.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/forte.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i
index a136d46..5cb349b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jni.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i
index c60da6e..7e63d45 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvm.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i b/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i
index 094dec3..e12fdbf 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvm.h.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i
index 98a53bd..ab13e90 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_class_file_reconstituter.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i
index c7da2af..1316ee1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.cpp.i
index 74c0a84..b279671 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.hpp.i
index 51e8884..33818c4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_env_base.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i
index 52c8a35..0249c3d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_export.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_impl.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_impl.cpp.i
index 0e5ad1c..7768ee5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_impl.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_impl.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_redefine_classes.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_redefine_classes.cpp.i
index aee46a0..66279f5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_redefine_classes.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_redefine_classes.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i
index fef788c..da4f519 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/jvmti_tag_map.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i
index 7af522f..b3df830 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.hpp.i
index 0e54920..5f52a48 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/method_handle_walk.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i
index 956a9e3..bec94d4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/method_handles.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/method_handles.hpp.i b/hotspot/.hg/store/data/src/share/vm/prims/method_handles.hpp.i
index baf7244..b51551a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/method_handles.hpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/method_handles.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i
index 8d4c24b..7046473 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/native_lookup.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i b/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i
index 2befb54..c187a12 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i and b/hotspot/.hg/store/data/src/share/vm/prims/unsafe.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i
index d24ceee..5968831 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i
index 3e18003..9cd8f8e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/advanced_threshold_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i
index d0b3d56..7c133f5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/arguments.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/atomic.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/atomic.cpp.i
index 84744a7..f82e9f8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/atomic.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/atomic.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i
index f5f9c24..b3c5da4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/compilation_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i
index 463a12a..a2dd735 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.hpp.i
index f547657..af22a7f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/deoptimization.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.cpp.i
index 83d602c..9f24326 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.hpp.i
index 8172ec9..c3fd3dc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/field_descriptor.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/fprofiler.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/fprofiler.hpp.i
index f758e4a..4987888 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/fprofiler.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/fprofiler.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i
index fb6b173..0844df7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/frame.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i
index 74441ff..a9e5cf8 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/globals.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/handles.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/handles.cpp.i
index 8051745..4d83d55 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/handles.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/handles.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/handles.inline.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/handles.inline.hpp.i
index 9ecc029..c414cbc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/handles.inline.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/handles.inline.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i
index a4e8292..5d179db 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/interface_support.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i
index eec5571..de7432f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/java.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/java.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/java.hpp.i
index 6216796..235958d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/java.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/java.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.cpp.i
index 5a700d2..62a1600 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.hpp.i
index 00dc1e8..8558153 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/java_calls.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/java_frame_anchor.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/java_frame_anchor.hpp.i
index 0399821..9cb1cf7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/java_frame_anchor.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/java_frame_anchor.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/jni_handles.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/jni_handles.cpp.i
index ca281be..e0f70a1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/jni_handles.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/jni_handles.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/memprofiler.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/memprofiler.cpp.i
index 5d4eb9f..45c32ce 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/memprofiler.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/memprofiler.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i
index 2671979..4c7012f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/mutex.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i
index 853152d..e8f4120 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i
index b6b86e0..a0878bd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/mutex_locker.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i
index 01d77a2..6224eca 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/object_monitor.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i
index ecc6e03..71b2a02 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i
index 625742d..efc0a98 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/os_thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/os_thread.hpp.i
index fe98ff0..10d6547 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/os_thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/os_thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/reflection.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/reflection.cpp.i
index 91e43d9..1dac4a3 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/reflection.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/reflection.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/reflection.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/reflection.hpp.i
index a748fe6..726a463 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/reflection.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/reflection.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/reflection_utils.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/reflection_utils.hpp.i
index 8d778ed..779d1ce 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/reflection_utils.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/reflection_utils.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i
index c45148c..9819dc2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/safepoint.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i
index 56ebd57..d2ba85e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i
index 603d016..345c735 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/shared_runtime.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i
index bcb6d4d..5e488cd 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i
index 7cdf3ed..41b6e9a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/simple_threshold_policy.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.cpp.i
index 41bd956..95e70b9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.hpp.i
index 949ec5c..4bc848e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/stub_routines.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i
index 3c1eb1d..fa396fc 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/synchronizer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/task.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/task.cpp.i
index e92b91d..0fce5da 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/task.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/task.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i
index db4acea..3f7f03f 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i
index d743cd1..5d0a55a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.cpp.i
index 8e7443a..bd960d7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.hpp.i
index 00dbadc..5faefc7 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/thread_local_storage.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/timer.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/timer.cpp.i
index a3291e2..69480a5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/timer.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/timer.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vframe_array.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vframe_array.hpp.i
index 84f8f4a..22b1586 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vframe_array.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vframe_array.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i
index 9ce804f..a0e45b6 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/virtualspace.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm__operations.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm__operations.cpp.i
index a5ada66..0e9842e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm__operations.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm__operations.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i
index 5e6da53..8d78596 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i
index da0bfc5..3fdfe65 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm__version.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i
index 35db4cc..bca0174 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm_structs.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i
index d608320..f0f035d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.hpp.i b/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.hpp.i
index aac86a5..2dc8f6a 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.hpp.i and b/hotspot/.hg/store/data/src/share/vm/runtime/vm_thread.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i b/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i
index 1cd0d7b..4801330 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i and b/hotspot/.hg/store/data/src/share/vm/services/gc_notifier.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/shark/shark_context.hpp.i b/hotspot/.hg/store/data/src/share/vm/shark/shark_context.hpp.i
index b732a06..5f2eb00 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/shark/shark_context.hpp.i and b/hotspot/.hg/store/data/src/share/vm/shark/shark_context.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.cpp.i
index e73eccf..21f6833 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.hpp.i
index 5dd249c..5d8d34e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/access_flags.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/array.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/array.cpp.i
index d74a386..083696b 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/array.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/array.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.cpp.i
index c585579..40fa04e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/bit_map.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i
index 226f856..c5ea4e2 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/debug.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i
index f859d2a..6c16849 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i
index 8c3ca66..945d203 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/decoder.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.cpp.i
index e5e07bc..2394551 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.hpp.i
index 607eb22..43c1f2d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/elf_file.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.cpp.i
index 117347f..d715d03 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.hpp.i
index 6e597a3..527b755 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/elf_string_table.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.cpp.i
index 4bc9b7b..3276573 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.hpp.i
index 65d26db..4e6b756 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/elf_symbol_table.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i
index 8eef915..314fc17 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/events.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i
index f144a55..4dd5650 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i
index e971670..9030d14 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/exceptions.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i
index ae68e71..9205924 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i
index 5dd611c..6e392a4 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__gcc.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__sparc_works.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__sparc_works.hpp.i
index 07f48b5..54c0bb9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__sparc_works.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__sparc_works.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i
index b0949e4..1590434 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/global_definitions__vis_c_p_p.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.cpp.i
index 8504c59..d464edf 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i
index 2223081..d6b538d 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/growable_array.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/histogram.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/histogram.hpp.i
index 960591a..ab84a35 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/histogram.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/histogram.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/macros.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/macros.hpp.i
index cde3e5f..f35521c 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/macros.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/macros.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/ostream.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/ostream.cpp.i
index c1f426b..9b6c05e 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/ostream.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/ostream.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.hpp.i
index d812983..d1ef1d5 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/preserve_exception.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i
index f831306..77f0b90 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/quick_sort.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.cpp.i
index 21034f5..76f39c9 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.hpp.i
index 7329c01..01667f1 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/taskqueue.hpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i
index f776776..76b6270 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/vm_error.cpp.i differ
diff --git a/hotspot/.hg/store/data/src/share/vm/utilities/workgroup.hpp.i b/hotspot/.hg/store/data/src/share/vm/utilities/workgroup.hpp.i
index ef47203..0f5bb82 100644
Binary files a/hotspot/.hg/store/data/src/share/vm/utilities/workgroup.hpp.i and b/hotspot/.hg/store/data/src/share/vm/utilities/workgroup.hpp.i differ
diff --git a/hotspot/.hg/store/data/test/_makefile.i b/hotspot/.hg/store/data/test/_makefile.i
index b898437..281e144 100644
Binary files a/hotspot/.hg/store/data/test/_makefile.i and b/hotspot/.hg/store/data/test/_makefile.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/5091921/_test7005594.sh.i b/hotspot/.hg/store/data/test/compiler/5091921/_test7005594.sh.i
index e896741..f69bcb9 100644
Binary files a/hotspot/.hg/store/data/test/compiler/5091921/_test7005594.sh.i and b/hotspot/.hg/store/data/test/compiler/5091921/_test7005594.sh.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7068051/_test7068051.java.i b/hotspot/.hg/store/data/test/compiler/7068051/_test7068051.java.i
new file mode 100644
index 0000000..a1e48a7
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7068051/_test7068051.java.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7068051/_test7068051.sh.i b/hotspot/.hg/store/data/test/compiler/7068051/_test7068051.sh.i
new file mode 100644
index 0000000..ef6b892
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7068051/_test7068051.sh.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7070134/_stemmer.java.i b/hotspot/.hg/store/data/test/compiler/7070134/_stemmer.java.i
new file mode 100644
index 0000000..da4cc4f
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7070134/_stemmer.java.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7070134/_test7070134.sh.i b/hotspot/.hg/store/data/test/compiler/7070134/_test7070134.sh.i
new file mode 100644
index 0000000..e23ccff
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7070134/_test7070134.sh.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7070134/words.d b/hotspot/.hg/store/data/test/compiler/7070134/words.d
new file mode 100644
index 0000000..ba048e4
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7070134/words.d differ
diff --git a/hotspot/.hg/store/data/test/compiler/7070134/words.i b/hotspot/.hg/store/data/test/compiler/7070134/words.i
new file mode 100644
index 0000000..86bb799
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7070134/words.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7082949/_test7082949.java.i b/hotspot/.hg/store/data/test/compiler/7082949/_test7082949.java.i
new file mode 100644
index 0000000..bf24cec
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7082949/_test7082949.java.i differ
diff --git a/hotspot/.hg/store/data/test/compiler/7088020/_test7088020.java.i b/hotspot/.hg/store/data/test/compiler/7088020/_test7088020.java.i
new file mode 100644
index 0000000..d004ccd
Binary files /dev/null and b/hotspot/.hg/store/data/test/compiler/7088020/_test7088020.java.i differ
diff --git a/hotspot/.hg/store/data/test/gc/7072527/_test_full_g_c_count.java.i b/hotspot/.hg/store/data/test/gc/7072527/_test_full_g_c_count.java.i
new file mode 100644
index 0000000..cc3dd7e
Binary files /dev/null and b/hotspot/.hg/store/data/test/gc/7072527/_test_full_g_c_count.java.i differ
diff --git a/hotspot/.hg/store/data/test/jprt.config.i b/hotspot/.hg/store/data/test/jprt.config.i
index 16ec268..79480e9 100644
Binary files a/hotspot/.hg/store/data/test/jprt.config.i and b/hotspot/.hg/store/data/test/jprt.config.i differ
diff --git a/hotspot/.hg/store/data/test/runtime/6929067/_test6929067.sh.i b/hotspot/.hg/store/data/test/runtime/6929067/_test6929067.sh.i
index 68e59a5..2e0140b 100644
Binary files a/hotspot/.hg/store/data/test/runtime/6929067/_test6929067.sh.i and b/hotspot/.hg/store/data/test/runtime/6929067/_test6929067.sh.i differ
diff --git a/hotspot/.hg/store/data/test/runtime/7020373/_test7020373.sh.i b/hotspot/.hg/store/data/test/runtime/7020373/_test7020373.sh.i
new file mode 100644
index 0000000..7e35fc7
Binary files /dev/null and b/hotspot/.hg/store/data/test/runtime/7020373/_test7020373.sh.i differ
diff --git a/hotspot/.hg/store/data/test/runtime/7051189/_xchecksig.sh.i b/hotspot/.hg/store/data/test/runtime/7051189/_xchecksig.sh.i
new file mode 100644
index 0000000..6b710ad
Binary files /dev/null and b/hotspot/.hg/store/data/test/runtime/7051189/_xchecksig.sh.i differ
diff --git a/hotspot/.hg/store/data/~2ehgtags.i b/hotspot/.hg/store/data/~2ehgtags.i
index 16181db..a67c6bc 100644
Binary files a/hotspot/.hg/store/data/~2ehgtags.i and b/hotspot/.hg/store/data/~2ehgtags.i differ
diff --git a/hotspot/.hg/store/fncache b/hotspot/.hg/store/fncache
index 714e17f..9fe4c07 100644
--- a/hotspot/.hg/store/fncache
+++ b/hotspot/.hg/store/fncache
@@ -1,26 +1,27 @@
-data/src/share/vm/memory/universe.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java.i
data/make/windows/projectfiles/compiler2/vm.def.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadContext.java.i
data/make/windows/platform_ia64.i
+data/test/gc/6941923/test6941923.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9IntRegisterBranchDecoder.java.i
data/agent/src/scripts/README.i
-data/test/compiler/6636138/Test1.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java.i
data/src/cpu/zero/vm/nativeInst_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java.i
+data/src/cpu/zero/vm/vmreg_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedByte.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java.i
data/test/compiler/5091921/Test6897150.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp.i
+data/src/share/vm/opto/regalloc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberVisitor.java.i
-data/src/share/vm/gc_implementation/includeDB_gc_shared.i
data/src/share/vm/shark/sharkFunction.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml.i
-data/src/share/vm/interpreter/bytecode.cpp.i
+data/test/compiler/5091921/Test6186134.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/HideAction.java.i
data/test/compiler/5091921/Test6850611.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVrInstruction.java.i
-data/src/share/vm/oops/typeArrayKlass.cpp.i
-data/src/share/vm/prims/jni.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java.i
+data/src/share/vm/utilities/quickSort.cpp.i
+data/test/Makefile.i
data/src/cpu/x86/vm/vm_version_x86.hpp.i
data/src/os/windows/vm/attachListener_windows.cpp.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/build.xml.i
@@ -31,27 +32,28 @@ data/agent/src/share/classes/images/toolbarButtonGraphics/general/Delete16.gif.i
data/src/os_cpu/solaris_sparc/vm/solaris_sparc.il.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/ThreadInfoAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FloatDecoder.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/Zoom16.gif.i
+data/build/linux/makefiles/amd64.make.i
data/src/os_cpu/solaris_sparc/vm/vmStructs_solaris_sparc.hpp.i
data/src/cpu/x86/vm/interpreter_x86.hpp.i
-data/src/share/vm/ci/ciFlags.cpp.i
+data/src/share/vm/prims/jvmtiThreadState.hpp.i
data/src/os/windows/vm/chaitin_windows.cpp.i
+data/src/os/bsd/vm/dtraceJSDT_bsd.cpp.i
data/src/share/vm/interpreter/linkResolver.cpp.i
data/agent/src/os/linux/elfmacros.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegisters.java.i
data/src/os/windows/vm/osThread_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/NonConcreteMethodImpl.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ProcessListPanel.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CombineFilter.java.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalPub.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SAListener.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/Bundle.properties.i
data/build/linux/makefiles/adjust-mflags.sh.i
-data/src/cpu/zero/vm/vmreg_zero.cpp.i
+data/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/InstructionDecoder.java.i
-data/src/cpu/zero/vm/bytecodes_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java.i
data/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/frame.gif.i
data/src/os/windows/vm/os_windows.cpp.i
@@ -61,9 +63,9 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGener
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedShort.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/DoubleTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Debugger.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java.i
data/build/windows/projectfiles/compiler1/vm.def.i
-data/src/share/vm/opto/loopPredicate.cpp.i
+data/agent/doc/ReadMe-JavaScript.text.i
data/make/solaris/makefiles/mapfile-vers.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32DebuggerLocal.java.i
data/src/os/solaris/dtrace/libjvm_db.h.i
@@ -77,26 +79,29 @@ data/agent/src/os/solaris/dbx/proc_service_2.h.i
data/src/share/vm/services/gcNotifier.hpp.i
data/src/cpu/x86/vm/c1_FrameMap_x86.hpp.i
data/src/share/vm/shark/sharkStateScanner.hpp.i
-data/src/share/vm/runtime/os.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java.i
data/src/cpu/x86/vm/bytes_x86.hpp.i
data/src/share/vm/opto/adlcVMDeps.hpp.i
data/test/compiler/6663854/Test6663854.java.i
data/src/share/vm/runtime/perfData.cpp.i
data/src/share/vm/utilities/exceptions.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/Bits.java.i
+data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithKlass.java.i
data/make/jprt.config.i
+data/agent/test/jdi/runjdb.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/PackageNameFilter.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/manifest.mf.i
+data/src/share/vm/code/dependencies.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadFactory.java.i
data/src/share/vm/gc_implementation/shared/gcPolicyCounters.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegister.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedChar.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAction.java.i
data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.hpp.i
-data/src/share/vm/utilities/yieldingWorkgroup.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.xml.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/layer.xml.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java.i
data/agent/make/jsdbwindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxWeakExternalRecord.java.i
data/src/share/vm/classfile/resolutionErrors.hpp.i
@@ -109,47 +114,46 @@ data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/DeadlockDetector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Register.java.i
data/src/share/vm/gc_implementation/shared/gcUtil.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java.i
-data/src/share/vm/utilities/array.hpp.i
data/src/share/vm/c1/c1_Compiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/Bundle.properties.i
data/src/share/vm/ci/ciMethodBlocks.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/WorkerThread.java.i
-data/src/share/vm/memory/collectorPolicy.cpp.i
+data/make/windows/get_msc_ver.sh.i
data/make/windows/projectfiles/kernel/vm.dsw.i
data/agent/src/share/classes/com/sun/java/swing/ui/OkCancelDialog.java.i
-data/src/share/vm/opto/memnode.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties.i
data/src/share/vm/prims/jvmtiEnvFill.java.i
data/src/share/vm/memory/defNewGeneration.inline.hpp.i
data/src/share/vm/utilities/bitMap.cpp.i
-data/src/share/vm/oops/oop.psgc.inline.hpp.i
+data/test/compiler/5091921/Test7020614.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.java.i
+data/make/bsd/platform_i486.suncc.i
data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.inline.hpp.i
data/src/share/vm/runtime/threadLocalStorage.hpp.i
-data/src/share/vm/code/location.hpp.i
data/src/os/solaris/vm/os_solaris.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9CasInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlassKlass.java.i
data/src/share/vm/adlc/dfa.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/NotInHeapException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CStringTreeNodeAdapter.java.i
-data/make/solaris/makefiles/reorder_CORE_i486.i
+data/build/windows/makefiles/debug.make.i
data/src/share/tools/IdealGraphVisualizer/Util/manifest.mf.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java.i
data/build/windows/projectfiles/compiler1/Makefile.i
data/src/share/vm/gc_implementation/shared/gSpaceCounters.cpp.i
data/src/share/vm/runtime/perfMemory.hpp.i
data/agent/test/jdi/TestScaffold.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcLnSeg.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java.i
data/src/share/vm/memory/genOopClosures.hpp.i
data/make/solaris/makefiles/amd64.make.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java.i
data/src/share/vm/ci/ciNullObject.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ClassConstants.java.i
data/src/share/vm/runtime/init.hpp.i
-data/agent/src/os/win32/SwDbgSrv.dsw.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java.i
data/src/share/vm/code/scopeDesc.cpp.i
-data/src/share/vm/runtime/fprofiler.hpp.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMemoryInstruction.java.i
data/src/share/vm/oops/symbolOop.hpp.i
@@ -159,38 +163,46 @@ data/make/windows/build.make.i
data/src/share/vm/prims/jvmtiCodeBlobEvents.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_x86/SolarisX86JavaThreadPDAccess.java.i
+data/src/share/vm/oops/constantPoolOop.hpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Helper.java.i
data/agent/make/jhistoproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadFactory.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java.i
+data/src/share/vm/memory/genRemSet.cpp.i
data/src/share/vm/runtime/reflectionUtils.cpp.i
+data/agent/test/jdi/serialvm.java.i
+data/src/cpu/sparc/vm/vtableStubs_sparc.cpp.i
+data/src/cpu/x86/vm/c1_LinearScan_x86.cpp.i
data/src/share/vm/opto/memnode.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBaseClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java.i
+data/src/share/vm/runtime/os.cpp.i
data/build/solaris/makefiles/buildtree.make.i
data/agent/make/index.html.i
-data/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JvmtiAgentThread.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/removeall.gif.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java.i
data/src/share/vm/opto/phaseX.hpp.i
-data/src/cpu/x86/vm/jni_x86.h.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java.i
-data/agent/make/pstackwindbg.bat.i
+data/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp.i
data/agent/test/libproc/Makefile.i
-data/agent/make/heapdumpproc64.sh.i
-data/src/share/vm/memory/filemap.cpp.i
+data/make/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/src/share/vm/gc_implementation/g1/survRateGroup.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeMultiANewArray.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java.i
data/src/share/vm/c1/c1_CodeStubs.hpp.i
-data/agent/src/os/linux/ps_core.c.i
+data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java.i
data/agent/test/jdi/runsa.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/JmplDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/triangle.png.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ConnectionFilter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java.i
-data/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp.i
+data/src/share/vm/memory/barrierSet.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DLLCharacteristics.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32CDebugger.java.i
data/src/share/vm/shark/sharkIntrinsics.hpp.i
@@ -202,28 +214,31 @@ data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionFlags.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompressedLineNumberReadStream.java.i
data/src/cpu/x86/vm/globals_x86.hpp.i
-data/src/share/vm/runtime/reflection.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif.i
-data/src/share/vm/oops/compiledICHolderKlass.hpp.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties.i
+data/src/share/vm/shark/sharkFunction.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFlushInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidValueImpl.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.cpp.i
+data/agent/make/start-debug-server-windbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheKlass.java.i
-data/src/share/vm/oops/generateOopMap.hpp.i
-data/build/solaris/makefiles/core.make.i
-data/make/windows/projectfiles/compiler2/Makefile.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ShiftInstruction.java.i
+data/src/os/bsd/vm/os_share_bsd.hpp.i
+data/src/share/vm/runtime/extendedPC.hpp.i
+data/make/solaris/makefiles/build_vm_def.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86Thread.java.i
+data/src/cpu/x86/vm/jniFastGetField_x86_32.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64Thread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java.i
+data/test/compiler/7046096/Test7046096.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java.i
data/test/compiler/5091921/Test7005594.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64Thread.java.i
data/src/share/vm/adlc/arena.hpp.i
data/src/os/windows/vm/dtraceJSDT_windows.cpp.i
data/make/linux/platform_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindCrashesAction.java.i
-data/build/linux/makefiles/amd64.make.i
+data/src/cpu/x86/vm/icache_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHeader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FlushwInstruction.java.i
data/agent/make/hsdb.sh.i
@@ -231,45 +246,47 @@ data/src/share/vm/opto/escape.cpp.i
data/src/share/vm/gc_implementation/shared/cSpaceCounters.hpp.i
data/src/share/vm/ci/ciTypeArrayKlassKlass.cpp.i
data/test/compiler/6896727/Test.java.i
-data/src/cpu/x86/vm/dump_x86_64.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/JCharField.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Property.java.i
-data/src/share/vm/prims/jvmtiThreadState.hpp.i
data/agent/src/os/solaris/proc/salibproc.h.i
+data/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp.i
data/src/share/vm/runtime/park.cpp.i
data/src/share/vm/opto/c2_globals.cpp.i
-data/src/share/vm/runtime/relocator.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java.i
+data/src/share/tools/launcher/wildcard.h.i
data/make/solaris/platform_sparcv9.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickHandler.java.i
data/src/os_cpu/linux_x86/vm/os_linux_x86.cpp.i
-data/test/compiler/6758234/Test6758234.java.i
+data/make/bsd/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/DictionaryEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerServer.java.i
data/test/compiler/6946040/TestCharShortByteSwap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/MonitorValue.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java.i
data/src/os/solaris/vm/decoder_solaris.cpp.i
data/src/share/vm/prims/jvmtiHpp.xsl.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThreadContextFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/UnalignedAddressException.java.i
-data/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.i
+data/src/share/vm/adlc/formsopt.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/AddressTreeNodeAdapter.java.i
-data/src/share/vm/shark/sharkBuilder.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java.i
data/agent/make/finalizerinfowindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegister.java.i
data/src/cpu/sparc/vm/frame_sparc.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/SimpleTreeTableModel.java.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java.i
data/build/linux/makefiles/mapfile-vers-debug.i
+data/src/cpu/zero/vm/interpreterFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDescEnums.java.i
data/src/share/vm/classfile/classFileStream.cpp.i
data/build/solaris/makefiles/gcc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/OopTreeNodeAdapter.java.i
data/test/compiler/6716441/Tester.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp.i
+data/src/share/vm/classfile/classFileStream.hpp.i
data/src/share/vm/memory/gcLocker.inline.hpp.i
data/test/compiler/6805724/Test6805724.java.i
data/build/linux/platform_sparc.i
@@ -280,12 +297,11 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisterIns
data/src/share/vm/asm/codeBuffer.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/ActionManager.java.i
data/make/linux/makefiles/mapfile-vers-jsig.i
-data/src/share/vm/runtime/safepoint.cpp.i
-data/src/share/vm/runtime/biasedLocking.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java.i
data/agent/make/jcorewindbg64.bat.i
-data/make/solaris/makefiles/mapfile-vers-debug.i
-data/src/share/vm/opto/ifnode.cpp.i
+data/src/share/vm/runtime/java.cpp.i
+data/src/os/bsd/vm/osThread_bsd.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CFrame.java.i
data/src/share/vm/gc_implementation/shared/generationCounters.hpp.i
@@ -294,48 +310,53 @@ data/agent/src/os/win32/BasicList.hpp.i
data/src/share/vm/runtime/synchronizer.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLoadDecoder.java.i
data/agent/test/jdi/sagtest.java.i
+data/src/share/vm/utilities/quickSort.hpp.i
data/src/share/vm/opto/matcher.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ObjectReader.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/navigation/Down16.gif.i
data/src/cpu/sparc/vm/interpreterRT_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRegisterMap.java.i
-data/src/share/vm/code/compiledIC.hpp.i
+data/src/share/vm/memory/blockOffsetTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WriteDecoder.java.i
data/make/linux/makefiles/shark.make.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutputSlotNode.java.i
+data/src/share/vm/c1/c1_ValueMap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolder.java.i
data/src/os_cpu/windows_x86/vm/assembler_windows_x86.cpp.i
-data/src/share/vm/shark/sharkCacheDecache.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetPut.java.i
-data/src/share/vm/opto/parse.hpp.i
+data/src/os/windows/vm/interfaceSupport_windows.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Oop.java.i
-data/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp.i
-data/src/cpu/x86/vm/vmStructs_x86.hpp.i
+data/src/os/linux/vm/mutex_linux.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java.i
+data/src/share/vm/memory/resourceArea.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebugger.java.i
data/src/os_cpu/windows_x86/vm/vmStructs_windows_x86.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp.i
data/src/share/vm/gc_implementation/shared/concurrentGCThread.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/ObjectHistogram.java.i
-data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java.i
+data/src/share/vm/oops/cpCacheKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SwapDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java.i
+data/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp.i
data/src/share/vm/runtime/stubRoutines.cpp.i
data/src/cpu/x86/vm/debug_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicVtblAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RettDecoder.java.i
+data/src/os/bsd/vm/os_bsd.inline.hpp.i
data/src/share/vm/gc_implementation/shared/cSpaceCounters.cpp.i
data/make/solaris/platform_sparc.i
data/src/cpu/sparc/vm/assembler_sparc.hpp.i
data/src/cpu/sparc/vm/disassembler_sparc.cpp.i
data/src/share/vm/oops/constantPoolKlass.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicFieldWrapper.java.i
data/agent/src/os/win32/nt4internals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastIAccess0.java.i
-data/build/solaris/Queens.class.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/EnableBlockLayoutAction.java.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSelfLoops.filter.i
+data/src/share/vm/opto/live.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/suite.properties.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterSetting.java.i
data/src/share/vm/code/jvmticmlr.h.i
@@ -345,23 +366,22 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCUnimpInstruction.jav
data/test/compiler/6916644/Test6916644.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegDesc.java.i
data/src/share/vm/runtime/synchronizer.hpp.i
-data/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java.i
data/agent/test/jdi/sagtarg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LocalSym.java.i
-data/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp.i
data/agent/src/share/classes/com/sun/java/swing/action/DelegateAction.java.i
data/src/cpu/zero/vm/vm_version_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/TwoOopHashtable.java.i
-data/src/share/vm/c1/c1_Instruction.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/JavaSE6ScriptEngine.java.i
data/src/cpu/x86/vm/interp_masm_x86_64.hpp.i
-data/src/share/vm/gc_implementation/shared/coTracker.cpp.i
-data/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp.i
-data/src/share/vm/memory/barrierSet.inline.hpp.i
+data/src/share/vm/shark/sharkIntrinsics.cpp.i
+data/src/os/windows/vm/mutex_windows.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBTree.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceSwapDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CompiledICHolderKlass.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/Bundle.properties.i
-data/build/windows/makefiles/shared.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java.i
data/src/cpu/x86/vm/methodHandles_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java.i
data/make/linux/makefiles/sparc.make.i
@@ -370,81 +390,75 @@ data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlassKlass.java.i
data/src/share/vm/runtime/frame.cpp.i
data/src/share/vm/gc_implementation/g1/g1OopClosures.hpp.i
data/src/os/linux/vm/interfaceSupport_linux.hpp.i
-data/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp.i
-data/src/share/vm/memory/tenuredGeneration.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolEnums.java.i
data/build/solaris/makefiles/reorder_TIERED_amd64.i
-data/agent/src/os/solaris/proc/saproc.cpp.i
+data/agent/test/libproc/libproctest64.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/MemRegion.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessAnalysis.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java.i
data/src/share/vm/compiler/oopMap.cpp.i
-data/test/compiler/7042153/Test7042153.java.i
data/agent/src/os/win32/toolHelp.hpp.i
+data/agent/make/dumpflagswindbg.bat.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.xml.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
-data/src/share/vm/opto/subnode.cpp.i
+data/src/share/vm/services/attachListener.hpp.i
data/src/share/vm/ci/ciCallProfile.hpp.i
data/src/share/vm/interpreter/oopMapCache.hpp.i
data/src/share/vm/code/exceptionHandlerTable.cpp.i
data/agent/src/share/native/jvmdi/sa.dsw.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupOrganizer.java.i
+data/agent/make/dumpflagswindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicType.java.i
data/src/share/vm/oops/methodOop.hpp.i
-data/build/windows/makefiles/generated.make.i
-data/src/share/vm/memory/heapInspection.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueContainer.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPMoveInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleSpace.java.i
data/src/share/vm/memory/genRemSet.hpp.i
data/src/cpu/sparc/vm/interpreterGenerator_sparc.hpp.i
-data/src/share/vm/oops/instanceMirrorKlass.hpp.i
+data/src/share/vm/c1/c1_Runtime1.hpp.i
data/agent/src/os/linux/LinuxDebuggerLocal.c.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java.i
data/src/share/vm/ci/ciStreams.hpp.i
+data/src/os/bsd/vm/vmError_bsd.cpp.i
+data/make/linux/makefiles/buildtree.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaMethod.java.i
data/src/share/vm/prims/jvmtiGen.java.i
-data/src/share/vm/libadt/dict.hpp.i
-data/make/windows/makefiles/projectcreator.make.i
data/src/os/solaris/vm/objectMonitor_solaris.cpp.i
data/src/share/vm/oops/constantPoolOop.cpp.i
data/test/runtime/6929067/invoke.c.i
data/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.cpp.i
-data/src/share/vm/adlc/formsopt.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicNarrowOopField.java.i
data/src/share/vm/memory/blockOffsetTable.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java.i
data/src/os/solaris/vm/thread_solaris.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java.i
+data/agent/src/os/bsd/libproc_impl.h.i
+data/test/compiler/6973329/Test.java.i
data/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.cpp.i
data/test/compiler/6860469/Test.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/platform.properties.i
data/src/cpu/sparc/vm/stubRoutines_sparc.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSets.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastAAccess0.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Delete24.gif.i
-data/src/share/vm/prims/jvmtiEventController.hpp.i
+data/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml.i
data/src/os/solaris/vm/dtraceJSDT_solaris.cpp.i
-data/src/share/vm/opto/generateOptoStub.cpp.i
data/build/linux/makefiles/vm.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/c1/Runtime1.java.i
data/agent/src/os/solaris/proc/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java.i
-data/src/share/vm/code/codeCache.hpp.i
+data/src/share/vm/utilities/bitMap.hpp.i
data/src/share/vm/oops/symbol.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeValue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethodKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java.i
-data/src/share/vm/opto/cfgnode.cpp.i
+data/agent/src/os/win32/ioUtils.hpp.i
+data/make/bsd/makefiles/zero.make.i
+data/test/compiler/7048332/Test7048332.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/GlobalSym.java.i
data/src/share/vm/memory/allocation.inline.hpp.i
data/src/cpu/x86/vm/vm_version_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java.i
data/src/share/vm/opto/type.hpp.i
data/src/share/vm/c1/c1_LinearScan.cpp.i
-data/src/share/vm/utilities/accessFlags.cpp.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/BasicLogEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/ThreadListPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServerAttachingConnector.java.i
@@ -452,7 +466,6 @@ data/agent/src/share/classes/sun/jvm/hotspot/types/PointerType.java.i
data/src/share/vm/services/memoryPool.hpp.i
data/src/share/vm/opto/c2compiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.properties.i
-data/src/share/vm/memory/cardTableModRefBS.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/predsucc.gif.i
data/src/share/vm/utilities/xmlstream.hpp.i
data/src/os_cpu/solaris_x86/vm/copy_solaris_x86.inline.hpp.i
@@ -463,32 +476,33 @@ data/src/cpu/x86/vm/assembler_x86_64.inline.hpp.i
data/src/os/windows/vm/objectMonitor_windows.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsCategory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JInternalFrameWrapper.java.i
-data/src/share/vm/classfile/vmSymbols.hpp.i
+data/agent/make/clhsdbwindbg64.bat.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.properties.i
data/src/share/vm/asm/codeBuffer.cpp.i
-data/src/cpu/x86/vm/stubRoutines_x86_64.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerField.java.i
data/src/share/vm/c1/c1_globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/SymbolKlass.java.i
data/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java.i
data/src/share/vm/gc_implementation/g1/g1MarkSweep.hpp.i
data/src/share/vm/gc_implementation/g1/dirtyCardQueue.hpp.i
data/src/share/vm/shark/sharkValue.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegisters.java.i
data/build/windows/jvmexp.lcf.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.inline.hpp.i
data/agent/make/bugspot.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicNamedFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Page.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/TypeImpl.java.i
data/src/share/vm/prims/methodHandles.hpp.i
-data/src/share/vm/runtime/deoptimization.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java.i
-data/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp.i
+data/src/share/vm/runtime/reflection.hpp.i
+data/src/cpu/sparc/vm/vmreg_sparc.hpp.i
data/src/cpu/x86/vm/vmreg_x86.hpp.i
data/agent/src/os/linux/libproc_impl.h.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFile.java.i
data/agent/src/share/classes/sun/jvm/hotspot/Win32VtblAccess.java.i
+data/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPreComp.java.i
data/src/share/vm/c1/c1_Compiler.cpp.i
data/src/share/vm/memory/generationSpec.hpp.i
@@ -497,9 +511,10 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeVisitor.java.i
data/make/cscope.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadContext.java.i
data/src/os/solaris/vm/attachListener_solaris.cpp.i
+data/make/bsd/makefiles/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/amd64/RemoteAMD64ThreadFactory.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeRootInputs.filter.i
-data/src/share/vm/oops/klassKlass.hpp.i
+data/src/share/vm/utilities/elfStringTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LineInfo.java.i
data/make/linux/makefiles/vm.make.i
data/src/share/vm/oops/cpCacheKlass.cpp.i
@@ -509,36 +524,37 @@ data/agent/make/build-pkglist.i
data/make/solaris/makefiles/defs.make.i
data/agent/make/heapsumwindbg64.bat.i
data/src/os_cpu/solaris_x86/vm/vmStructs_solaris_x86.hpp.i
-data/agent/make/build.xml.i
+data/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp.i
data/src/share/vm/interpreter/invocationCounter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/PageCache.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIllegalInstruction.java.i
data/src/share/vm/oops/methodKlass.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/combine.filter.i
+data/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/ParallelScavengeHeap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ShortField.java.i
-data/src/share/vm/shark/sharkState.hpp.i
-data/src/share/vm/opto/loopTransform.cpp.i
+data/build/sa.files.i
+data/agent/src/os/bsd/Makefile.i
data/src/cpu/sparc/vm/disassembler_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java.i
data/build/solaris/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/InterpretedVFrame.java.i
data/src/os_cpu/windows_x86/vm/os_windows_x86.cpp.i
data/src/cpu/x86/vm/vtableStubs_x86_32.cpp.i
-data/src/share/vm/interpreter/templateTable.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java.i
data/make/solaris/platform_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SethiDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/HeapDumper.java.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java.i
-data/build/solaris/makefiles/mapfile-vers-COMPILER1.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java.i
+data/src/share/vm/opto/domgraph.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/StringTransferable.java.i
data/build/windows/makefiles/fastdebug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java.i
data/agent/src/os/win32/nt4internals.hpp.i
data/src/share/vm/runtime/vframeArray.hpp.i
data/src/share/vm/runtime/stubRoutines.hpp.i
+data/agent/make/jsdbwindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java.i
data/src/share/vm/runtime/stackValueCollection.cpp.i
data/agent/make/start-debug-server.i
@@ -547,10 +563,8 @@ data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/genfiles.properties.i
data/src/share/vm/prims/methodComparator.hpp.i
data/make/windows/create_obj_files.sh.i
data/src/cpu/x86/vm/dump_x86_32.cpp.i
-data/src/share/vm/adlc/archDesc.hpp.i
-data/build/solaris/makefiles/hp1.make.i
-data/src/share/vm/code/dependencies.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter.i
+data/src/share/vm/oops/objArrayKlass.hpp.i
+data/src/share/vm/memory/oopFactory.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/build.xml.i
data/agent/src/share/classes/com/sun/java/swing/action/FileMenu.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86DirectAddress.java.i
@@ -558,6 +572,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMObjectFactory.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNodeListModel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestDebugInfo.java.i
+data/make/bsd/platform_zero.in.i
data/test/compiler/6724218/Test.java.i
data/build/windows/cross_build.bat.i
data/src/share/vm/oops/methodDataOop.hpp.i
@@ -565,23 +580,24 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReadInstruction.ja
data/src/os_cpu/solaris_sparc/vm/assembler_solaris_sparc.cpp.i
data/make/linux/makefiles/hp1.make.i
data/src/share/vm/opto/phase.hpp.i
-data/test/compiler/6769124/TestDeoptInt6769124.java.i
data/src/cpu/sparc/vm/c1_globals_sparc.hpp.i
data/src/share/vm/oops/constMethodKlass.cpp.i
data/src/cpu/zero/vm/templateInterpreterGenerator_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeLeafIndices.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java.i
+data/src/share/vm/memory/collectorPolicy.cpp.i
data/agent/src/os/solaris/dbx/shell_imp.h.i
data/build/windows/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/DefaultScriptObject.java.i
data/build/solaris/makefiles/mapfile-vers-debug.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java.i
-data/test/compiler/5091921/Test6959129.java.i
-data/test/compiler/6910618/Test.java.i
+data/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.i
+data/src/cpu/x86/vm/frame_x86.hpp.i
+data/src/share/vm/classfile/classFileError.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxX86JavaThreadPDAccess.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLoadDecoder.java.i
+data/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp.i
data/src/cpu/x86/vm/c1_FpuStackSim_x86.hpp.i
+data/test/compiler/7068051/Test7068051.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/JavaLineNumberInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LocalVariableTableElement.java.i
data/src/os_cpu/linux_x86/vm/threadLS_linux_x86.hpp.i
@@ -595,56 +611,59 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeTableswitch.jav
data/src/share/vm/gc_implementation/shared/vmGCOperations.hpp.i
data/agent/src/os/win32/ports.h.i
data/src/share/vm/c1/c1_IR.hpp.i
-data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java.i
+data/make/bsd/build.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Register.java.i
data/src/share/vm/gc_implementation/shared/markSweep.inline.hpp.i
-data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Dictionary.java.i
data/src/share/vm/runtime/memprofiler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCStoreInstruction.java.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Constants.java.i
data/agent/make/permstatproc.sh.i
-data/src/share/vm/memory/blockOffsetTable.cpp.i
data/test/compiler/6857159/Test6857159.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaVM.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeapName.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Immediate.java.i
-data/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp.i
+data/src/share/vm/code/oopRecorder.cpp.i
+data/make/bsd/makefiles/adlc.make.i
data/agent/src/os/win32/Handler.hpp.i
data/build/solaris/makefiles/jvmg.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32CDebugInfoBuilder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties.i
data/make/windows/projectfiles/compiler1/Makefile.i
-data/src/share/vm/ci/ciSymbol.hpp.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java.i
data/src/share/tools/IdealGraphVisualizer/Data/manifest.mf.i
data/build/solaris/makefiles/mapfile-vers-jvm_db.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FlushwDecoder.java.i
data/src/cpu/zero/vm/codeBuffer_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCHelper.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java.i
+data/build/linux/makefiles/launcher.make.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CheckedExceptionElement.java.i
data/src/share/vm/services/memoryUsage.hpp.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrsAnalysis.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties.i
+data/test/compiler/6866651/Test.java.i
data/src/share/vm/ci/ciTypeArrayKlassKlass.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psTasks.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGenGen.java.i
data/src/share/vm/utilities/globalDefinitions_gcc.hpp.i
data/src/share/vm/c1/c1_Compilation.hpp.i
-data/src/share/vm/runtime/orderAccess.hpp.i
+data/src/share/vm/classfile/javaClasses.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ParNewGeneration.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java.i
+data/build/solaris/makefiles/reorder_COMPILER2_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantDoubleValue.java.i
data/src/share/vm/runtime/registerMap.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OrSelector.java.i
data/src/share/vm/utilities/decoder.cpp.i
-data/src/share/vm/prims/jvmtiEnv.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV8Disassembler.java.i
-data/test/compiler/6832293/Test.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java.i
+data/src/share/vm/opto/phaseX.cpp.i
data/src/share/vm/runtime/vmStructs.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/project.properties.i
data/src/share/vm/services/threadService.hpp.i
@@ -653,24 +672,21 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedObject.java.
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ImpdepInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Event.java.i
data/agent/doc/transported_core.html.i
-data/test/compiler/6865031/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/DirectAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/CharTypeImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/remove.gif.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp.i
-data/src/share/tools/LogCompilation/Makefile.i
-data/src/os_cpu/solaris_x86/vm/solaris_x86_64.il.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap32.java.i
data/make/solaris/makefiles/fastdebug.make.i
-data/agent/test/jdi/multivm.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java.i
data/src/share/vm/gc_implementation/shared/generationCounters.cpp.i
data/src/share/vm/interpreter/interpreterGenerator.hpp.i
data/make/windows/build.bat.i
data/make/solaris/makefiles/product.make.i
-data/src/share/vm/opto/reg_split.cpp.i
data/agent/make/jstackproc64.sh.i
data/build/windows/makefiles/compile.make.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties.i
+data/build/solaris/platform_sparcv9.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardConfiguration.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/SectionHeader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/DeadlockDetectionPanel.java.i
@@ -678,37 +694,36 @@ data/src/os/linux/vm/os_share_linux.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathList.java.i
data/src/cpu/zero/vm/interpreterGenerator_zero.hpp.i
data/build/solaris/reorder.sh.i
+data/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp.i
data/make/windows/projectfiles/compiler1/vm.def.i
data/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/breakpoint.png.i
-data/src/cpu/x86/vm/copy_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGoto.java.i
data/src/os/solaris/dtrace/generateJvmOffsets.cpp.i
data/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPStoreInstruction.java.i
-data/src/os/linux/vm/c1_globals_linux.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMReg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadFactory.java.i
data/src/cpu/sparc/vm/interpreterRT_sparc.cpp.i
-data/src/share/vm/gc_implementation/g1/heapRegion.cpp.i
-data/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java.i
data/src/share/vm/interpreter/bytecodes.hpp.i
data/make/openjdk_distro.i
-data/src/share/vm/runtime/relocator.hpp.i
-data/src/share/tools/hsdis/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java.i
data/src/cpu/sparc/vm/jniTypes_sparc.hpp.i
data/src/cpu/sparc/vm/sparc.ad.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponent.form.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java.i
+data/src/cpu/x86/vm/vmreg_x86.cpp.i
data/src/share/vm/opto/parse1.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RootTreeNodeAdapter.java.i
-data/src/share/vm/c1/c1_CFGPrinter.cpp.i
+data/src/share/vm/services/memoryPool.cpp.i
data/src/share/vm/runtime/simpleThresholdPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/NamedFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxThreadFactory.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.inline.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatform.java.i
-data/src/cpu/sparc/vm/interpreter_sparc.hpp.i
data/test/compiler/6700047/Test6700047.java.i
data/agent/src/share/classes/META-INF/services/com.sun.jdi.connect.Connector.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredSpace.java.i
@@ -716,37 +731,39 @@ data/build/solaris/makefiles/adlc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbol.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectListPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/MethodCallable.java.i
-data/make/defs.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBColor.java.i
+data/src/os/windows/vm/c2_globals_windows.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFFileParser.java.i
-data/test/compiler/5091921/Test6931567.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ContigPermSpace.java.i
-data/test/compiler/5091921/Test7020614.java.i
data/src/share/vm/classfile/loaderConstraints.hpp.i
data/src/cpu/x86/vm/globalDefinitions_x86.hpp.i
data/src/share/vm/memory/space.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.java.i
-data/src/share/vm/prims/jvmtiRedefineClasses.hpp.i
+data/test/compiler/7042153/Test7042153.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEvent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPArithmeticDecoder.java.i
data/build/solaris/makefiles/cscope.make.i
data/src/share/vm/utilities/errorReporter.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/CodeViewerPanel.java.i
data/src/cpu/x86/vm/c2_init_x86.cpp.i
-data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.i
+data/src/share/vm/opto/output.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/JavaStackTraceAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/MirrorImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java.i
data/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp.i
data/src/cpu/zero/vm/interpreterRT_zero.hpp.i
data/build/linux/makefiles/debug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/resources/arrow.png.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArrayKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugTypes.java.i
data/src/share/tools/ProjectCreator/Macro.java.i
data/src/share/vm/gc_implementation/shared/spaceDecorator.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java.i
-data/src/os/solaris/vm/os_solaris.inline.hpp.i
+data/src/share/vm/code/compiledIC.hpp.i
data/src/share/vm/ci/ciKlassKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/CPPExpressions.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObjectComparator.java.i
@@ -754,68 +771,77 @@ data/test/compiler/5091921/Test6985295.java.i
data/src/share/vm/code/pcDesc.cpp.i
data/src/share/vm/gc_implementation/g1/g1RemSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicMemberFunctionType.java.i
-data/src/share/vm/services/management.hpp.i
+data/src/share/vm/runtime/basicLock.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Timing.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java.i
+data/src/share/vm/code/compressedStream.cpp.i
+data/make/solaris/makefiles/saproc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/hide.gif.i
-data/src/share/vm/services/lowMemoryDetector.hpp.i
-data/src/share/vm/gc_implementation/g1/g1_globals.hpp.i
+data/src/cpu/zero/vm/frame_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/ClassBrowserPanel.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/SymbolLookup.java.i
data/build/solaris/makefiles/kernel.make.i
data/src/share/vm/adlc/main.cpp.i
-data/test/runtime/6626217/Test6626217.sh.i
+data/src/cpu/zero/vm/stack_zero.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties.i
data/agent/src/os/win32/Dispatcher.cpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/project.xml.i
+data/build/linux/makefiles/i486.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java.i
data/src/share/tools/ProjectCreator/Util.java.i
data/src/cpu/sparc/vm/templateTable_sparc.cpp.i
data/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp.i
-data/agent/src/os/win32/initWinsock.hpp.i
+data/agent/make/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/FlagDumper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FieldTreeNodeAdapter.java.i
-data/src/share/vm/classfile/loaderConstraints.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java.i
+data/src/share/vm/c1/c1_InstructionPrinter.hpp.i
data/agent/test/libproc/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FloatBranchDecoder.java.i
+data/agent/src/os/bsd/ps_proc.c.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/LongTreeNodeAdapter.java.i
data/src/share/vm/opto/stringopts.hpp.i
data/test/compiler/6849574/Test.java.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.inline.hpp.i
-data/src/share/vm/includeDB_gc_parallel.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86Thread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadContext.java.i
-data/build/linux/makefiles/launcher.make.i
+data/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp.i
+data/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp.i
data/src/share/vm/runtime/hpi.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/down.gif.i
data/src/share/tools/IdealGraphVisualizer/View/manifest.mf.i
data/src/share/vm/code/oopRecorder.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/MutableSpace.java.i
data/src/cpu/sparc/vm/assembler_sparc.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachIfNode.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp.i
data/src/share/vm/runtime/sweeper.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java.i
-data/src/share/vm/interpreter/cppInterpreterGenerator.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpacePrefetchDecoder.java.i
-data/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp.i
+data/make/windows/README.i
data/src/os/linux/launcher/java_md.h.i
+data/make/bsd/makefiles/debug.make.i
+data/make/bsd/makefiles/sparc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassLoaderReferenceImpl.java.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad.i
data/make/linux/platform_ppc.i
-data/src/share/vm/services/memoryService.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9DoneRetryDecoder.java.i
+data/src/share/vm/runtime/dtraceJSDT.cpp.i
data/make/linux/platform_i486.i
data/src/share/vm/runtime/stackValue.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/build.xml.i
+data/src/share/vm/prims/jvmtiRedefineClasses.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBNode.java.i
-data/src/share/vm/ci/ciInstanceKlassKlass.cpp.i
+data/src/share/vm/memory/universe.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BaseClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SAPIDAttachingConnector.java.i
data/src/os_cpu/linux_x86/vm/bytes_linux_x86.inline.hpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Find16.gif.i
data/src/share/vm/memory/generation.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/StoreDecoder.java.i
-data/test/compiler/6800154/Test6800154.java.i
+data/make/bsd/platform_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCThreadContext.java.i
data/src/os_cpu/linux_x86/vm/globals_linux_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/RandomAccessFileDataSource.java.i
@@ -823,28 +849,32 @@ data/agent/src/share/classes/images/toolbarButtonGraphics/general/New24.gif.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.properties.i
data/src/share/vm/gc_interface/gcCause.cpp.i
data/src/os_cpu/solaris_x86/vm/vm_version_solaris_x86.cpp.i
-data/test/compiler/6837011/Test6837011.java.i
-data/src/share/vm/gc_implementation/shared/allocationStats.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortTypeImpl.java.i
-data/src/share/vm/oops/typeArrayKlass.hpp.i
+data/src/share/vm/gc_implementation/shared/liveRange.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java.i
data/src/share/vm/oops/objArrayOop.hpp.i
+data/make/linux/Queens.class.i
data/src/cpu/sparc/vm/stubRoutines_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/project.xml.i
-data/src/share/vm/ci/ciExceptionHandler.cpp.i
+data/src/share/vm/c1/c1_Optimizer.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockWidget.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.form.i
-data/src/cpu/zero/vm/stubRoutines_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/Inspector.java.i
+data/src/share/vm/compiler/disassembler.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java.i
data/src/os/linux/vm/os_linux.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/SlotWidget.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/TenuredGeneration.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/manifest.mf.i
data/src/cpu/zero/vm/frame_zero.hpp.i
-data/build/solaris/makefiles/top.make.i
-data/agent/src/os/linux/proc_service.h.i
+data/test/compiler/5091921/Test6931567.java.i
+data/build/linux/Makefile.i
data/src/share/vm/ci/ciObjectFactory.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryIndirectAddress.java.i
data/src/cpu/sparc/vm/registerMap_sparc.hpp.i
+data/make/bsd/makefiles/arm.make.i
data/src/share/tools/IdealGraphVisualizer/nbproject/platform.properties.i
data/src/os_cpu/windows_x86/vm/unwind_windows_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCBranchInstruction.java.i
@@ -853,7 +883,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIntelX86.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSectionDefinitionsRecord.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/platform.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidTypeImpl.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ScriptEngineAbstraction.java.i
data/build/linux/makefiles/defs.make.i
data/src/share/vm/utilities/dtrace.hpp.i
data/src/share/vm/oops/oop.inline2.hpp.i
@@ -861,38 +891,44 @@ data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackFrameStream.java.i
data/src/share/vm/c1/c1_FrameMap.cpp.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/platform.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RegisterDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SaveDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/Format3ADecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVrDecoder.java.i
data/build/solaris/makefiles/reorder_COMPILER1_sparcv9.i
+data/src/cpu/zero/vm/stubGenerator_zero.cpp.i
data/src/share/vm/runtime/simpleThresholdPolicy.hpp.i
-data/build/windows/projectfiles/kernel/vm.def.i
+data/test/compiler/6865031/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/CIntegerAccessor.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java.i
-data/src/share/vm/compiler/abstractCompiler.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.properties.i
-data/test/compiler/6863155/Test6863155.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureInfo.java.i
-data/src/cpu/x86/vm/codeBuffer_x86.hpp.i
+data/src/cpu/zero/vm/depChecker_zero.cpp.i
data/src/share/vm/oops/typeArrayOop.cpp.i
data/src/share/vm/runtime/globals_extension.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadGroupReferenceImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveInstruction.java.i
data/agent/src/share/native/jvmdi/sa.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JShortField.java.i
data/src/share/vm/services/attachListener.cpp.i
-data/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp.i
+data/src/share/vm/opto/locknode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PermStat.java.i
data/src/os/windows/vm/globals_windows.hpp.i
data/make/jdk6_hotspot_distro.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java.i
-data/make/solaris/makefiles/mapfile-vers-TIERED.i
+data/src/cpu/sparc/vm/methodHandles_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/Array.java.i
+data/src/share/vm/libadt/vectset.cpp.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.cpp.i
-data/src/share/tools/MakeDeps/MakeDeps.java.i
+data/src/share/vm/ci/ciObjArrayKlassKlass.hpp.i
data/src/cpu/sparc/vm/nativeInst_sparc.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties.i
+data/make/solaris/makefiles/sparc.make.i
data/src/cpu/x86/vm/assembler_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/UncommonTrapBlob.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.form.i
data/src/cpu/zero/vm/vmreg_zero.hpp.i
@@ -900,12 +936,12 @@ data/src/share/vm/services/dtraceAttacher.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeNewArray.java.i
data/agent/make/heapdumpwindbg64.bat.i
data/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp.i
+data/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentWstcref.xml.i
data/src/share/vm/interpreter/interpreterRuntime.hpp.i
data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.hpp.i
-data/src/share/vm/memory/oopFactory.cpp.i
data/agent/src/os/win32/windbg/sawindbg.cpp.i
-data/src/share/vm/memory/generation.hpp.i
+data/src/os/bsd/vm/attachListener_bsd.cpp.i
data/make/windows/makefiles/makedeps.make.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.java.i
data/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp.i
@@ -915,42 +951,49 @@ data/src/share/vm/runtime/handles.inline.hpp.i
data/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JBooleanField.java.i
data/build/solaris/makefiles/reorder_CORE_i486.i
-data/src/share/vm/opto/stringopts.cpp.i
+data/test/compiler/6792161/Test6792161.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java.i
data/src/os_cpu/solaris_sparc/vm/globals_solaris_sparc.hpp.i
+data/test/compiler/7070134/words.i
data/src/share/vm/opto/addnode.hpp.i
-data/src/share/vm/interpreter/bytecodeInterpreter.cpp.i
+data/src/share/vm/utilities/accessFlags.cpp.i
data/test/compiler/7041100/Test7041100.java.i
+data/src/cpu/zero/vm/methodHandles_zero.hpp.i
+data/src/share/tools/launcher/wildcard.c.i
data/make/windows/projectfiles/compiler1/vm.dsw.i
data/agent/make/dumpsyspropsproc64.sh.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java.i
data/src/os/solaris/vm/perfMemory_solaris.cpp.i
-data/src/share/vm/services/management.cpp.i
+data/test/compiler/6795362/Test6795362.java.i
data/src/share/vm/runtime/sharedRuntime.hpp.i
-data/src/share/vm/runtime/stackValue.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java.i
+data/src/share/tools/ProjectCreator/FileFormatException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSLibraries.java.i
-data/build/linux/Makefile.i
+data/agent/src/os/linux/proc_service.h.i
data/src/share/vm/gc_implementation/shared/ageTable.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp.i
-data/src/share/vm/utilities/elfFile.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java.i
+data/make/bsd/makefiles/ia64.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVrInstruction.java.i
data/src/os/linux/vm/os_linux.hpp.i
data/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadFactory.java.i
+data/make/templates/gpl-header.i
data/agent/make/pstackwindbg64.bat.i
-data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHeap.java.i
data/src/share/vm/runtime/serviceThread.hpp.i
-data/src/share/vm/memory/genRemSet.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FieldIdentifier.java.i
-data/test/compiler/6756768/Test6756768.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Difference.java.i
data/src/os_cpu/linux_sparc/vm/prefetch_linux_sparc.inline.hpp.i
data/make/linux/makefiles/jsig.make.i
-data/src/share/vm/shark/sharkType.hpp.i
data/src/os/linux/vm/threadCritical_linux.cpp.i
data/agent/make/ClosureFinder.java.i
-data/make/solaris/makefiles/mapfile-vers-COMPILER1.i
+data/src/share/vm/code/debugInfoRec.hpp.i
data/src/cpu/x86/vm/c1_FrameMap_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/InstructionDecoder.java.i
data/src/share/vm/services/gcNotifier.cpp.i
@@ -964,11 +1007,11 @@ data/make/linux/makefiles/mapfile-vers-product.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/FloatTreeNodeAdapter.java.i
data/agent/make/jstackproc.sh.i
data/src/share/vm/adlc/formssel.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64Thread.java.i
data/build/linux/adlc_updater.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAsAction.java.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC8.java.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrivilegedReadWriteDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/graph.gif.i
data/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp.i
@@ -976,37 +1019,41 @@ data/agent/src/share/classes/com/sun/java/swing/action/AlignLeftAction.java.i
data/src/share/tools/launcher/java.h.i
data/src/os/linux/vm/thread_linux.inline.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java.i
+data/test/compiler/7044738/Test7044738.java.i
data/src/cpu/zero/vm/disassembler_zero.hpp.i
-data/test/compiler/6663848/Tester.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedLong.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp.i
data/agent/make/permstatwindbg.bat.i
data/src/share/vm/gc_implementation/shared/ageTable.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf.i
+data/test/compiler/7070134/Test7070134.sh.i
data/src/share/tools/IdealGraphVisualizer/README.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/DLL.java.i
-data/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp.i
-data/src/share/vm/gc_implementation/includeDB_gc_parNew.i
+data/make/windows/projectfiles/tiered/vm.dsw.i
+data/src/share/vm/runtime/dtraceJSDT.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolKlass.java.i
data/src/share/vm/runtime/sharedRuntime.cpp.i
data/src/share/vm/prims/jvmtiLib.xsl.i
data/src/share/vm/oops/objArrayKlass.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/project.xml.i
-data/src/share/vm/memory/defNewGeneration.hpp.i
-data/src/share/vm/utilities/stack.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFPArithmeticInstruction.java.i
-data/src/share/vm/oops/arrayOop.cpp.i
data/src/cpu/x86/vm/registerMap_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/manifest.mf.i
data/agent/make/saenv64.sh.i
data/src/share/vm/oops/compiledICHolderKlass.cpp.i
+data/make/bsd/makefiles/mapfile-vers-jsig.i
data/src/share/vm/classfile/placeholders.hpp.i
-data/src/os/windows/vm/c1_globals_windows.hpp.i
+data/src/share/vm/classfile/classFileParser.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindByQueryPanel.java.i
-data/src/share/vm/classfile/verifier.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java.i
+data/src/os/bsd/vm/mutex_bsd.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditorFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisters.java.i
+data/src/cpu/sparc/vm/globalDefinitions_sparc.hpp.i
+data/make/linux/makefiles/fastdebug.make.i
+data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp.i
data/src/share/vm/c1/c1_Compilation.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionTypes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgDebuggerLocal.java.i
@@ -1015,9 +1062,12 @@ data/agent/src/share/classes/images/toolbarButtonGraphics/general/History24.gif.
data/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp.i
data/agent/test/jdi/sagclient.java.i
data/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp.i
+data/agent/src/os/bsd/elfmacros.h.i
data/src/share/vm/adlc/Test/i486.ad.i
data/src/share/vm/oops/oop.cpp.i
data/src/cpu/sparc/vm/cppInterpreter_sparc.hpp.i
+data/make/bsd/makefiles/sa.make.i
+data/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp.i
data/src/share/vm/ci/ciType.hpp.i
data/build/solaris/makefiles/dtrace.make.i
data/agent/src/scripts/start-rmiregistry.bat.i
@@ -1025,26 +1075,33 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86ThreadCont
data/src/cpu/zero/vm/icBuffer_zero.cpp.i
data/src/share/vm/memory/compactingPermGenGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/VoidType.java.i
-data/src/share/vm/services/memoryPool.cpp.i
+data/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.i
data/agent/src/os/solaris/Makefile.i
-data/src/share/vm/gc_implementation/g1/heapRegion.hpp.i
+data/make/bsd/makefiles/dtrace.make.i
data/make/solaris/makefiles/vm.make.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGetField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ConcurrentMarkSweepGeneration.java.i
-data/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp.i
-data/src/os_cpu/linux_x86/vm/prefetch_linux_x86.inline.hpp.i
-data/test/compiler/6659207/Test.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java.i
+data/src/os/solaris/vm/os_solaris.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java.i
+data/agent/make/pstackwindbg.bat.i
+data/test/compiler/7088020/Test7088020.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java.i
+data/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/HSDBActionManager.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java.i
+data/src/share/vm/gc_interface/collectedHeap.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaHeap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JInfo.java.i
data/agent/make/soqlproc64.sh.i
-data/agent/make/pstackproc.sh.i
+data/src/os/solaris/vm/os_solaris.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/ShowAction.java.i
data/src/share/tools/MakeDeps/MetroWerksMacPlatform.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/project.properties.i
data/make/linux/platform_arm.i
-data/make/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/agent/make/heapdumpproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java.i
data/make/windows/jvmexp_g.lcf.i
data/make/Makefile.i
data/src/cpu/zero/vm/interpreter_zero.cpp.i
@@ -1053,163 +1110,160 @@ data/agent/doc/jsdb.html.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantOopReadValue.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/History16.gif.i
data/src/share/vm/runtime/frame.hpp.i
-data/src/share/vm/shark/sharkTopLevelBlock.hpp.i
+data/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/SpaceClosure.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86LogicInstruction.java.i
data/build/solaris/makefiles/makedeps.make.i
data/src/share/vm/prims/jni.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/layer.xml.i
data/src/share/vm/memory/specialized_oop_closures.cpp.i
-data/test/compiler/6894807/Test6894807.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Register.java.i
data/build/solaris/build.sh.i
data/src/share/vm/interpreter/bytecodes.cpp.i
data/.hgtags.i
data/build/windows/projectfiles/core/Makefile.i
-data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp.i
-data/src/share/vm/adlc/filebuff.hpp.i
-data/make/templates/bsd-header.i
-data/src/share/vm/gc_implementation/g1/sparsePRT.cpp.i
+data/src/cpu/sparc/vm/c1_Defs_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/extendedColor.filter.i
-data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.hpp.i
-data/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif.i
+data/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp.i
+data/agent/src/os/linux/ps_core.c.i
+data/src/share/vm/services/classLoadingService.cpp.i
+data/src/share/vm/interpreter/cppInterpreterGenerator.hpp.i
+data/src/os/bsd/vm/decoder_bsd.cpp.i
data/src/share/vm/oops/klass.inline.hpp.i
-data/test/compiler/5091921/Test6559156.java.i
data/src/share/vm/interpreter/interpreterRuntime.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Filter.java.i
-data/src/share/vm/memory/universe.hpp.i
data/src/share/vm/gc_implementation/g1/g1MMUTracker.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/PermGen.java.i
data/src/share/vm/opto/library_call.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/NoSuchSymbolException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/cInterpreter.java.i
-data/src/share/vm/opto/idealKit.cpp.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.i
data/src/share/vm/oops/markOop.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java.i
data/src/share/vm/oops/typeArrayKlassKlass.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.hpp.i
-data/src/share/vm/memory/specialized_oop_closures.hpp.i
+data/make/bsd/makefiles/sparcv9.make.i
+data/src/cpu/sparc/vm/vm_version_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/split.filter.i
data/agent/src/os/win32/Message.hpp.i
-data/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java.i
data/build/solaris/makefiles/hp.make.i
-data/make/linux/makefiles/fastdebug.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java.i
data/src/share/vm/interpreter/templateInterpreter.hpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/TabsDlg.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java.i
+data/src/os_cpu/linux_x86/vm/vm_version_linux_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/AndSelector.java.i
-data/src/share/vm/memory/barrierSet.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeStateList.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp.i
-data/src/share/vm/utilities/bitMap.hpp.i
data/.jcheck/conf.i
data/test/compiler/6879902/Test6879902.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodDataKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublic.java.i
-data/src/share/vm/services/classLoadingService.cpp.i
data/src/cpu/sparc/vm/cppInterpreter_sparc.cpp.i
-data/test/compiler/6823354/Test6823354.java.i
+data/src/share/vm/ci/ciArrayKlassKlass.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPInstructionDecoder.java.i
data/src/share/vm/runtime/signature.hpp.i
-data/make/linux/makefiles/sparcv9.make.i
-data/src/share/vm/classfile/symbolTable.cpp.i
-data/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ObjectHistogram.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/Address.java.i
+data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp.i
+data/src/share/vm/ci/ciField.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ObjectHistogram.java.i
data/src/share/vm/gc_implementation/g1/collectionSetChooser.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/PrimitiveValueImpl.java.i
data/src/share/vm/code/debugInfoRec.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExportCookie.java.i
+data/make/bsd/platform_sparc.i
data/src/cpu/zero/vm/sharkFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ShiftDecoder.java.i
data/agent/make/finalizerinfowindbg64.bat.i
-data/src/share/vm/utilities/histogram.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TemplateType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/ContiguousSpace.java.i
data/src/share/vm/shark/sharkRuntime.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/InterClusterConnection.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NodeFindAction.java.i
data/build/windows/makefiles/sa.make.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/build.xml.i
data/src/share/vm/utilities/histogram.hpp.i
data/src/share/vm/interpreter/templateTable.cpp.i
-data/build/windows/makefiles/adlc.make.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupOrganizer.java.i
data/src/cpu/x86/vm/interpreter_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMap.java.i
-data/src/share/vm/opto/indexSet.hpp.i
data/make/hotspot_version.i
data/src/share/vm/utilities/constantTag.cpp.i
-data/make/windows/makefiles/sa.make.i
+data/src/share/vm/gc_implementation/g1/survRateGroup.hpp.i
+data/src/share/vm/opto/postaloc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFileRecord.java.i
-data/test/compiler/6689060/Test.java.i
+data/src/cpu/x86/vm/register_x86.hpp.i
data/src/share/vm/prims/jvmtiUtil.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ProgressiveHeapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64Frame.java.i
data/src/share/vm/c1/c1_ValueSet.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescription.java.i
data/src/cpu/x86/vm/sharedRuntime_x86_32.cpp.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp.i
data/src/os_cpu/linux_sparc/vm/os_linux_sparc.hpp.i
data/src/share/vm/shark/sharkBlock.hpp.i
data/src/share/vm/runtime/statSampler.cpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif.i
+data/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp.i
data/src/cpu/zero/vm/entryFrame_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/RMIHelper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ObjectVisitor.java.i
data/src/share/vm/runtime/icache.cpp.i
-data/src/cpu/zero/vm/depChecker_zero.cpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java.i
+data/src/cpu/x86/vm/codeBuffer_x86.hpp.i
+data/src/share/vm/c1/c1_ValueType.cpp.i
data/src/share/vm/compiler/abstractCompiler.cpp.i
data/src/share/vm/interpreter/bytecodeStream.cpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentWstcref.xml.i
data/src/os_cpu/windows_x86/vm/prefetch_windows_x86.inline.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp.i
+data/src/cpu/sparc/vm/depChecker_sparc.hpp.i
data/agent/src/share/lib/maf-1_0.jar.i
data/src/share/vm/oops/instanceOop.hpp.i
data/src/share/vm/utilities/growableArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodKlass.java.i
-data/agent/src/share/classes/com/sun/java/swing/ui/SplashScreen.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Address.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WriteInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/EnumTreeNodeAdapter.java.i
data/agent/src/os/win32/windbg/Makefile.i
+data/agent/src/os/bsd/BsdDebuggerLocal.c.i
data/src/share/vm/prims/nativeLookup.cpp.i
data/src/share/vm/runtime/safepoint.hpp.i
data/src/share/vm/runtime/timer.cpp.i
-data/build/linux/makefiles/jsig.make.i
-data/src/share/vm/oops/methodDataKlass.hpp.i
-data/src/share/vm/classfile/dictionary.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/JSDB.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RdprDecoder.java.i
data/src/cpu/x86/vm/bytecodes_x86.cpp.i
data/src/share/vm/memory/compactPermGen.hpp.i
-data/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java.i
data/src/share/vm/gc_implementation/shared/hSpaceCounters.cpp.i
data/src/share/vm/memory/iterator.cpp.i
data/src/os_cpu/linux_x86/vm/copy_linux_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeGotoW.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ViewMenu.java.i
-data/src/share/vm/ci/ciUtilities.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConcreteMethodImpl.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeNode.java.i
-data/src/share/vm/opto/chaitin.hpp.i
data/src/share/vm/memory/allocation.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesCookie.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/build-impl.xml.i
data/agent/test/jdi/jstack.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDebugEvent.java.i
+data/src/share/vm/runtime/fieldDescriptor.cpp.i
data/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp.i
-data/agent/make/start-debug-server-proc64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ScriptObject.java.i
data/src/os/linux/vm/jvm_linux.h.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ExternalVFrame.java.i
data/src/cpu/x86/vm/relocInfo_x86.cpp.i
data/src/os/linux/vm/globals_linux.hpp.i
-data/src/share/vm/oops/symbol.cpp.i
+data/make/linux/makefiles/ppc.make.i
data/src/cpu/sparc/vm/vmreg_sparc.cpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight24.gif.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java.i
data/src/share/vm/oops/oop.hpp.i
-data/src/share/vm/shark/sharkFunction.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/expand.gif.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ConnectionAnchor.java.i
data/src/share/vm/shark/sharkState.cpp.i
data/src/cpu/zero/vm/disassembler_zero.cpp.i
@@ -1217,15 +1271,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java.i
data/src/share/vm/oops/symbolKlass.cpp.i
data/src/share/vm/prims/forte.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFileParser.java.i
-data/src/share/vm/opto/superword.cpp.i
-data/src/share/vm/prims/jniFastGetField.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ArithmeticInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/JavaSE6ScriptEngine.java.i
+data/src/share/vm/prims/jvm.cpp.i
+data/test/runtime/7051189/Xchecksig.sh.i
data/src/share/vm/prims/jni_md.h.i
data/src/share/vm/oops/methodKlass.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java.i
data/agent/src/os/win32/Reaper.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/AddressVisitor.java.i
-data/src/share/vm/opto/locknode.cpp.i
+data/src/cpu/sparc/vm/cppInterpreterGenerator_sparc.hpp.i
data/test/compiler/6857159/Test6857159.sh.i
data/src/share/vm/runtime/fieldType.hpp.i
data/src/os/solaris/launcher/java_md.c.i
@@ -1233,78 +1287,82 @@ data/agent/make/jstackwindbg64.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/RestoreDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicArrayType.java.i
data/src/share/vm/opto/graphKit.hpp.i
-data/src/cpu/sparc/vm/c2_globals_sparc.hpp.i
+data/src/os/posix/launcher/java_md.c.i
data/agent/src/os/solaris/dbx/README.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIndexableFieldIdentifier.java.i
data/agent/make/jhistoproc64.sh.i
-data/src/share/vm/ci/ciArrayKlass.cpp.i
-data/test/compiler/6795362/Test6795362.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java.i
data/src/share/vm/services/serviceUtil.hpp.i
data/src/os_cpu/linux_x86/vm/linux_x86_32.s.i
data/agent/src/os/win32/LockableList.hpp.i
+data/make/bsd/platform_amd64.suncc.i
data/src/share/vm/shark/sharkInvariants.cpp.i
+data/agent/make/clhsdbproc64.sh.i
data/agent/make/start-rmiregistry.bat.i
data/agent/make/clhsdbproc.sh.i
data/src/share/vm/utilities/sizes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueImpl.java.i
data/agent/make/heapsumwindbg.bat.i
-data/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PStack.java.i
+data/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp.i
data/src/os/solaris/vm/hpi_solaris.cpp.i
+data/src/share/vm/memory/genRemSet.inline.hpp.i
data/make/solaris/makefiles/reorder_CORE_sparcv9.i
data/src/share/vm/memory/heap.cpp.i
-data/src/os_cpu/solaris_x86/vm/solaris_x86_32.s.i
-data/src/share/vm/libadt/vectset.cpp.i
-data/src/share/vm/c1/c1_ValueSet.cpp.i
+data/make/solaris/makefiles/mapfile-vers-TIERED.i
+data/src/share/vm/gc_implementation/parNew/asParNewGeneration.cpp.i
+data/src/cpu/zero/vm/templateInterpreter_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/Callable.java.i
data/build/solaris/makefiles/reorder_COMPILER1_i486.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/GraphDocument.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java.i
-data/test/compiler/6823453/Test.java.i
data/src/share/vm/runtime/objectMonitor.cpp.i
-data/src/share/vm/prims/jvmtiTrace.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebugger.java.i
data/make/templates/gpl-cp-header.i
data/src/share/vm/opto/machnode.hpp.i
data/make/solaris/makefiles/reorder_TIERED_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_interface/CollectedHeap.java.i
data/build/windows/projectfiles/compiler2/ADLCompiler.dsw.i
+data/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJmp.java.i
-data/make/solaris/makefiles/reorder_COMPILER2_amd64.i
-data/src/share/vm/ci/ciObjArrayKlassKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java.i
+data/src/share/vm/runtime/globals.cpp.i
data/src/share/vm/prims/jvmtiTrace.hpp.i
-data/build/solaris/makefiles/sparcv9.make.i
-data/src/share/vm/shark/sharkContext.hpp.i
+data/src/cpu/zero/vm/copy_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/project.properties.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/SplitFilter.java.i
+data/build/windows/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGenGen.java.i
-data/src/share/vm/runtime/extendedPC.hpp.i
-data/src/share/vm/asm/assembler.hpp.i
+data/build/solaris/makefiles/core.make.i
+data/make/linux/makefiles/product.make.i
data/src/share/vm/oops/methodOop.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLogicInstruction.java.i
data/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Debugger.java.i
-data/src/os_cpu/windows_x86/vm/os_windows_x86.hpp.i
+data/src/share/vm/runtime/advancedThresholdPolicy.hpp.i
data/src/share/tools/MakeDeps/FileList.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoomout.gif.i
data/src/share/vm/gc_implementation/g1/g1AllocRegion.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java.i
+data/src/share/vm/asm/assembler.hpp.i
+data/agent/src/os/bsd/libproc.h.i
data/src/share/vm/gc_implementation/shared/gcStats.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/SymbolFinder.java.i
data/src/os/solaris/vm/interfaceSupport_solaris.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCNoopInstruction.java.i
data/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java.i
data/src/share/vm/runtime/atomic.cpp.i
-data/src/cpu/zero/vm/cppInterpreter_zero.cpp.i
+data/agent/src/os/bsd/libproc_impl.c.i
+data/test/compiler/6775880/Test.java.i
data/src/cpu/x86/vm/vm_version_x86_64.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java.i
data/agent/src/os/win32/IOBuf.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/Bundle.properties.i
data/src/share/vm/gc_implementation/g1/heapRegionSet.hpp.i
data/make/linux/makefiles/launcher.make.i
data/agent/make/dumpsyspropswindbg.bat.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphNode.java.i
-data/build/solaris/makefiles/compiler2.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/shared/ImmutableSpace.java.i
data/build/windows/README.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSlider.java.i
@@ -1315,13 +1373,14 @@ data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Inpu
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open24.gif.i
data/src/share/vm/shark/sharkMemoryManager.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Instruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSPublicSym.java.i
data/agent/make/saenv.sh.i
-data/src/share/vm/asm/assembler.cpp.i
data/src/os_cpu/linux_x86/vm/linux_x86_64.s.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/x86/RemoteX86ThreadContext.java.i
data/src/share/vm/gc_implementation/g1/concurrentMarkThread.inline.hpp.i
data/src/share/tools/hsdis/hsdis.c.i
+data/make/bsd/makefiles/adjust-mflags.sh.i
data/agent/make/permstatproc64.sh.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.hpp.i
@@ -1329,7 +1388,8 @@ data/src/os/solaris/vm/c2_globals_solaris.hpp.i
data/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp.i
data/src/share/vm/utilities/top.hpp.i
data/src/share/vm/classfile/classLoader.cpp.i
-data/make/solaris/makefiles/reorder_COMPILER1_amd64.i
+data/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java.i
data/src/share/vm/opto/locknode.hpp.i
data/src/share/vm/interpreter/templateInterpreterGenerator.hpp.i
data/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp.i
@@ -1340,104 +1400,110 @@ data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/f
data/agent/src/share/classes/sun/jvm/hotspot/code/Stub.java.i
data/src/share/vm/gc_implementation/g1/ptrQueue.cpp.i
data/build/linux/makefiles/mapfile-vers-jsig.i
-data/test/compiler/5091921/Test6753639.java.i
-data/src/share/vm/ci/ciMethodHandle.cpp.i
-data/src/os/linux/vm/objectMonitor_linux.cpp.i
-data/agent/src/os/win32/Monitor.hpp.i
+data/src/share/vm/prims/privilegedStack.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsLockVerifier.hpp.i
+data/make/templates/bsd-header.i
data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/JNITypeParser.java.i
data/src/share/vm/memory/referenceProcessor.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSELogicalDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Helper.java.i
+data/make/bsd/makefiles/optimized.make.i
data/test/compiler/6795465/Test6795465.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/TrapDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Parser.java.i
+data/test/runtime/6819213/TestBootNativeLibraryPath.java.i
data/src/share/vm/gc_implementation/shared/markSweep.hpp.i
data/src/share/vm/classfile/dictionary.hpp.i
-data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlock.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ConstructionException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditorCommands.java.i
data/src/share/vm/utilities/intHisto.cpp.i
-data/make/linux/makefiles/debug.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterType.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp.i
+data/src/share/tools/LogCompilation/Makefile.i
+data/agent/src/os/win32/SwDbgSrv.dsw.i
+data/agent/src/os/linux/libproc.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegisters.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/WrongTypeException.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapHprofBinWriter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewOptionsPanelController.java.i
data/src/cpu/zero/vm/shark_globals_zero.hpp.i
-data/src/share/vm/runtime/sharedRuntimeTrig.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java.i
data/src/cpu/x86/vm/x86_64.ad.i
-data/src/share/vm/prims/unsafe.cpp.i
data/src/os/linux/vm/os_linux.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/blocks.gif.i
data/src/share/vm/classfile/placeholders.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicVoidType.java.i
-data/make/windows/makefiles/top.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/JVMDIClassStatus.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/Bundle.properties.i
-data/src/share/vm/oops/constMethodOop.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/LogicalDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlassKlass.java.i
-data/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.i
+data/test/compiler/6909839/Test6909839.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java.i
+data/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegisters.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64/Win32IA64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ClosestSymbol.java.i
data/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java.i
-data/src/os/windows/vm/objectMonitor_windows.cpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9WrprDecoder.java.i
+data/src/share/vm/opto/ifnode.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/Type.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java.i
data/src/share/vm/utilities/globalDefinitions.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFProgramHeader.java.i
-data/src/os/windows/vm/interfaceSupport_windows.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceStoreDecoder.java.i
+data/src/share/vm/shark/sharkCacheDecache.hpp.i
+data/src/share/vm/opto/parse.hpp.i
+data/src/cpu/x86/vm/vmStructs_x86.hpp.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Information16.gif.i
-data/build/solaris/platform_sparcv9.i
-data/test/compiler/6792161/Test6792161.java.i
+data/src/os_cpu/windows_x86/vm/os_windows_x86.hpp.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties.i
+data/make/solaris/makefiles/mapfile-vers-jvm_dtrace.i
data/src/share/vm/runtime/icache.hpp.i
data/make/solaris/makefiles/launcher.make.i
-data/src/share/vm/opto/postaloc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC32Bit.java.i
+data/build/windows/makefiles/shared.make.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Bytes.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java.i
+data/make/bsd/makefiles/hp.make.i
+data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModLineNumberMap.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ValueContainer.java.i
+data/build/windows/makefiles/generated.make.i
data/agent/test/jdi/SASanityChecker.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicObjectLock.java.i
+data/src/share/vm/opto/matcher.cpp.i
data/src/cpu/x86/vm/assembler_x86.hpp.i
-data/test/compiler/7009231/Test7009231.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/suite.properties.i
-data/test/Makefile.i
-data/agent/src/os/win32/ioUtils.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfMemory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop2Decoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCCallInstruction.java.i
-data/build/linux/makefiles/hp.make.i
-data/agent/make/clhsdbwindbg64.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java.i
+data/src/share/vm/classfile/vmSymbols.hpp.i
data/src/share/vm/utilities/preserveException.hpp.i
+data/agent/src/os/bsd/mapfile.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java.i
data/agent/src/os/linux/mapfile.i
data/make/solaris/makefiles/jvmti.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FloatBranchDecoder.java.i
+data/src/share/vm/oops/klassKlass.hpp.i
data/src/os/solaris/launcher/java.c.i
data/test/compiler/6769124/TestArrayCopy6769124.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java.i
+data/agent/src/share/classes/com/sun/java/swing/action/SaveAsAction.java.i
data/src/share/vm/opto/phase.cpp.i
data/src/share/vm/runtime/objectMonitor.hpp.i
-data/src/share/vm/services/heapDumper.cpp.i
+data/src/os/linux/vm/dtraceJSDT_linux.cpp.i
data/src/share/vm/c1/c1_Runtime1.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorTopComponent.form.i
+data/src/share/vm/services/heapDumper.hpp.i
data/build/linux/makefiles/sparcWorks.make.i
-data/src/os/posix/launcher/java_md.h.i
data/src/cpu/zero/vm/bytes_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Operand.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86IllegalInstruction.java.i
data/src/share/vm/opto/buildOopMap.cpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.gif.i
-data/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java.i
-data/test/runtime/6626217/IFace.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogEvent.java.i
data/src/share/vm/opto/rootnode.cpp.i
data/src/share/vm/opto/cfgnode.hpp.i
-data/src/share/vm/utilities/copy.cpp.i
data/src/share/vm/prims/jvmtiAgentThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionTwosComplement.java.i
data/src/share/vm/utilities/globalDefinitions_visCPP.hpp.i
@@ -1445,133 +1511,142 @@ data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicGlobalSym.
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponent.java.i
data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.hpp.i
data/make/linux/makefiles/compiler1.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBitType.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/IntField.java.i
+data/src/os_cpu/solaris_x86/vm/solaris_x86_64.il.i
+data/agent/test/jdi/multivm.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java.i
data/test/runtime/6626217/bug_21227.java.i
-data/build/windows/build_vm_def.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMReg.java.i
+data/src/share/vm/ci/ciInstanceKlassKlass.cpp.i
+data/src/os/linux/vm/c1_globals_linux.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/DLL.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxThread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/Field.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/Help16.gif.i
+data/src/share/vm/runtime/relocator.hpp.i
+data/src/share/vm/memory/cardTableModRefBS.cpp.i
+data/src/share/vm/services/management.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CallDecoder.java.i
data/src/share/vm/gc_implementation/g1/concurrentZFThread.hpp.i
data/src/os_cpu/linux_sparc/vm/thread_linux_sparc.hpp.i
-data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties.i
+data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java.i
-data/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp.i
-data/src/share/vm/code/compressedStream.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml.i
+data/src/share/vm/runtime/relocator.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/VMModifiers.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp.i
data/src/cpu/zero/vm/templateTable_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolIterator.java.i
-data/src/share/vm/prims/jvmtiRedefineClasses.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java.i
data/src/share/vm/utilities/elfFile.hpp.i
data/src/share/vm/oops/klassKlass.cpp.i
data/src/os/solaris/dtrace/hs_private.d.i
data/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/manifest.mf.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java.i
data/make/jprt.properties.i
data/src/share/vm/gc_implementation/shared/vmGCOperations.cpp.i
-data/make/windows/projectfiles/tiered/vm.def.i
-data/src/share/vm/oops/klass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java.i
+data/src/share/vm/prims/forte.cpp.i
data/src/cpu/x86/vm/templateInterpreter_x86_64.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SaveDecoder.java.i
+data/src/share/vm/gc_implementation/includeDB_gc_parNew.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/sparc/SPARCThreadContext.java.i
-data/src/share/vm/utilities/workgroup.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/NamedFieldIdentifier.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/ObjectHistogramPanel.java.i
data/agent/make/README.txt.i
+data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java.i
+data/make/bsd/makefiles/jvmti.make.i
data/test/runtime/6626217/Loader2.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Array.java.i
-data/make/solaris/makefiles/sparc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/suite.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java.i
data/src/share/vm/opto/output.hpp.i
data/src/share/vm/c1/c1_IR.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegName.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciType.java.i
+data/src/share/vm/opto/stringopts.cpp.i
data/build/solaris/makefiles/mapfile-vers-jvm_dtrace.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialStoreDecoder.java.i
data/src/cpu/x86/vm/nativeInst_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisterAddress.java.i
data/src/share/vm/ci/ciObject.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/plus.gif.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterIngoingConnection.java.i
-data/make/linux/makefiles/rules.make.i
+data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.cpp.i
+data/test/compiler/6756768/Test6756768.java.i
data/build/windows/projectfiles/core/vm.def.i
data/src/share/vm/ci/ciInstanceKlass.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSeq.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java.i
data/src/cpu/zero/vm/assembler_zero.cpp.i
data/test/compiler/6837094/Test.java.i
-data/src/share/vm/memory/heapInspection.hpp.i
-data/make/windows/projectfiles/tiered/vm.dsw.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp.i
+data/src/cpu/x86/vm/c1_MacroAssembler_x86.cpp.i
+data/make/bsd/makefiles/vm.make.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/matchingFlags.filter.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLdstubDecoder.java.i
data/src/share/vm/opto/node.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/ThreadInfoPanel.java.i
-data/src/share/vm/ci/ciFlags.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterIndirectAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/diff.gif.i
-data/src/share/vm/runtime/globals.cpp.i
data/src/share/vm/runtime/mutexLocker.hpp.i
-data/build/solaris/makefiles/fastdebug.make.i
+data/agent/src/share/classes/com/sun/java/swing/action/SaveAction.java.i
data/agent/make/jhistowindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedWriteStream.java.i
data/agent/src/share/classes/com/sun/java/swing/action/AlignRightAction.java.i
-data/test/compiler/5091921/Test6196102.java.i
-data/test/compiler/6987555/Test6987555.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java.i
data/src/share/vm/memory/defNewGeneration.cpp.i
data/src/share/vm/classfile/systemDictionary.cpp.i
data/src/share/vm/gc_interface/collectedHeap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java.i
+data/src/share/vm/runtime/orderAccess.hpp.i
+data/agent/src/os/win32/Monitor.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Sym.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/amd64/WindbgAMD64ThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/LookupswitchPair.java.i
-data/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFloatRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ArithmeticDecoder.java.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Node_List.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Field.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/AbstractInstruction.java.i
+data/src/share/vm/utilities/histogram.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/EdenSpace.java.i
data/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadOopTreeNodeAdapter.java.i
data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/settings.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BooleanField.java.i
-data/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/delete.gif.i
data/build/solaris/makefiles/debug.make.i
-data/src/cpu/sparc/vm/depChecker_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/generationSizer.hpp.i
+data/src/share/vm/opto/bytecodeInfo.cpp.i
data/src/share/vm/runtime/rframe.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AssertionFailure.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java.i
+data/src/share/vm/classfile/dictionary.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java.i
data/src/share/vm/memory/compactingPermGenGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCAtomicLoadStoreInstruction.java.i
data/make/solaris/makefiles/rules.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OopMapForCacheEntry.java.i
-data/make/linux/makefiles/ppc.make.i
+data/src/share/vm/oops/symbol.cpp.i
data/make/linux/platform_sparcv9.i
data/src/share/vm/gc_implementation/shared/immutableSpace.hpp.i
data/src/share/vm/compiler/compileLog.cpp.i
data/src/share/vm/opto/graphKit.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/DeoptimizationBlob.java.i
+data/src/share/vm/ci/ciArrayKlass.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskManager.hpp.i
-data/make/windows/projectfiles/tiered/Makefile.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSBitMap.java.i
-data/build/linux/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReturnInstruction.java.i
-data/src/cpu/sparc/vm/interpreter_sparc.cpp.i
-data/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp.i
+data/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp.i
+data/make/solaris/makefiles/reorder_COMPILER2_amd64.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Hashtable.java.i
-data/test/compiler/6775880/Test.java.i
-data/build/solaris/makefiles/mapfile-vers-CORE.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSOffsetMap16.java.i
+data/agent/src/os/win32/README-commands.txt.i
+data/src/cpu/zero/vm/cppInterpreter_zero.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLParser.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64ThreadContext.java.i
-data/src/share/vm/oops/klassVtable.cpp.i
+data/make/windows/projectfiles/core/vm.def.i
data/test/compiler/6895383/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgAddress.java.i
-data/src/share/vm/opto/escape.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java.i
+data/make/solaris/makefiles/reorder_TIERED_i486.i
+data/test/compiler/7068051/Test7068051.sh.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/manifest.mf.i
+data/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp.i
data/make/solaris/makefiles/reorder_COMPILER2_sparcv9.i
-data/src/share/vm/c1/c1_Canonicalizer.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFormat3AInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/genfiles.properties.i
data/src/share/vm/ci/ciUtilities.hpp.i
data/src/share/vm/utilities/workgroup.hpp.i
@@ -1589,38 +1664,41 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/PCRelativeAddress.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp.i
data/src/share/vm/memory/space.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86CFrame.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java.i
+data/src/os/posix/launcher/java_md.h.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/link.gif.i
-data/src/share/vm/prims/jvmtiEnvThreadState.hpp.i
+data/src/share/vm/utilities/copy.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.cpp.i
data/agent/src/os/solaris/proc/saproc_audit.cpp.i
data/src/share/vm/opto/loopopts.cpp.i
data/build/linux/makefiles/profiled.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java.i
data/src/share/tools/IdealGraphVisualizer/Util/build.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java.i
-data/src/share/vm/runtime/advancedThresholdPolicy.cpp.i
-data/src/share/vm/runtime/vframeArray.cpp.i
+data/build/windows/projectfiles/kernel/vm.def.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JSnap.java.i
-data/src/share/vm/classfile/classFileParser.cpp.i
+data/src/share/vm/ci/ciObjectFactory.hpp.i
data/test/compiler/6826736/Test.java.i
+data/make/bsd/makefiles/build_vm_def.sh.i
data/agent/src/os/win32/Monitor.cpp.i
-data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp.i
+data/src/cpu/x86/vm/vm_version_x86_32.hpp.i
data/src/share/vm/includeDB_compiler1.i
-data/src/share/vm/utilities/utf8.hpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java.i
-data/src/share/vm/gc_implementation/shared/gSpaceCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java.i
+data/src/share/vm/opto/escape.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObject.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/FilterChainProvider.java.i
+data/build/solaris/makefiles/reorder_TIERED_sparc.i
data/src/share/vm/opto/regmask.hpp.i
+data/src/os/bsd/vm/osThread_bsd.cpp.i
data/make/linux/makefiles/tiered.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC6.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java.i
data/src/share/vm/opto/mulnode.hpp.i
data/make/linux/makefiles/zeroshark.make.i
+data/make/solaris/makefiles/dtrace.make.i
data/src/cpu/x86/vm/assembler_x86_32.hpp.i
data/src/share/vm/utilities/macros.hpp.i
-data/src/share/vm/gc_implementation/shared/gcStats.hpp.i
data/agent/src/os/win32/Dispatcher.hpp.i
data/agent/make/pmapproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9IntegerBranchDecoder.java.i
@@ -1629,160 +1707,164 @@ data/src/share/vm/runtime/thread.hpp.i
data/build/solaris/makefiles/launcher.make.i
data/src/share/vm/ci/ciInstance.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ShiftDecoder.java.i
-data/src/share/vm/code/debugInfoRec.hpp.i
data/src/share/vm/gc_implementation/g1/satbQueue.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/MultiConnectionWidget.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/OldHierarchicalLayoutManager.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SDE.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/search.gif.i
-data/agent/test/jdi/jstack64.sh.i
+data/src/share/vm/utilities/workgroup.cpp.i
+data/build/solaris/makefiles/sparcv9.make.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/DoubleClickAction.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save24.gif.i
-data/make/solaris/makefiles/cscope.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java.i
data/make/solaris/makefiles/reorder_TIERED_sparc.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/genfiles.properties.i
data/make/closed.make.i
data/agent/src/scripts/start-debug-server64.sh.i
data/make/solaris/platform_sparcv9.gcc.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java.i
data/src/share/vm/utilities/hashtable.inline.hpp.i
data/build/linux/makefiles/tiered.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java.i
data/make/windows/makefiles/vm.make.i
data/src/cpu/x86/vm/c2_globals_x86.hpp.i
-data/src/share/vm/oops/methodDataKlass.cpp.i
+data/src/os/solaris/dtrace/jvm_dtrace.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java.i
data/agent/src/os/linux/symtab.c.i
data/make/solaris/makefiles/makedeps.make.i
data/test/compiler/7024475/Test7024475.java.i
data/src/share/vm/code/icBuffer.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/customLeftWsmode.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTraceEntry.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/CPUHelper.java.i
+data/make/solaris/makefiles/debug.make.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/platform.properties.i
data/make/windows/makefiles/jvmti.make.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.gif.i
+data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ColorFilter.java.i
data/build/solaris/makefiles/vm.make.i
data/src/share/vm/shark/sharkBlock.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeDisassembler.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp.i
+data/src/share/vm/shark/sharkBuilder.hpp.i
data/src/share/vm/runtime/monitorChunk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectSynchronizer.java.i
data/src/cpu/x86/vm/assembler_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/EnumType.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java.i
+data/src/share/vm/c1/c1_ValueSet.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ConcurrentLocksPrinter.java.i
+data/src/os_cpu/bsd_x86/vm/bsd_x86_64.s.i
data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutGraph.java.i
data/build/linux/makefiles/cscope.make.i
data/src/share/vm/runtime/handles.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/build-impl.xml.i
-data/src/share/vm/runtime/java.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java.i
+data/agent/src/os/bsd/salibelf.c.i
data/make/solaris/makefiles/reorder_COMPILER2_i486.i
-data/src/share/vm/shark/sharkIntrinsics.cpp.i
+data/build/linux/makefiles/makedeps.make.i
data/src/share/vm/services/classLoadingService.hpp.i
-data/test/compiler/6539464/Test.java.i
-data/make/solaris/makefiles/tiered.make.i
+data/build/windows/makefiles/defs.make.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJFloatField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86ThreadFactory.java.i
data/src/cpu/x86/vm/c1_FpuStackSim_x86.cpp.i
data/agent/make/jdbcore64.sh.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignLeft24.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/AdapterBlob.java.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties.i
+data/src/share/vm/gc_implementation/g1/concurrentMarkThread.hpp.i
+data/src/share/vm/prims/jvmtiGetLoadedClasses.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFloatType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PrefetchDecoder.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp.i
data/src/share/tools/IdealGraphVisualizer/build.xml.i
data/test/compiler/6431242/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/DebuggerConsolePanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java.i
data/src/share/vm/utilities/sizes.cpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/import.gif.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java.i
data/src/share/vm/prims/perf.cpp.i
data/make/windows/makefiles/fastdebug.make.i
data/src/cpu/zero/vm/sharedRuntime_zero.cpp.i
data/src/share/vm/runtime/arguments.cpp.i
-data/src/share/vm/prims/jvmtiEventController.inline.hpp.i
+data/src/cpu/x86/vm/vm_version_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/CustomFilter.java.i
-data/build/solaris/platform_i486.gcc.i
+data/agent/make/pstackproc.sh.i
+data/agent/src/os/bsd/StubDebuggerLocal.c.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatTypeImpl.java.i
data/src/share/vm/libadt/vectset.hpp.i
-data/agent/doc/hsdb.html.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebugger.java.i
data/src/share/vm/services/memoryManager.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFHeader.java.i
data/agent/test/jdi/sagdoit.java.i
-data/src/share/vm/prims/forte.cpp.i
data/src/share/vm/prims/jvmtiExport.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/objectStartArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJLongField.java.i
data/src/share/vm/opto/node.cpp.i
-data/src/share/vm/opto/c2_globals.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java.i
data/src/cpu/sparc/vm/vmreg_sparc.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/CStringAccessor.java.i
data/src/share/vm/runtime/sharedRuntimeTrans.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/combine.filter.i
+data/src/share/vm/c1/c1_ValueStack.cpp.i
data/src/cpu/x86/vm/interp_masm_x86_32.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCShiftInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterAction.java.i
data/src/share/vm/opto/regalloc.hpp.i
data/build/solaris/makefiles/sa.make.i
data/agent/src/os/win32/procList.hpp.i
data/src/share/vm/ci/ciStreams.cpp.i
data/test/runtime/6929067/T.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckListView.java.i
-data/test/compiler/6661247/Test.java.i
data/src/share/vm/oops/markOop.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJIntField.java.i
data/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp.i
data/src/cpu/x86/vm/stubRoutines_x86_32.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveAllAction.java.i
-data/test/compiler/5091921/Test6992759.java.i
+data/test/compiler/6603011/Test.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java.i
data/src/cpu/x86/vm/icache_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/build.xml.i
data/test/compiler/6799693/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/development/Server24.gif.i
+data/test/compiler/6912517/Test.java.i
data/src/os/windows/vm/decoder_windows.cpp.i
+data/src/share/vm/memory/cardTableRS.cpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/OkCancelButtonPanel.java.i
data/src/cpu/sparc/vm/interp_masm_sparc.hpp.i
-data/src/share/vm/ci/ciTypeArray.hpp.i
data/src/share/vm/gc_implementation/shared/markSweep.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9BranchInstruction.java.i
-data/src/share/vm/utilities/hashtable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SavedInstruction.java.i
data/make/linux/makefiles/cscope.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java.i
data/build/windows/projectfiles/compiler2/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/AccessFlags.java.i
data/src/share/vm/opto/c2compiler.cpp.i
-data/build/windows/platform_i486.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/Generation.java.i
data/agent/src/os/win32/SwDbgSrv.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutField.java.i
data/src/cpu/x86/vm/c1_Defs_x86.hpp.i
data/src/share/vm/c1/c1_LinearScan.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSegMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BooleanValueImpl.java.i
data/test/compiler/6958485/Test.java.i
data/src/share/tools/IdealGraphVisualizer/branding/core/core.jar/org/netbeans/core/startup/splash.gif.i
-data/test/compiler/5091921/Test6186134.java.i
-data/src/share/vm/runtime/fprofiler.cpp.i
data/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp.i
data/src/os/windows/vm/thread_windows.inline.hpp.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC7.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/build.xml.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java.i
+data/src/share/vm/utilities/constantTag.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/CancelAction.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/RobustOopDeterminator.java.i
-data/agent/src/os/linux/salibelf.c.i
+data/src/share/tools/IdealGraphVisualizer/Filter/manifest.mf.i
+data/make/bsd/makefiles/sparcWorks.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveStoreInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ConditionalJmpDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java.i
data/test/compiler/6741738/Tester.java.i
data/src/share/vm/ci/ciMethod.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/platform.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64RegisterMap.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Properties.java.i
+data/make/windows/platform_i486.i
data/agent/src/share/classes/images/toolbarButtonGraphics/navigation/Up16.gif.i
data/make/solaris/Makefile.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/RhinoScriptEngine.java.i
@@ -1790,27 +1872,29 @@ data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapValue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/GRPDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/JTreeTable.java.i
data/agent/src/share/classes/com/sun/java/swing/ui/WizardDlg.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java.i
data/src/os/linux/vm/perfMemory_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/build-impl.xml.i
data/test/TEST.ROOT.i
data/src/share/vm/gc_implementation/g1/heapRegionSets.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86GeneralInstruction.java.i
-data/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp.i
+data/src/share/vm/opto/reg_split.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebuggerLocal.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/BranchDecoder.java.i
-data/build/windows/makefiles/jvmti.make.i
+data/src/share/vm/memory/generation.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/export.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/ImmediateOrRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java.i
data/src/share/vm/c1/c1_MacroAssembler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java.i
data/src/cpu/zero/vm/vm_version_zero.cpp.i
data/src/share/vm/includeDB_jvmti.i
-data/agent/src/share/classes/com/sun/java/swing/action/AlignCenterAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/posix/POSIXSignals.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java.i
data/src/os_cpu/windows_x86/vm/threadLS_windows_x86.cpp.i
data/src/share/vm/ci/ciConstantPoolCache.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/MoveInstruction.java.i
-data/src/share/vm/runtime/dtraceJSDT.hpp.i
+data/src/share/vm/shark/sharkBuilder.cpp.i
data/src/share/vm/oops/markOop.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/IntType.java.i
data/agent/make/jstackwindbg.bat.i
@@ -1820,33 +1904,35 @@ data/src/cpu/sparc/vm/depChecker_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/CallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIid.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeModel.java.i
-data/src/share/vm/ci/ciTypeFlow.hpp.i
-data/make/solaris/platform_sparc.gcc.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/overview.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxAddress.java.i
data/src/os_cpu/linux_sparc/vm/vm_version_linux_sparc.cpp.i
data/src/share/vm/code/vmreg.hpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp.i
+data/make/solaris/makefiles/mapfile-vers-jsig.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ShowAllAction.java.i
data/src/os/solaris/dtrace/hotspot_jni.d.i
data/src/share/vm/prims/methodComparator.cpp.i
data/src/share/vm/opto/idealGraphPrinter.hpp.i
data/make/solaris/makefiles/sa.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/DataSource.java.i
+data/make/linux/makefiles/rules.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ProcessInfo.java.i
data/src/share/tools/IdealGraphVisualizer/View/build.xml.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.form.i
-data/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java.i
data/src/os_cpu/windows_x86/vm/assembler_windows_x86_64.cpp.i
data/src/share/vm/opto/coalesce.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/amd64/ProcAMD64Thread.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationIsInClosure.java.i
+data/make/windows/makefiles/shared.make.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Source.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties.i
-data/test/runtime/6888954/vmerrors.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BadAddressTreeNodeAdapter.java.i
data/src/share/vm/prims/jniFastGetField.cpp.i
-data/src/share/vm/utilities/array.cpp.i
+data/src/share/vm/oops/oop.pcgc.inline.hpp.i
data/agent/make/build-filelist.i
data/src/cpu/sparc/vm/bytecodes_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/genfiles.properties.i
@@ -1858,73 +1944,84 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/MemoryInstruction.java.i
data/src/share/vm/prims/jvmtiExport.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/Scheduler.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFSymbolConstants.java.i
+data/test/compiler/6956668/Test6956668.java.i
data/src/cpu/x86/vm/templateTable_x86_32.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Instance.java.i
-data/src/share/vm/c1/c1_FpuStackSim.hpp.i
+data/src/share/vm/gc_implementation/shared/allocationStats.hpp.i
+data/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp.i
data/src/share/vm/memory/generationSpec.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/VMFlagsPanel.java.i
data/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp.i
+data/make/bsd/makefiles/compiler2.make.i
data/agent/make/start-rmiregistry.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThread.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp.i
data/make/windows/projectfiles/common/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MemoryInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaCallWrapper.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/XMLWriter.java.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties.i
-data/src/share/vm/opto/block.cpp.i
+data/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Instruction.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Bundle.properties.i
data/make/solaris/makefiles/sparcWorks.make.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/TableModelComparator.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java.i
data/src/share/vm/opto/split_if.cpp.i
data/src/os/solaris/vm/hpi_solaris.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/ScriptEngineAbstraction.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeList.java.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC9.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadDecoder.java.i
data/test/compiler/5091921/Test6905845.java.i
+data/src/share/vm/oops/klassOop.hpp.i
data/src/cpu/zero/vm/interp_masm_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Arithmetic.java.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler.i
-data/src/share/vm/oops/cpCacheKlass.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp.i
+data/build/solaris/makefiles/mapfile-vers-CORE.i
data/src/share/vm/gc_implementation/g1/ptrQueue.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassTypeImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java.i
+data/make/windows/projectfiles/tiered/Makefile.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerFinder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SymbolTypes.java.i
-data/src/share/vm/runtime/dtraceJSDT.cpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.inline.hpp.i
data/src/share/vm/c1/c1_CFGPrinter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadContext.java.i
-data/agent/make/pmapwindbg64.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java.i
data/src/os_cpu/linux_x86/vm/linux_x86_32.ad.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleTypeImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/StubQueue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java.i
data/src/cpu/x86/vm/javaFrameAnchor_x86.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties.i
data/build/windows/makefiles/rules.make.i
data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_64.cpp.i
-data/build/solaris/makefiles/reorder_COMPILER2_sparc.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Method.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotSolarisVtblAccess.java.i
data/make/linux/makefiles/optimized.make.i
-data/src/share/vm/ci/ciInstance.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlass.java.i
data/src/share/vm/gc_implementation/g1/g1_globals.cpp.i
+data/make/bsd/makefiles/buildtree.make.i
data/make/linux/README.i
+data/src/cpu/x86/vm/depChecker_x86.hpp.i
+data/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp.i
data/agent/src/scripts/start-rmiregistry64.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/AbstractFilter.java.i
data/agent/src/share/classes/com/sun/java/swing/action/OpenAction.java.i
data/src/cpu/sparc/vm/codeBuffer_sparc.hpp.i
data/src/share/vm/oops/instanceKlassKlass.hpp.i
-data/src/share/vm/ci/ciCPCache.cpp.i
+data/src/share/vm/code/codeCache.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp.i
data/agent/test/jdi/multivm.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPathElement.java.i
+data/agent/test/jdi/jstack64.sh.i
+data/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JDoubleField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultHeapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialStoreInstruction.java.i
-data/src/share/vm/shark/sharkConstant.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ShiftDecoder.java.i
data/src/share/vm/opto/vectornode.cpp.i
data/test/compiler/6814842/Test6814842.java.i
@@ -1932,53 +2029,57 @@ data/src/share/vm/libadt/dict.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadContext.java.i
data/agent/make/clhsdbwindbg.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/AnnotatedMemoryPanel.java.i
-data/src/share/vm/runtime/unhandledOops.hpp.i
data/src/share/vm/runtime/task.hpp.i
data/agent/make/jdbproc.sh.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckRenderer.java.i
data/src/os/solaris/vm/os_share_solaris.hpp.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/suite.properties.i
-data/src/share/vm/classfile/javaAssertions.cpp.i
+data/src/share/tools/ProjectCreator/DirectoryTree.java.i
data/src/share/vm/oops/objArrayOop.cpp.i
data/make/linux/build.sh.i
data/src/share/vm/runtime/vm_operations.hpp.i
data/agent/doc/clhsdb.html.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/BaseIndexScaleDispAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SpecialRegisters.java.i
data/agent/make/hsdbwindbg.bat.i
data/src/os_cpu/solaris_sparc/vm/solaris_sparc.s.i
-data/src/share/vm/asm/assembler.inline.hpp.i
+data/src/share/vm/prims/jvmtiEnvThreadState.hpp.i
data/build/solaris/makefiles/reorder_COMPILER2_amd64.i
data/src/share/vm/oops/instanceRefKlass.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/VariablePanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegisters.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/minus.gif.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/BranchInstruction.java.i
+data/make/windows/makefiles/sa.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/manifest.mf.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp.i
-data/src/share/vm/c1/c1_FrameMap.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java.i
+data/src/share/vm/prims/jvmtiClassFileReconstituter.hpp.i
data/src/cpu/x86/vm/templateTable_x86_64.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/os/win32/Buffer.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/build-impl.xml.i
data/make/solaris/makefiles/hp.make.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.inline.hpp.i
data/test/compiler/6711100/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java.i
data/src/share/vm/opto/callGenerator.cpp.i
-data/make/windows/projectfiles/tiered/ADLCompiler.dsw.i
-data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java.i
data/agent/src/os/win32/SwDbgSub.dsp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Figure.java.i
data/src/share/vm/code/pcDesc.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psGCAdaptivePolicyCounters.cpp.i
data/src/share/tools/MakeDeps/BuildConfig.java.i
+data/make/bsd/makefiles/amd64.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Information24.gif.i
data/src/cpu/zero/vm/icache_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java.i
data/make/solaris/makefiles/reorder_COMPILER1_sparcv9.i
+data/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CodeCacheVisitor.java.i
data/src/share/vm/ci/ciCallSite.hpp.i
data/src/share/vm/runtime/virtualspace.cpp.i
@@ -1988,45 +2089,44 @@ data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java.i
data/src/os/windows/vm/hpi_windows.cpp.i
data/src/cpu/x86/vm/interpreterGenerator_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/HeapBlock.java.i
-data/agent/make/dumpsyspropsproc.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9CasInstruction.java.i
data/agent/make/jsdbproc.sh.i
data/src/os_cpu/windows_x86/vm/windows_x86_32.ad.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/BreakpointInfo.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TypeIndicators.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java.i
-data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties.i
+data/test/compiler/5091921/Test6992759.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJDoubleField.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactory.java.i
-data/src/cpu/zero/vm/register_definitions_zero.cpp.i
-data/src/share/vm/runtime/vmThread.hpp.i
+data/src/share/vm/gc_implementation/parNew/asParNewGeneration.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java.i
data/src/share/vm/runtime/vframe_hp.hpp.i
data/test/compiler/6892265/Test.java.i
-data/test/compiler/6663621/IVTest.java.i
+data/src/cpu/zero/vm/globals_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java.i
data/src/share/vm/runtime/reflectionCompat.hpp.i
data/src/cpu/x86/vm/stubRoutines_x86_32.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf.i
-data/src/share/vm/ci/ciObjArray.hpp.i
+data/src/share/vm/interpreter/bytecodeInterpreter.cpp.i
+data/src/share/vm/ci/ciCallSite.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.hpp.i
data/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp.i
-data/src/share/vm/opto/live.hpp.i
data/src/os/linux/vm/osThread_linux.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java.i
-data/src/share/vm/prims/hpi_imported.h.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/layer.xml.i
+data/src/cpu/sparc/vm/register_definitions_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GraphViewer.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Opcodes.java.i
-data/test/compiler/6757316/Test6757316.java.i
-data/src/share/vm/ci/ciKlass.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java.i
+data/src/cpu/x86/vm/assembler_x86_32.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/AdapterBlob.java.i
data/src/cpu/zero/vm/nativeInst_zero.cpp.i
data/src/share/vm/utilities/taskqueue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldIdentifier.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java.i
data/src/share/vm/code/debugInfo.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif.i
+data/src/share/vm/memory/defNewGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/ExportDirectoryTable.java.i
-data/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java.i
data/src/share/vm/memory/sharedHeap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/AddressOps.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfDataPrologue.java.i
@@ -2034,153 +2134,157 @@ data/src/share/vm/runtime/jfieldIDWorkaround.hpp.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgOopHandle.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLoadInstruction.java.i
+data/src/share/vm/memory/universe.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedPanAction.java.i
data/src/share/vm/c1/c1_Instruction.cpp.i
-data/build/linux/makefiles/makedeps.make.i
+data/src/share/vm/prims/jni.h.i
data/src/share/vm/memory/genMarkSweep.cpp.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp.i
+data/src/share/vm/runtime/javaCalls.hpp.i
data/src/share/vm/memory/referencePolicy.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/StackTracePanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/x86/X86ThreadContext.java.i
data/src/share/vm/oops/constMethodOop.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveInputsFilter.java.i
data/make/solaris/makefiles/mapfile-vers-nonproduct.i
data/src/cpu/zero/vm/entry_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapStream.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/Bits.java.i
data/src/share/vm/ci/ciKlassKlass.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DumpExports.java.i
+data/src/share/vm/utilities/yieldingWorkgroup.cpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/genfiles.properties.i
+data/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/ia64/WindbgIA64ThreadContext.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/suite.properties.i
+data/src/share/vm/opto/memnode.cpp.i
data/src/os/solaris/vm/globals_solaris.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SegInfo.java.i
data/src/share/vm/memory/gcLocker.cpp.i
data/src/share/vm/includeDB_shark.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedListener.java.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Bundle.properties.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/Bundle.properties.i
+data/src/share/vm/runtime/fprofiler.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/ExitAction.java.i
data/src/share/vm/gc_interface/gcCause.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/AddressDataSource.java.i
data/src/share/vm/c1/c1_LIRGenerator.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxOopHandle.java.i
+data/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp.i
data/src/cpu/zero/vm/stubRoutines_zero.cpp.i
-data/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp.i
+data/make/windows/projectfiles/compiler2/vm.dsw.i
+data/src/share/vm/adlc/filebuff.cpp.i
+data/test/compiler/7047069/Test7047069.java.i
+data/make/bsd/makefiles/saproc.make.i
+data/src/share/vm/oops/generateOopMap.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/RotateDecoder.java.i
-data/src/cpu/x86/vm/icache_x86.hpp.i
+data/src/share/vm/gc_implementation/shared/hSpaceCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/Editor.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcAddress.java.i
+data/src/cpu/x86/vm/dump_x86_64.cpp.i
data/src/share/vm/runtime/serviceThread.cpp.i
data/make/linux/adlc_updater.i
data/build/windows/build.make.i
-data/src/os/windows/vm/vtune_windows.cpp.i
+data/src/os/windows/vm/hpi_windows.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderCellRenderer.java.i
-data/src/share/vm/services/psMemoryPool.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/Type.java.i
-data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/genfiles.properties.i
-data/agent/make/marks_notes.html.i
+data/src/share/vm/runtime/safepoint.cpp.i
+data/make/solaris/makefiles/mapfile-vers-debug.i
data/make/solaris/makefiles/reorder_CORE_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantLongValue.java.i
-data/src/share/vm/runtime/signature.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java.i
data/src/share/vm/code/exceptionHandlerTable.hpp.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_64.s.i
data/src/share/vm/interpreter/rewriter.cpp.i
data/src/share/vm/opto/loopnode.cpp.i
+data/src/share/vm/oops/fieldInfo.hpp.i
data/agent/make/pstackproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RetryInstruction.java.i
-data/src/share/vm/prims/jniCheck.cpp.i
+data/src/share/tools/ProjectCreator/ProjectCreator.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ProcImageClassLoader.java.i
-data/test/compiler/6778657/Test.java.i
+data/make/solaris/makefiles/reorder_COMPILER1_sparc.i
data/src/share/vm/interpreter/bytecodeInterpreterWithChecks.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OffsetClosure.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java.i
+data/agent/make/jcoreproc64.sh.i
+data/src/share/vm/gc_implementation/g1/bufferingOopClosure.hpp.i
data/src/share/vm/ci/ciSignature.hpp.i
data/src/share/vm/ci/ciTypeArray.cpp.i
data/src/share/vm/includeDB_compiler2.i
data/src/share/vm/oops/symbolKlass.hpp.i
data/src/cpu/zero/vm/register_zero.hpp.i
-data/src/share/vm/runtime/javaCalls.hpp.i
-data/agent/make/dumpflagswindbg64.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSethiInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/genfiles.properties.i
+data/make/windows/create.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/InterpreterCodelet.java.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Node.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.xml.i
-data/src/share/vm/prims/jvmtiEnter.xsl.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicField.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/Bundle.properties.i
data/src/share/vm/memory/space.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/nbproject/genfiles.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java.i
data/src/share/vm/ci/ciKlass.cpp.i
data/src/share/vm/opto/vectornode.hpp.i
data/agent/test/jdi/TargetAdapter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodePutStatic.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86BranchInstruction.java.i
data/src/share/vm/interpreter/bytecodeStream.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/CIntegerField.java.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/WindowsNTSubsystem.java.i
-data/agent/src/share/classes/com/sun/java/swing/action/NextAction.java.i
-data/src/share/vm/oops/constantPoolOop.hpp.i
+data/src/cpu/x86/vm/stubRoutines_x86_64.hpp.i
+data/src/share/tools/ProjectCreator/BuildConfig.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/FreeChunk.java.i
+data/src/share/vm/compiler/compilerOracle.cpp.i
+data/test/compiler/6758234/Test6758234.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJBooleanField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVrDecoder.java.i
-data/build/sa.files.i
+data/src/share/vm/shark/sharkState.hpp.i
data/src/os/windows/vm/mutex_windows.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/layer.xml.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/manifest.mf.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/suite.properties.i
-data/src/share/vm/memory/cardTableRS.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Thread.java.i
-data/src/share/vm/utilities/preserveException.cpp.i
-data/make/linux/makefiles/top.make.i
-data/src/cpu/x86/vm/frame_x86.hpp.i
-data/src/share/vm/classfile/classFileError.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPMoveDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/TwoOopHashtable.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InputSlot.java.i
+data/test/compiler/6910618/Test.java.i
+data/test/compiler/5091921/Test6959129.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterIndirectAddress.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java.i
data/agent/make/finalizerinfoproc.sh.i
data/src/share/tools/IdealGraphVisualizer/branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/FilterAction.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java.i
-data/agent/test/jdi/runjdb.sh.i
+data/src/share/vm/ci/ciSymbol.hpp.i
+data/make/linux/makefiles/compiler2.make.i
+data/src/os/linux/vm/objectMonitor_linux.cpp.i
data/src/share/vm/opto/parse2.cpp.i
data/src/share/vm/code/debugInfo.hpp.i
data/agent/test/jdi/README.jjh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMVersionMismatchException.java.i
-data/src/share/vm/opto/phaseX.cpp.i
-data/src/share/vm/c1/c1_ValueStack.hpp.i
+data/test/compiler/6832293/Test.java.i
data/src/share/vm/memory/heap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/project.xml.i
-data/src/share/vm/runtime/threadLocalStorage.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureIterator.java.i
data/src/cpu/sparc/vm/register_sparc.hpp.i
-data/src/cpu/x86/vm/vmreg_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSethiInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/SaveFilterSettingsAction.java.i
+data/src/share/vm/c1/c1_CFGPrinter.cpp.i
data/src/cpu/zero/vm/dump_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/RBColor.java.i
-data/make/solaris/makefiles/kernel.make.i
+data/make/defs.make.i
+data/make/linux/makefiles/defs.make.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/genfiles.properties.i
-data/src/share/vm/runtime/mutexLocker.cpp.i
-data/test/compiler/6603011/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java.i
+data/build/solaris/platform_i486.gcc.i
+data/src/os_cpu/solaris_x86/vm/solaris_x86_32.s.i
+data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputMethod.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/Symbol.java.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/Bundle.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/livejvm/BreakpointEvent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/HeapParametersPanel.java.i
+data/test/runtime/6626217/Test6626217.sh.i
+data/agent/src/os/win32/initWinsock.hpp.i
data/src/share/vm/runtime/vmThread.cpp.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java.i
+data/src/share/vm/runtime/biasedLocking.hpp.i
data/src/share/vm/prims/jvmtiH.xsl.i
data/src/cpu/sparc/vm/c1_LIRAssembler_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialLoadStoreDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/amd64/AMD64CFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSCollector.java.i
data/src/share/vm/code/location.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/WriteDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxDebugger.java.i
data/src/share/vm/shark/sharkMemoryManager.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicIntType.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp.i
data/src/share/vm/services/runtimeService.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualSpace.java.i
@@ -2192,47 +2296,48 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCMoveInstruction.java
data/src/share/vm/gc_implementation/g1/concurrentMark.cpp.i
data/src/share/vm/prims/jvm.h.i
data/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java.i
-data/src/cpu/x86/vm/assembler_x86_32.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_sparc/LinuxSPARCJavaThreadPDAccess.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/layer.xml.i
+data/src/share/tools/MakeDeps/MakeDeps.java.i
data/src/share/vm/code/icBuffer.hpp.i
+data/src/cpu/sparc/vm/c2_init_sparc.cpp.i
data/agent/src/share/classes/com/sun/java/swing/ui/StatusBar.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCompoundType.java.i
data/src/os/windows/vm/threadCritical_windows.cpp.i
data/build/solaris/makefiles/mapfile-vers.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/LowMemoryDetectorThread.java.i
-data/src/share/tools/ProjectCreator/FileFormatException.java.i
+data/src/share/vm/runtime/stackValue.hpp.i
data/agent/make/dumpsyspropswindbg64.bat.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentSettings.xml.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterEdge.java.i
-data/test/compiler/6973329/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/MonitorInfoImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/cardTableExtension.cpp.i
+data/make/solaris/makefiles/mapfile-vers-COMPILER1.i
data/src/share/vm/prims/jniCheck.hpp.i
data/src/share/vm/ci/ciObjArrayKlass.cpp.i
data/src/share/vm/runtime/vframe.hpp.i
data/test/compiler/6726999/Test.java.i
data/src/os/linux/vm/objectMonitor_linux.inline.hpp.i
+data/agent/src/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/layer.xml.i
data/src/os_cpu/linux_sparc/vm/thread_linux_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/HaltNode.java.i
data/src/share/vm/c1/c1_ValueMap.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java.i
-data/src/share/vm/memory/blockOffsetTable.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java.i
data/test/compiler/5091921/Test5091921.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/VtblAccess.java.i
-data/src/share/vm/libadt/set.hpp.i
-data/test/compiler/6795161/Test.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/bytecode.gif.i
+data/src/share/vm/oops/instanceKlass.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedDouble.java.i
data/build/windows/projectfiles/compiler1/vm.dsw.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java.i
+data/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/JVMDebugger.java.i
data/src/cpu/zero/vm/stack_zero.inline.hpp.i
-data/src/share/vm/ci/ciArrayKlassKlass.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/Address.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java.i
+data/test/compiler/6823354/Test6823354.java.i
+data/make/linux/makefiles/sparcv9.make.i
data/src/share/vm/prims/jvmtiRawMonitor.hpp.i
data/build/windows/projectfiles/tiered/Makefile.i
data/src/share/vm/ci/ciMethodKlass.cpp.i
@@ -2241,14 +2346,15 @@ data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cp
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactoryImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DataDirectory.java.i
data/src/cpu/zero/vm/templateTable_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSaveInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32Address.java.i
+data/test/compiler/6837011/Test6837011.java.i
+data/agent/src/share/classes/com/sun/java/swing/ui/SplashScreen.java.i
data/src/os/solaris/dtrace/libjvm_db.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCShiftInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGraphWriter.java.i
data/src/share/vm/memory/gcLocker.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp.i
+data/src/os/solaris/vm/osThread_solaris.hpp.i
data/src/cpu/zero/vm/jniTypes_zero.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.hpp.i
data/build/linux/platform_i486.suncc.i
@@ -2261,25 +2367,27 @@ data/src/cpu/sparc/vm/templateInterpreter_sparc.hpp.i
data/src/os/linux/vm/jvm_linux.cpp.i
data/src/share/vm/ci/ciInstanceKlass.hpp.i
data/agent/make/permstatwindbg64.bat.i
-data/agent/test/libproc/libproctest64.sh.i
+data/src/share/vm/runtime/osThread.cpp.i
data/src/share/vm/utilities/errorReporter.hpp.i
data/build/solaris/makefiles/reorder_CORE_sparcv9.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PredSuccAction.java.i
data/src/share/vm/ci/ciObjArrayKlass.hpp.i
data/src/share/vm/includeDB_zero.i
-data/src/share/vm/compiler/compileLog.hpp.i
+data/src/share/vm/memory/threadLocalAllocBuffer.cpp.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp.i
data/src/share/vm/classfile/verifier.hpp.i
-data/src/share/vm/prims/privilegedStack.hpp.i
+data/test/compiler/5091921/Test6753639.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86SegmentRegister.java.i
data/src/share/vm/prims/jvmtiEnv.xsl.i
+data/make/bsd/makefiles/hp1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadState.java.i
-data/agent/src/os/linux/libproc.h.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9ReadDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/Type.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPermGen.cpp.i
+data/src/share/vm/runtime/sharedRuntimeTrig.cpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/remove.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCDisassembler.java.i
-data/src/share/vm/opto/lcm.cpp.i
data/src/cpu/sparc/vm/register_sparc.cpp.i
data/src/cpu/zero/vm/cppInterpreter_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaScriptEngine.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/AddressDataSource.java.i
@@ -2287,189 +2395,207 @@ data/build/solaris/makefiles/compiler1.make.i
data/make/solaris/makefiles/reorder_COMPILER1_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9MOVccDecoder.java.i
data/src/os/solaris/vm/mutex_solaris.inline.hpp.i
-data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp.i
-data/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerTypeImpl.java.i
+data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/genfiles.properties.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ArrayReferenceImpl.java.i
+data/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java.i
data/agent/test/jdi/TargetListener.java.i
data/build/windows/platform_amd64.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapGXLWriter.java.i
+data/src/share/vm/ci/ciFlags.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/OutputSlot.java.i
data/src/share/vm/ci/ciEnv.cpp.i
data/src/share/vm/opto/doCall.cpp.i
-data/test/compiler/6930043/Test6930043.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif.i
+data/src/share/vm/gc_implementation/g1/heapRegionSeq.inline.hpp.i
data/build/linux/makefiles/saproc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Register.java.i
data/src/share/vm/opto/macro.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindClassesAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java.i
-data/src/share/vm/ci/ciMethod.cpp.i
data/src/share/tools/MakeDeps/Platform.java.i
-data/test/runtime/6626217/many_loader1.java.foo.i
-data/src/share/vm/oops/klassVtable.hpp.i
+data/make/bsd/makefiles/mapfile-vers-debug.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Slot.java.i
-data/make/solaris/makefiles/mapfile-vers-jvm_db.i
+data/test/compiler/6894807/Test6894807.sh.i
data/src/os/linux/vm/vmError_linux.cpp.i
data/src/share/vm/classfile/javaClasses.hpp.i
-data/test/runtime/6929067/Test6929067.sh.i
-data/make/solaris/makefiles/hp1.make.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Vertex.java.i
+data/make/bsd/makefiles/ppc.make.i
data/src/share/tools/ProjectCreator/ArgsParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/FloatTreeNodeAdapter.java.i
+data/make/windows/projectfiles/compiler2/Makefile.i
data/src/share/tools/MakeDeps/Macro.java.i
data/src/share/vm/compiler/methodLiveness.cpp.i
-data/test/compiler/6935535/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFactory.java.i
+data/src/share/vm/code/codeBlob.hpp.i
data/agent/test/jdi/TEST.ROOT.i
data/src/share/vm/includeDB_features.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9IlltrapInstruction.java.i
data/src/share/vm/interpreter/cppInterpreter.hpp.i
data/src/os_cpu/windows_x86/vm/windows_x86_64.ad.i
-data/test/compiler/6880034/Test6880034.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32ThreadContext.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/RemoveCookie.java.i
-data/build/windows/makefiles/defs.make.i
+data/make/solaris/makefiles/tiered.make.i
data/src/share/vm/utilities/events.cpp.i
data/make/solaris/makefiles/i486.make.i
data/make/windows/projectfiles/compiler2/ADLCompiler.dsw.i
-data/src/cpu/x86/vm/vm_version_x86.cpp.i
+data/src/share/vm/prims/jvmtiEventController.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ia64/IA64ThreadContext.java.i
-data/src/share/vm/runtime/jniHandles.hpp.i
+data/src/cpu/zero/vm/jni_zero.h.i
data/src/share/tools/IdealGraphVisualizer/Data/build.xml.i
data/agent/make/jdbcore.sh.i
data/build/windows/projectfiles/core/vm.dsw.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCReadInstruction.java.i
-data/agent/src/os/win32/Buffer.cpp.i
+data/src/share/vm/c1/c1_GraphBuilder.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Registers.java.i
data/src/share/vm/memory/modRefBarrierSet.hpp.i
data/test/compiler/7029152/Test.java.i
-data/src/share/vm/services/attachListener.hpp.i
data/make/linux/makefiles/build_vm_def.sh.i
-data/src/os/windows/launcher/java_md.h.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/platform.properties.i
data/src/os_cpu/linux_x86/vm/os_linux_x86.hpp.i
data/src/share/vm/prims/jvmtiImpl.cpp.i
data/src/share/vm/opto/opcodes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntervalTree.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/customRightTopWsmode.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorBranchDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPInstruction.java.i
+data/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaStackTracePanel.java.i
-data/make/linux/platform_i486.suncc.i
-data/agent/src/share/classes/sun/jvm/hotspot/livejvm/Event.java.i
+data/make/windows/makefiles/top.make.i
+data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/BinaryTreeDictionary.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMapClosure.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/StubQueue.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java.i
+data/src/share/vm/oops/methodDataKlass.cpp.i
+data/src/share/vm/opto/superword.cpp.i
+data/agent/make/pmapwindbg64.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleTypeImpl.java.i
data/src/share/vm/services/jmm.h.i
data/make/linux/makefiles/sa.make.i
data/make/linux/makefiles/arm.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/StreamMonitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/PerfDataEntry.java.i
-data/src/share/tools/ProjectCreator/DirectoryTree.java.i
+data/src/share/vm/classfile/javaAssertions.cpp.i
data/src/share/vm/runtime/reflectionUtils.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CDebugInfoDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/build-impl.xml.i
-data/src/cpu/sparc/vm/c2_init_sparc.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Connection.java.i
data/src/share/vm/memory/allocationStats.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceMirrorKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SirInstruction.java.i
+data/agent/make/dumpsyspropsproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberMapping.java.i
data/src/share/vm/services/runtimeService.cpp.i
-data/src/cpu/zero/vm/globals_zero.hpp.i
-data/src/share/vm/oops/cpCacheOop.hpp.i
+data/test/compiler/6663621/IVTest.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/SaveAllAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/FieldTreeNodeAdapter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntryConstants.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LongField.java.i
data/make/windows/makefiles/rules.make.i
data/src/share/vm/utilities/elfStringTable.hpp.i
data/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp.i
data/build/solaris/makefiles/reorder_COMPILER1_sparc.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedSatelliteComponent.java.i
-data/src/os/windows/vm/hpi_windows.hpp.i
+data/src/os/windows/vm/vtune_windows.cpp.i
+data/test/compiler/6990212/Test6990212.java.i
data/src/share/vm/memory/serialize.cpp.i
-data/src/share/tools/ProjectCreator/ProjectCreator.java.i
+data/src/share/vm/prims/jniCheck.cpp.i
data/src/share/tools/IdealGraphVisualizer/Layout/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterDirectAddress.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java.i
data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.hpp.i
-data/agent/test/jdi/serialvm.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LoadDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/SuccessorSelector.java.i
+data/src/share/vm/memory/cardTableRS.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/search.gif.i
data/src/os/linux/vm/osThread_linux.cpp.i
data/src/share/vm/gc_implementation/shared/gcOverheadReporter.hpp.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowAction.java.i
data/src/share/vm/ci/ciField.cpp.i
data/test/compiler/7002666/Test7002666.java.i
-data/src/share/vm/shark/sharkContext.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java.i
data/test/compiler/5091921/Test6890943.java.i
data/src/os/windows/vm/os_windows.inline.hpp.i
data/src/share/vm/precompiled.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SavedRestoredDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/PhiNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RestoredInstruction.java.i
data/build/solaris/makefiles/mapfile-vers-COMPILER2.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64FloatRegister.java.i
+data/src/share/vm/oops/instanceOop.cpp.i
data/src/share/vm/opto/callnode.cpp.i
data/src/share/vm/runtime/prefetch.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java.i
-data/src/share/vm/memory/threadLocalAllocBuffer.cpp.i
+data/src/share/vm/runtime/mutexLocker.cpp.i
+data/src/share/vm/gc_implementation/g1/ptrQueue.inline.hpp.i
data/src/share/vm/runtime/jniHandles.cpp.i
-data/agent/make/dumpflagswindbg.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java.i
+data/make/bsd/makefiles/rules.make.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif.i
+data/src/cpu/sparc/vm/javaFrameAnchor_sparc.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/build-impl.xml.i
-data/src/share/vm/gc_implementation/shared/coTracker.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxAddress.java.i
data/src/share/vm/runtime/timer.hpp.i
data/src/share/vm/opto/callGenerator.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeFastAAccess0.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp.i
+data/src/share/vm/interpreter/bytecode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/TypeComponentImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java.i
+data/agent/src/os/win32/Buffer.cpp.i
data/agent/make/soqlproc.sh.i
data/src/cpu/zero/vm/stack_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachNode.java.i
+data/src/os/bsd/vm/threadCritical_bsd.cpp.i
data/src/share/vm/shark/sharkStack.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapVisitor.java.i
+data/src/share/vm/oops/cpCacheOop.hpp.i
data/src/share/vm/adlc/adlparse.cpp.i
-data/agent/doc/ReadMe-JavaScript.text.i
+data/make/windows/projectfiles/tiered/ADLCompiler.dsw.i
data/src/share/vm/adlc/adlc.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/extract.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicField.java.i
+data/test/compiler/6863155/Test6863155.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/ResolveListener.java.i
+data/src/share/vm/runtime/osThread.hpp.i
data/src/share/vm/runtime/perfMemory.cpp.i
+data/src/share/vm/ci/ciFlags.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/InputLexer.java.i
+data/build/windows/projectfiles/tiered/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ProcessControl.java.i
data/agent/src/os/linux/Makefile.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaClass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicField.java.i
+data/src/cpu/sparc/vm/vm_version_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeRet.java.i
data/test/compiler/5091921/input6890943.txt.i
-data/agent/src/os/win32/isNT4.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9SirInstruction.java.i
data/src/share/tools/MakeDeps/FileName.java.i
data/src/cpu/zero/vm/interpreter_zero.hpp.i
data/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJShortField.java.i
data/make/windows/makefiles/sanity.make.i
data/src/share/vm/shark/sharkCompiler.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java.i
+data/build/solaris/platform_i486.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputBlockEdge.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/zoomin.gif.i
data/make/solaris/makefiles/compiler2.make.i
data/test/compiler/6646020/Tester.java.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupReceiver.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/genfiles.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SAPanel.java.i
-data/src/share/vm/gc_implementation/shared/liveRange.hpp.i
-data/src/share/vm/opto/callnode.hpp.i
+data/build/windows/platform_i486.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/CodeHeap.java.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/ServerCompilerScheduler.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/StandardGroupOrganizer.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java.i
-data/src/share/vm/shark/sharkNativeWrapper.cpp.i
+data/src/share/vm/utilities/copy.hpp.i
data/src/share/vm/runtime/interfaceSupport.hpp.i
data/src/cpu/zero/vm/relocInfo_zero.cpp.i
data/src/cpu/zero/vm/bytecodes_zero.cpp.i
data/src/cpu/x86/vm/c1_Runtime1_x86.cpp.i
+data/agent/src/os/win32/isNT4.hpp.i
data/src/share/vm/ci/ciObjArrayKlassKlass.cpp.i
-data/src/share/tools/MakeDeps/UnixPlatform.java.i
+data/src/cpu/zero/vm/relocInfo_zero.hpp.i
+data/src/os/bsd/vm/chaitin_bsd.cpp.i
data/src/cpu/zero/vm/fakeStubFrame_zero.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/JavaGroupOrganizer.java.i
data/make/windows/makefiles/defs.make.i
@@ -2477,6 +2603,7 @@ data/src/share/tools/launcher/java.c.i
data/src/os/solaris/launcher/java_md.h.i
data/src/share/vm/shark/sharkInvariants.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationSpec.java.i
+data/src/os/linux/vm/chaitin_linux.cpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/images/method.gif.i
data/src/share/vm/gc_implementation/shared/mutableSpace.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Arguments.java.i
@@ -2488,41 +2615,43 @@ data/make/solaris/makefiles/core.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/SaveAs24.gif.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/platform.properties.i
-data/src/share/vm/shark/sharkInliner.cpp.i
+data/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp.d
+data/agent/src/share/classes/sun/jvm/hotspot/tools/JMap.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.cpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArgument.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JLongField.java.i
-data/src/cpu/sparc/vm/relocInfo_sparc.cpp.i
+data/src/share/vm/runtime/threadLocalStorage.cpp.i
data/src/os_cpu/linux_zero/vm/prefetch_linux_zero.inline.hpp.i
data/src/share/vm/runtime/vtune.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java.i
data/agent/src/os/solaris/dbx/Makefile.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java.i
+data/agent/src/share/classes/com/sun/java/swing/action/NextAction.java.i
data/src/share/vm/interpreter/bytecodeHistogram.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Disassembler.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatBranchDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/PackageScanner.java.i
-data/src/share/vm/services/g1MemoryPool.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupReceiver.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/META-INF/services/com.sun.hotspot.igv.filter.ScriptEngineAbstraction.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadStore.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/OopHandle.java.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf.i
-data/src/os_cpu/linux_sparc/vm/orderAccess_linux_sparc.inline.hpp.i
+data/src/share/vm/shark/sharkTopLevelBlock.hpp.i
+data/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLookupswitch.java.i
data/src/share/vm/gc_implementation/shared/spaceCounters.hpp.i
-data/src/os/windows/vm/c2_globals_windows.hpp.i
+data/src/share/vm/gc_implementation/g1/heapRegion.inline.hpp.i
data/src/share/vm/opto/live.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/SafepointBlob.java.i
data/src/os_cpu/linux_zero/vm/vmStructs_linux_zero.hpp.i
-data/make/linux/platform_zero.in.i
-data/make/windows/projectfiles/core/vm.dsw.i
-data/build/solaris/platform_sparc.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/Zoom16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LoadObject.java.i
-data/src/share/vm/compiler/compilerOracle.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/BufferBlob.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/InvocableCallable.java.i
data/test/compiler/6636138/Test2.java.i
data/build/solaris/makefiles/reorder_CORE_amd64.i
+data/src/os/windows/vm/jvm_windows.h.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop2Decoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/UnknownOopException.java.i
data/src/cpu/zero/vm/cppInterpreterGenerator_zero.hpp.i
@@ -2532,59 +2661,67 @@ data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceStoreDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9InstructionFactoryImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.properties.i
-data/src/share/vm/utilities/constantTag.hpp.i
data/src/share/vm/memory/genMarkSweep.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf.i
+data/src/os/windows/vm/perfMemory_windows.cpp.i
+data/build/linux/build.sh.i
data/src/share/vm/oops/instanceRefKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JByteField.java.i
+data/src/share/vm/code/nmethod.hpp.i
data/src/share/vm/adlc/archDesc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/PCFinder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/development/Server16.gif.i
-data/src/cpu/zero/vm/javaFrameAnchor_zero.hpp.i
+data/src/share/vm/utilities/utf8.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LdstubDecoder.java.i
-data/src/share/vm/runtime/fieldDescriptor.cpp.i
-data/build/solaris/makefiles/reorder_COMPILER2_i486.i
+data/test/compiler/6823453/Test.java.i
+data/agent/src/os/linux/salibelf.c.i
data/src/share/vm/oops/instanceMirrorKlass.cpp.i
data/test/compiler/6579789/Test6579789.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save16.gif.i
+data/agent/make/Makefile.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/add.gif.i
data/make/windows/makefiles/product.make.i
+data/make/bsd/makefiles/zeroshark.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.cpp.i
data/src/os/windows/vm/version.rc.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/BlockWidget.java.i
data/build/windows/build.bat.i
data/src/os_cpu/linux_x86/vm/assembler_linux_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/TypeNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSList.java.i
-data/src/share/vm/runtime/handles.cpp.i
+data/src/share/vm/adlc/formsopt.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/StackTrace.java.i
-data/src/share/vm/prims/nativeLookup.hpp.i
+data/test/runtime/6626217/IFace.java.i
data/test/compiler/6875866/Test.java.i
data/src/share/vm/runtime/vm_version.hpp.i
data/src/cpu/zero/vm/assembler_zero.inline.hpp.i
-data/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp.i
+data/test/compiler/6880034/Test6880034.java.i
data/src/share/vm/gc_implementation/g1/g1BlockOffsetTable.hpp.i
data/make/linux/makefiles/mapfile-vers-debug.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml.i
data/build/linux/makefiles/hp1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapVisitor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java.i
data/src/os/solaris/vm/chaitin_solaris.cpp.i
data/agent/make/saenv.bat.i
data/build/windows/projectfiles/tiered/ADLCompiler.dsw.i
-data/src/os/linux/vm/c2_globals_linux.hpp.i
+data/make/bsd/makefiles/launcher.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/SysPropsPanel.java.i
data/agent/make/finalizerinfoproc64.sh.i
data/test/compiler/5091921/Test7005594.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCJmplInstruction.java.i
-data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp.i
+data/src/os/bsd/vm/mutex_bsd.cpp.i
+data/agent/test/jdi/serialvm.sh.i
data/agent/test/libproc/LibprocClient.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopPrinter.java.i
-data/build/solaris/makefiles/adjust-mflags.sh.i
+data/test/compiler/6378821/Test6378821.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DoubleType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/DebugInfoReadStream.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/MoveFilterUpAction.java.i
-data/src/share/vm/utilities/bitMap.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java.i
+data/test/compiler/6932496/Test6932496.java.i
+data/build/linux/makefiles/hp.make.i
+data/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp.i
data/src/share/vm/gc_implementation/shared/gcOverheadReporter.cpp.i
data/test/compiler/6910605/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCStbarInstruction.java.i
@@ -2592,36 +2729,37 @@ data/src/cpu/zero/vm/interpreterRT_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50.java.i
data/src/share/vm/gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp.i
data/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp.i
-data/build/linux/makefiles/compiler1.make.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BaseLineInfo.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciSymbol.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThread.java.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/DiagramConnectionWidget.java.i
-data/src/share/vm/opto/connode.hpp.i
-data/src/share/vm/prims/jvmtiGetLoadedClasses.hpp.i
+data/src/share/vm/opto/block.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java.i
+data/make/bsd/makefiles/cscope.make.i
+data/src/cpu/sparc/vm/frame_sparc.cpp.i
data/src/share/vm/runtime/orderAccess.cpp.i
-data/test/compiler/6589834/Test_ia32.java.i
+data/build/windows/build_vm_def.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/SOQLEngine.java.i
+data/make/bsd/makefiles/gcc.make.i
data/build/solaris/makefiles/profiled.make.i
data/test/compiler/6843752/Test.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.xml.i
-data/agent/make/soqlwindbg64.bat.i
-data/agent/src/scripts/start-debug-server.sh.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/Help16.gif.i
+data/src/share/vm/gc_implementation/g1/heapRegion.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortableTableModel.java.i
data/agent/test/libproc/LibprocTest.java.i
data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp.i
+data/src/share/vm/utilities/stack.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CallInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CharField.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java.i
-data/src/share/vm/prims/jvmtiExtensions.hpp.i
+data/src/share/vm/services/threadService.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSModule.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java.i
-data/src/share/vm/utilities/copy.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/Field.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FrameWrapper.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicOopField.java.i
data/make/solaris/Queens.class.i
-data/src/share/vm/runtime/frame.inline.hpp.i
data/src/share/vm/gc_implementation/g1/g1OopClosures.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/PreferenceConstants.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInCodeCachePanel.java.i
@@ -2632,15 +2770,14 @@ data/agent/src/share/classes/sun/jvm/hotspot/code/ConstantIntValue.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/PointerLocation.java.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ColorIcon.java.i
data/src/cpu/sparc/vm/bytes_sparc.hpp.i
-data/src/share/vm/compiler/compileBroker.hpp.i
+data/src/share/tools/MakeDeps/MacroDefinitions.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp.i
data/build/solaris/platform_amd64.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DefaultObjectVisitor.java.i
data/build/solaris/makefiles/reorder_COMPILER2_sparcv9.i
data/src/share/vm/runtime/atomic.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java.i
-data/src/share/vm/c1/c1_GraphBuilder.cpp.i
-data/src/os/solaris/dtrace/generateJvmOffsets.h.i
+data/test/compiler/6769124/TestDeoptInt6769124.java.i
+data/src/share/vm/runtime/vframeArray.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ScopeDesc.java.i
data/build/windows/projectfiles/compiler2/Makefile.i
data/src/share/tools/MakeDeps/Database.java.i
@@ -2649,9 +2786,9 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/ProtectionDomainEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FPop1Decoder.java.i
data/src/share/vm/memory/genOopClosures.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/LongTreeNodeAdapter.java.i
-data/src/share/vm/adlc/formsopt.cpp.i
+data/src/os_cpu/windows_x86/vm/bytes_windows_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicType.java.i
-data/src/cpu/zero/vm/jni_zero.h.i
+data/src/share/tools/IdealGraphVisualizer/Settings/build.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerException.java.i
data/src/share/vm/gc_implementation/shared/gcAdaptivePolicyCounters.cpp.i
data/build/linux/platform_amd64.i
@@ -2659,8 +2796,8 @@ data/src/share/vm/shark/sharkConstant.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/FindPanel.java.i
data/build/solaris/platform_sparc.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CIntField.java.i
-data/src/share/tools/MakeDeps/WinGammaPlatform.java.i
-data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml.i
+data/src/share/vm/ci/ciMethodKlass.hpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/DiagramConnectionWidget.java.i
data/make/solaris/makefiles/reorder_CORE_sparc.i
data/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ByteField.java.i
@@ -2670,77 +2807,81 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEArithmeticDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugger.java.i
data/src/share/vm/opto/divnode.cpp.i
data/src/share/vm/interpreter/linkResolver.hpp.i
-data/src/share/vm/opto/mulnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSMap.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoad.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeGroupNode.java.i
-data/make/altsrc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJByteField.java.i
data/agent/src/share/classes/com/sun/java/swing/action/ApplyAction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/GraphViewerImplementation.java.i
-data/build/solaris/makefiles/reorder_CORE_sparc.i
-data/src/cpu/x86/vm/templateTable_x86_64.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java.i
+data/test/runtime/6626217/many_loader1.java.foo.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/build.xml.i
data/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp.i
data/src/share/vm/prims/jvm_misc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyBlockSym.java.i
data/src/share/vm/opto/addnode.cpp.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObject.java.i
data/src/share/vm/opto/loopnode.hpp.i
data/make/linux/makefiles/sparcWorks.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java.i
data/agent/src/os/solaris/dbx/helloWorld.cpp.i
data/src/share/vm/memory/permGen.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/amd64/AMD64ThreadContext.java.i
data/src/os/solaris/dtrace/hotspot.d.i
-data/src/share/vm/ci/compilerInterface.hpp.i
data/build/linux/makefiles/jvmti.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50ReservedTypes.java.i
data/agent/make/pmapproc.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java.i
-data/src/share/vm/classfile/symbolTable.hpp.i
+data/src/cpu/x86/vm/nativeInst_x86.hpp.i
data/src/share/vm/memory/oopFactory.hpp.i
data/src/share/vm/interpreter/oopMapCache.cpp.i
data/.hgignore.i
+data/src/share/vm/gc_implementation/g1/satbQueue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/LineNumberTableElement.java.i
-data/src/share/vm/memory/collectorPolicy.hpp.i
data/build/solaris/makefiles/amd64.make.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/JFrameWrapper.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ReturnInstruction.java.i
data/src/share/vm/code/vmreg.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCOpcodes.java.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC8.java.i
data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/project.xml.i
-data/make/windows/projectfiles/compiler2/vm.dsw.i
+data/agent/src/share/classes/com/sun/java/swing/action/AlignCenterAction.java.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC8.java.i
data/src/share/vm/prims/jvmtiImpl.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteOopHandle.java.i
-data/test/compiler/5091921/Test6890943.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcThreadFactory.java.i
+data/src/cpu/zero/vm/bytecodes_zero.hpp.i
+data/make/solaris/platform_amd64.i
+data/src/share/vm/gc_implementation/g1/sparsePRT.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/SourceCodePanel.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignLeft16.gif.i
data/src/share/vm/interpreter/bytecodeInterpreter.hpp.i
data/src/share/vm/opto/divnode.hpp.i
data/src/share/vm/runtime/javaCalls.cpp.i
+data/make/solaris/makefiles/buildtree.make.i
data/src/cpu/zero/vm/register_zero.cpp.i
data/src/share/vm/opto/ifg.cpp.i
data/src/share/vm/runtime/aprofiler.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstance.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java.i
data/src/os/windows/vm/jvm_windows.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeANewArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86XMMRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPArithmeticDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/MethodNode.java.i
data/src/cpu/sparc/vm/debug_sparc.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.cpp.i
-data/src/share/vm/gc_implementation/g1/survRateGroup.cpp.i
-data/src/share/vm/gc_implementation/g1/satbQueue.hpp.i
+data/src/share/vm/memory/filemap.cpp.i
+data/src/share/vm/oops/oop.psgc.inline.hpp.i
data/src/share/vm/utilities/ostream.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxDebuggerLocal.java.i
data/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/manifest.mf.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MMXRegister.java.i
data/test/compiler/7017746/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/JCharField.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandPredecessorsAction.java.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/Save16.gif.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/src/com/sun/hotspot/igv/rhino/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputEdge.java.i
data/agent/src/os/linux/test.c.i
@@ -2750,59 +2891,57 @@ data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Boun
data/build/solaris/adlc_updater.i
data/src/share/vm/utilities/events.hpp.i
data/src/cpu/sparc/vm/methodHandles_sparc.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java.i
-data/test/compiler/6855215/Test6855215.java.i
+data/build/windows/makefiles/adlc.make.i
data/LICENSE.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/project.xml.i
data/src/share/vm/ci/ciTypeArrayKlass.cpp.i
-data/src/share/vm/memory/resourceArea.hpp.i
-data/src/cpu/zero/vm/copy_zero.hpp.i
+data/test/compiler/6757316/Test6757316.java.i
+data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Client.java.i
data/src/share/vm/ci/bcEscapeAnalyzer.cpp.i
-data/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.i
data/src/os_cpu/linux_zero/vm/os_linux_zero.hpp.i
data/src/os_cpu/windows_x86/vm/globals_windows_x86.hpp.i
+data/src/os/bsd/vm/globals_bsd.hpp.i
data/src/share/vm/classfile/verificationType.cpp.i
-data/src/os/windows/vm/mutex_windows.inline.hpp.i
+data/src/share/vm/memory/barrierSet.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/StoreInstruction.java.i
data/make/solaris/makefiles/sparcv9.make.i
data/src/share/vm/compiler/compileBroker.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FPopDecoder.java.i
+data/agent/src/os/solaris/proc/saproc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicRefType.java.i
data/src/share/vm/runtime/compilationPolicy.hpp.i
data/src/os/solaris/vm/stubRoutines_solaris.cpp.i
data/src/share/vm/opto/coalesce.hpp.i
data/src/share/vm/shark/shark_globals.hpp.i
data/src/share/tools/launcher/jli_util.h.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ArithmeticInstruction.java.i
-data/src/share/vm/gc_implementation/shared/spaceDecorator.hpp.i
+data/src/share/vm/opto/cfgnode.cpp.i
data/src/cpu/x86/vm/register_x86.cpp.i
data/test/compiler/6894807/IsInstanceTest.java.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicBlockSym.java.i
-data/src/share/vm/classfile/classFileParser.hpp.i
-data/src/cpu/sparc/vm/vmreg_sparc.hpp.i
+data/test/compiler/6539464/Test.java.i
+data/src/share/vm/runtime/simpleThresholdPolicy.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/EditableAtEndDocument.java.i
-data/test/compiler/6885584/Test6885584.java.i
data/build/windows/projectfiles/compiler2/vm.dsw.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml.i
+data/src/share/vm/opto/block.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicPointerType.java.i
-data/agent/make/Makefile.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/BlockConnectionWidget.java.i
data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInvoke.java.i
-data/src/share/vm/memory/allocation.hpp.i
-data/make/linux/Queens.class.i
+data/src/share/vm/prims/jvmtiTrace.cpp.i
data/src/os/solaris/vm/objectMonitor_solaris.hpp.i
-data/src/share/vm/Xusage.txt.i
data/src/share/vm/prims/jvmtiTagMap.cpp.i
data/src/share/vm/code/compressedStream.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/build-impl.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/LinearAllocBlock.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisterInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandleBlock.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86ShiftInstruction.java.i
-data/src/share/vm/classfile/javaClasses.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java.i
-data/src/share/vm/ci/ciType.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java.i
+data/make/solaris/platform_sparc.gcc.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/PlaceholderTable.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64FloatRegisters.java.i
+data/src/share/vm/prims/jvmtiEnv.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFException.java.i
data/src/share/vm/oops/compiledICHolderOop.cpp.i
data/src/share/vm/prims/methodHandles.cpp.i
data/src/share/vm/memory/tenuredGeneration.hpp.i
@@ -2810,7 +2949,7 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/MessageQueueBackend.java.
data/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SAJDIClassLoader.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/DummySymbolFinder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CTypeTreeNodeAdapter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableBucket.java.i
data/src/share/vm/classfile/stackMapTable.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Disassembler.java.i
data/build/test/Queens.java.i
@@ -2818,39 +2957,46 @@ data/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp.i
data/src/cpu/x86/vm/assembler_x86.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Graph.java.i
data/make/sa.files.i
+data/src/os/bsd/vm/jvm_bsd.h.i
data/src/share/vm/shark/sharkCodeBuffer.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/LogicalDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxCDebugger.java.i
data/src/share/vm/gc_implementation/g1/g1RemSet.cpp.i
data/src/share/vm/runtime/javaFrameAnchor.hpp.i
-data/make/linux/makefiles/amd64.make.i
+data/src/share/vm/gc_implementation/parNew/vmStructs_parNew.hpp.i
data/agent/src/os/win32/SwDbgSrv.dsp.i
-data/src/share/vm/runtime/mutex.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/MemoryAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalSym.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/TreeTableModelAdapter.java.i
+data/src/share/vm/gc_implementation/g1/g1_globals.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/genfiles.properties.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/ChangedEventProvider.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Node_Array.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java.i
+data/src/share/vm/classfile/loaderConstraints.cpp.i
+data/src/share/vm/c1/c1_Instruction.hpp.i
data/src/cpu/x86/vm/templateInterpreter_x86.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Interpreter.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/HierarchicalGraphLayout.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/NativeSignatureIterator.java.i
data/src/share/vm/prims/jvmtiCodeBlobEvents.hpp.i
-data/make/windows/README.i
+data/src/cpu/sparc/vm/nativeInst_sparc.hpp.i
+data/src/os_cpu/windows_x86/vm/copy_windows_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FloatGRPDecoder.java.i
+data/src/cpu/zero/vm/interp_masm_zero.cpp.i
data/src/cpu/x86/vm/runtime_x86_64.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugDirectoryEntry.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaArray.java.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveSelfLoopsFilter.java.i
+data/src/share/vm/oops/typeArrayKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/ExceptionEvent.java.i
-data/src/share/vm/c1/c1_Optimizer.hpp.i
+data/src/share/vm/ci/ciExceptionHandler.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/EditorInputGraphProvider.java.i
data/src/cpu/x86/vm/c1_MacroAssembler_x86.hpp.i
data/build/windows/jvmexp_g.lcf.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/table/SortHeaderMouseAdapter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/livejvm/BreakpointEvent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/VoidTypeImpl.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp.i
data/test/runtime/6925573/SortMethodsTest.java.i
-data/src/cpu/zero/vm/stubGenerator_zero.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicJCharField.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/manifest.mf.i
+data/src/share/vm/compiler/abstractCompiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalLayoutManager.java.i
data/agent/make/hsdb.bat.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/Edge.java.i
@@ -2865,18 +3011,17 @@ data/agent/src/share/classes/sun/jvm/hotspot/types/JIntField.java.i
data/src/cpu/x86/vm/stubGenerator_x86_64.cpp.i
data/src/share/vm/c1/c1_Defs.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSOldGen.java.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64JavaCallWrapper.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp.i
-data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.cpp.i
-data/src/share/vm/compiler/disassembler.cpp.i
+data/src/share/vm/c1/c1_FpuStackSim.hpp.i
+data/src/share/vm/shark/sharkType.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/OopVisitor.java.i
data/src/share/vm/shark/sharkValue.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/MaskFillerForNative.java.i
data/src/os/solaris/vm/objectMonitor_solaris.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterOutgoingConnection.java.i
data/src/os_cpu/solaris_sparc/vm/prefetch_solaris_sparc.inline.hpp.i
-data/src/share/vm/services/threadService.cpp.i
+data/test/compiler/6663848/Tester.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50Subsection.java.i
data/src/share/vm/code/relocInfo.cpp.i
data/src/share/vm/shark/sharkTopLevelBlock.cpp.i
@@ -2885,17 +3030,20 @@ data/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java.i
data/src/share/vm/runtime/arguments.hpp.i
data/src/share/vm/memory/allocationStats.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThread.java.i
+data/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java.i
data/src/share/vm/runtime/init.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/adjoiningVirtualSpaces.cpp.i
+data/src/cpu/sparc/vm/relocInfo_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/ArrayType.java.i
-data/src/os/solaris/vm/os_solaris.hpp.i
+data/src/os_cpu/windows_x86/vm/assembler_windows_x86_32.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialLoadInstruction.java.i
-data/src/share/vm/opto/parseHelper.cpp.i
+data/test/compiler/6659207/Test.java.i
data/build/windows/projectfiles/compiler2/vm.def.i
data/src/share/vm/c1/c1_Canonicalizer.cpp.i
+data/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Assert.java.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.hpp.i
-data/src/cpu/x86/vm/runtime_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SubsectionDirectory.java.i
data/src/share/vm/compiler/compilerOracle.hpp.i
data/src/share/tools/MakeDeps/FileFormatException.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CVAttributes.java.i
@@ -2906,252 +3054,268 @@ data/src/share/vm/runtime/vm_version.cpp.i
data/agent/src/share/native/jvmdi/sa.cpp.i
data/src/share/vm/adlc/arena.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java.i
-data/src/share/vm/ci/ciField.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/LinuxOopHandle.java.i
+data/src/share/vm/gc_implementation/g1/vm_operations_g1.hpp.i
+data/test/compiler/6930043/Test6930043.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MembarInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/action/FindAction.java.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_32.il.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSYoungGen.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SrcModFileDesc.java.i
-data/build/linux/makefiles/i486.make.i
-data/src/share/vm/c1/c1_ValueType.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/DataSource.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java.i
data/src/share/vm/runtime/aprofiler.cpp.i
data/src/share/vm/gc_implementation/shared/spaceCounters.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicEnumType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsr.java.i
-data/src/share/vm/adlc/filebuff.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/JNIHandles.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50X86RegisterEnums.java.i
-data/src/share/vm/c1/c1_ValueStack.cpp.i
+data/src/share/vm/gc_implementation/g1/concurrentZFThread.cpp.i
+data/src/share/vm/ci/ciUtilities.cpp.i
+data/src/share/vm/shark/sharkContext.cpp.i
+data/src/share/vm/services/psMemoryPool.hpp.i
+data/src/share/vm/oops/arrayOop.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java.i
data/src/share/tools/hsdis/hsdis.h.i
data/src/share/tools/LogCompilation/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSymbol.java.i
+data/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9SpecialLoadDecoder.java.i
data/src/cpu/sparc/vm/copy_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64Frame.java.i
-data/src/share/vm/utilities/elfStringTable.cpp.i
-data/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp.i
+data/src/share/vm/runtime/stubCodeGenerator.cpp.i
data/agent/make/start-debug-server-proc.sh.i
+data/make/bsd/platform_sparcv9.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFHashTable.java.i
+data/make/bsd/makefiles/core.make.i
data/build/linux/makefiles/jvmg.make.i
-data/build/linux/build.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStore.java.i
-data/src/share/vm/utilities/accessFlags.hpp.i
+data/src/share/vm/opto/chaitin.hpp.i
+data/build/solaris/makefiles/compiler2.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/Interval.java.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java.i
data/src/share/vm/adlc/dict2.hpp.i
data/src/cpu/x86/vm/disassembler_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeEnums.java.i
+data/make/solaris/makefiles/reorder_COMPILER1_amd64.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/layer.xml.i
data/agent/src/os/win32/toolHelp.cpp.i
data/make/pic.make.i
data/src/share/vm/oops/instanceKlass.hpp.i
-data/src/share/tools/MakeDeps/DirectoryTree.java.i
+data/src/share/vm/ci/ciMethodHandle.cpp.i
data/agent/src/share/lib/jlfgr-1_0.jar.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp.i
-data/src/share/vm/gc_implementation/shared/allocationStats.cpp.i
+data/test/compiler/6478991/NullCheckTest.java.i
+data/make/linux/makefiles/hp.make.i
data/build/solaris/makefiles/i486.make.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/PrevDiagramAction.java.i
-data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties.i
-data/src/cpu/zero/vm/stack_zero.cpp.i
+data/src/share/vm/oops/constMethodOop.hpp.i
+data/src/os/windows/vm/objectMonitor_windows.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/next_diagram.png.i
-data/src/share/vm/utilities/hashtable.hpp.i
+data/src/share/vm/oops/arrayKlass.hpp.i
data/src/cpu/sparc/vm/templateInterpreter_sparc.cpp.i
data/src/share/vm/ci/ciMethodData.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/AddressField.java.i
data/agent/doc/index.html.i
data/src/share/vm/c1/c1_LIRAssembler.hpp.i
-data/build/linux/makefiles/dtrace.make.i
+data/build/solaris/Queens.class.i
data/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp.i
data/test/compiler/6756768/Test6756768_2.java.i
-data/src/os/posix/vm/os_posix.cpp.i
-data/src/share/vm/gc_implementation/parNew/parOopClosures.hpp.i
-data/test/compiler/6378821/Test6378821.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java.i
+data/agent/src/os/solaris/proc/libproc.h.i
+data/src/share/vm/oops/klass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RegisterMap.java.i
+data/test/compiler/6855215/Test6855215.java.i
data/src/cpu/sparc/vm/c1_FrameMap_sparc.hpp.i
data/src/share/vm/memory/dump.cpp.i
data/make/windows/jvmexp.lcf.i
data/src/share/vm/opto/compile.cpp.i
-data/src/os/linux/vm/mutex_linux.inline.hpp.i
+data/src/share/vm/ci/ciTypeFlow.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/HighPrecisionJScrollBar.java.i
data/src/share/vm/utilities/utf8.cpp.i
data/src/share/vm/c1/c1_LIR.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86PCRelativeAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/action/InspectAction.java.i
-data/test/compiler/6714694/Tester.java.i
+data/make/bsd/makefiles/fastdebug.make.i
+data/src/cpu/sparc/vm/interpreter_sparc.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFormat3AInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/Universe.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/Address.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/InputNode.java.i
data/src/share/vm/interpreter/templateInterpreter.cpp.i
data/src/share/tools/IdealGraphVisualizer/Difference/build.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/CompoundType.java.i
+data/src/share/vm/runtime/advancedThresholdPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FloatField.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLineNumberInfo.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/About16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/LongTypeImpl.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupOrganizer.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRettInstruction.java.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC6.java.i
data/src/os/solaris/vm/vtune_solaris.cpp.i
data/src/os/linux/vm/jsig.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java.i
-data/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FloatType.java.i
-data/src/share/tools/launcher/jli_util.c.i
-data/src/cpu/sparc/vm/c1_Defs_sparc.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp.i
+data/src/share/vm/oops/methodDataKlass.hpp.i
+data/make/solaris/makefiles/cscope.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPArithmeticInstruction.java.i
data/src/cpu/x86/vm/stubRoutines_x86_64.cpp.i
data/agent/src/os/win32/serverLists.cpp.i
data/src/share/vm/adlc/forms.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGen.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/LogicInstruction.java.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/Bundle.properties.i
data/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp.i
data/src/share/tools/MakeDeps/WinGammaPlatformVC7.java.i
data/build/windows/projectfiles/kernel/Makefile.i
data/src/cpu/x86/vm/stubGenerator_x86_32.cpp.i
data/src/share/vm/adlc/output_h.cpp.i
+data/agent/src/os/bsd/test.c.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/PrimitiveTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFSectionHeader.java.i
+data/agent/src/share/classes/com/sun/java/swing/ui/CommonToolBar.java.i
data/agent/src/share/classes/com/sun/java/swing/action/FinishAction.java.i
data/test/compiler/6921969/TestMultiplyLongHiZero.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/UnsupportedPlatformException.java.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/RangeSliderModel.java.i
+data/src/cpu/x86/vm/runtime_x86_32.cpp.i
+data/test/compiler/6800154/Test6800154.java.i
+data/make/bsd/platform_i486.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/project.properties.i
+data/build/linux/makefiles/jsig.make.i
data/src/share/vm/utilities/defaultStream.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MultiNode.java.i
data/test/compiler/6852078/Test6852078.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86GeneralInstruction.java.i
data/make/windows/projectfiles/tiered/ADLCompiler.dsp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyOopHandle.java.i
+data/src/share/vm/gc_implementation/shared/concurrentGCThread.hpp.i
data/src/share/vm/ci/ciArrayKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/AddressDataSource.java.i
-data/src/share/vm/utilities/stack.inline.hpp.i
+data/agent/src/share/classes/com/sun/java/swing/ui/CommonUI.java.i
data/src/share/vm/opto/optoreg.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/platform.properties.i
data/agent/make/jcoreproc.sh.i
+data/src/share/vm/oops/fieldStreams.hpp.i
data/build/solaris/makefiles/reorder_TIERED_i486.i
-data/src/share/vm/oops/oop.pcgc.inline.hpp.i
+data/src/share/vm/utilities/array.cpp.i
data/src/share/vm/classfile/classLoader.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java.i
data/test/compiler/7009359/Test7009359.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9RegisterBranchDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/project.properties.i
data/src/share/vm/gc_interface/collectedHeap.inline.hpp.i
data/src/share/vm/memory/memRegion.cpp.i
data/src/share/tools/hsdis/hsdis-demo.c.i
data/src/share/vm/interpreter/bytecodeTracer.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/Characteristics.java.i
+data/test/compiler/6885584/Test6885584.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Registers.java.i
+data/test/compiler/7070134/Stemmer.java.i
data/src/cpu/zero/vm/assembler_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HashtableEntry.java.i
data/src/os/solaris/launcher/java.h.i
data/agent/src/os/linux/symtab.h.i
data/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp.i
data/src/cpu/sparc/vm/icache_sparc.hpp.i
-data/src/share/vm/opto/classes.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/ClusterInputSlotNode.java.i
data/src/share/vm/ci/ciArray.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/SelectBytecodesAction.java.i
-data/make/windows/platform_i486.i
+data/src/share/vm/includeDB_gc_parallel.i
data/src/share/vm/runtime/basicLock.hpp.i
data/src/share/vm/runtime/virtualspace.hpp.i
-data/build/linux/makefiles/gcc.make.i
+data/src/share/vm/asm/assembler.cpp.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/CallDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/ia64/LinuxIA64ThreadContext.java.i
-data/src/share/vm/runtime/osThread.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Difference/src/com/sun/hotspot/igv/difference/Bundle.properties.i
+data/src/share/vm/runtime/vmThread.hpp.i
+data/make/linux/makefiles/amd64.make.i
data/src/share/vm/gc_implementation/includeDB_gc_g1.i
+data/build/windows/projectfiles/kernel/vm.dsw.i
data/src/share/vm/ci/ciClassList.hpp.i
data/src/share/tools/ProjectCreator/DirectoryTreeNode.java.i
-data/src/share/vm/c1/c1_Runtime1.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9Opcodes.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java.i
-data/src/os_cpu/windows_x86/vm/threadLS_windows_x86.hpp.i
+data/src/share/vm/ci/ciType.cpp.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86.cpp.i
+data/src/share/tools/hsdis/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Node.java.i
data/src/share/vm/utilities/growableArray.cpp.i
data/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp.i
data/src/share/vm/code/codeBlob.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java.i
data/src/cpu/x86/vm/templateInterpreterGenerator_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedInt.java.i
+data/src/share/vm/runtime/signature.cpp.i
data/src/share/vm/utilities/decoder.hpp.i
data/src/share/vm/memory/genCollectedHeap.hpp.i
+data/make/windows/cross_build.bat.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/WatcherThread.java.i
-data/src/share/vm/ci/ciCPCache.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/sparc/ProcSPARCThreadFactory.java.i
+data/src/share/vm/gc_implementation/shared/gcStats.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintEntry.java.i
data/make/scm.make.i
data/src/share/vm/oops/constantPoolKlass.hpp.i
+data/test/compiler/7082949/Test7082949.java.i
data/src/share/vm/services/memoryManager.cpp.i
data/src/share/vm/classfile/stackMapTableFormat.hpp.i
-data/make/linux/makefiles/defs.make.i
+data/make/solaris/makefiles/kernel.make.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicDoubleType.java.i
data/src/share/vm/memory/memRegion.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/amd64/AMD64CFrame.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/IndexableFieldIdentifier.java.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/suite.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArray.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9FMOVccInstruction.java.i
-data/src/share/vm/ci/ciMethodHandle.hpp.i
-data/test/compiler/6932496/Test6932496.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeCheckCast.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java.i
data/src/os_cpu/solaris_sparc/vm/solaris_sparc.ad.i
-data/src/share/vm/opto/superword.hpp.i
+data/src/cpu/zero/vm/javaFrameAnchor_zero.hpp.i
+data/make/bsd/makefiles/jvmg.make.i
data/src/share/vm/utilities/globalDefinitions.cpp.i
data/src/os/linux/launcher/java.h.i
data/src/cpu/zero/vm/vmreg_zero.inline.hpp.i
+data/make/bsd/makefiles/jsig.make.i
data/src/share/tools/hsdis/Makefile.i
-data/src/share/vm/prims/jvmtiEventController.cpp.i
+data/test/gc/7072527/TestFullGCCount.java.i
data/src/cpu/x86/vm/methodHandles_x86.hpp.i
data/src/cpu/x86/vm/register_definitions_x86.cpp.i
+data/make/bsd/platform_ia64.i
data/src/share/vm/memory/genCollectedHeap.cpp.i
data/make/linux/makefiles/jvmti.make.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.cpp.i
+data/src/share/vm/compiler/compileLog.hpp.i
data/src/os/linux/vm/decoder_linux.cpp.i
data/src/cpu/sparc/vm/sharedRuntime_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerTypeImpl.java.i
+data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.hpp.i
data/src/share/vm/prims/jvmtiThreadState.inline.hpp.i
data/src/share/vm/interpreter/interpreter.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSrcModule.java.i
+data/src/cpu/sparc/vm/interpreter_sparc.hpp.i
data/agent/src/os/linux/libproc_impl.c.i
data/src/os/windows/vm/stubRoutines_windows.cpp.i
data/build/solaris/makefiles/sparcWorks.make.i
data/src/cpu/sparc/vm/c1_FpuStackSim_sparc.hpp.i
data/agent/src/os/win32/ioUtils.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/KlassKlass.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RegisterPart.java.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/build.xml.i
data/src/share/vm/shark/llvmHeaders.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/ReadWriteDecoder.java.i
data/build/solaris/makefiles/optimized.make.i
-data/src/share/vm/opto/domgraph.cpp.i
data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86_32.cpp.i
data/agent/make/hsdbwindbg64.bat.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java.i
+data/agent/src/os/win32/libInfo.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/BranchDecoder.java.i
-data/src/share/vm/libadt/port.cpp.i
+data/src/os/windows/vm/osThread_windows.hpp.i
data/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp.i
-data/src/cpu/x86/vm/depChecker_x86.hpp.i
+data/test/compiler/6935535/Test.java.i
data/agent/make/jcorewindbg.bat.i
-data/make/windows/projectfiles/core/Makefile.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCFP2RegisterInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCArithmeticInstruction.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/FunctionSym.java.i
+data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp.i
data/build/solaris/makefiles/saproc.make.i
data/make/solaris/makefiles/gcc.make.i
data/src/share/vm/runtime/os.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BitMap.java.i
-data/src/cpu/x86/vm/sharedRuntime_x86_64.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFFile.java.i
+data/make/windows/makefiles/projectcreator.make.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphCookie.java.i
+data/src/cpu/x86/vm/jni_x86.h.i
data/src/share/vm/ci/ciInstanceKlassKlass.hpp.i
-data/src/share/vm/runtime/basicLock.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MappedByteBufferDataSource.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/LazyType.java.i
+data/src/share/vm/shark/sharkNativeWrapper.cpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSafepointInputs.filter.i
data/agent/make/start-debug-server-windbg64.bat.i
data/src/share/vm/gc_implementation/parNew/parCardTableModRefBS.cpp.i
data/test/compiler/6712835/Test6712835.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psPromotionLAB.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9FMOVccDecoder.java.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/platform.properties.i
data/src/share/vm/oops/arrayKlassKlass.hpp.i
data/agent/src/os/win32/isNT4.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactoryImpl.java.i
+data/make/linux/platform_zero.in.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcOopHandle.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/MapScriptObject.java.i
-data/src/os/solaris/vm/osThread_solaris.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Difference/manifest.mf.i
data/src/os_cpu/solaris_sparc/vm/thread_solaris_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/ObjectTreeNodeAdapter.java.i
data/src/share/vm/opto/parse3.cpp.i
@@ -3160,46 +3324,48 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RegisterBranchInst
data/src/cpu/x86/vm/c1_LinearScan_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/IndexableFieldIdentifier.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicSym.java.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeJsrW.java.i
data/src/share/vm/services/lowMemoryDetector.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CardGeneration.java.i
+data/build/linux/makefiles/compiler1.make.i
data/src/share/vm/runtime/reflection.cpp.i
+data/make/bsd/makefiles/shark.make.i
data/src/os/windows/vm/vmError_windows.cpp.i
data/src/cpu/sparc/vm/assembler_sparc.cpp.i
data/src/share/vm/shark/sharkCacheDecache.cpp.i
-data/agent/make/jsdbwindbg.bat.i
-data/src/share/tools/MakeDeps/MacroDefinitions.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/ObjectVisitor.java.i
-data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/HeapPrinter.java.i
+data/src/share/vm/c1/c1_Canonicalizer.hpp.i
+data/src/share/vm/compiler/compileBroker.hpp.i
+data/src/share/vm/opto/subnode.cpp.i
+data/build/windows/makefiles/vm.make.i
+data/src/share/vm/ci/ciCPCache.cpp.i
+data/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp.i
data/src/share/vm/c1/c1_LIRAssembler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicLocalSym.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactibleFreeListSpace.java.i
+data/make/altsrc.make.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/StringTable.java.i
data/src/share/vm/ci/ciEnv.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/x86/ProcX86Thread.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/SAEditorPane.java.i
data/src/share/vm/prims/jvmtiEnter.hpp.i
data/build/windows/projectfiles/tiered/vm.dsw.i
-data/make/solaris/platform_amd64.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/OutlineTopComponentWstcref.xml.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/UncommonTrapEvent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java.i
data/src/cpu/x86/vm/interpreterRT_x86.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/NarrowOopField.java.i
-data/make/solaris/makefiles/dtrace.make.i
-data/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp.i
+data/src/share/vm/utilities/elfFile.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxFunctionDefinitionRecord.java.i
data/src/share/vm/classfile/verificationType.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/sa.js.i
-data/src/share/vm/oops/objArrayKlass.hpp.i
+data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/manifest.mf.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ObjectReferenceImpl.java.i
-data/src/share/vm/utilities/intHisto.hpp.i
+data/src/share/vm/memory/blockOffsetTable.inline.hpp.i
data/build/linux/makefiles/fastdebug.make.i
data/src/share/vm/opto/macro.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Helper.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/OutlineAction.java.i
-data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.hpp.i
+data/build/solaris/makefiles/hp1.make.i
+data/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp.i
data/src/os/solaris/dtrace/generateJvmOffsetsMain.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSpecialRegisters.java.i
+data/src/cpu/sparc/vm/c2_globals_sparc.hpp.i
data/src/share/vm/runtime/vm_operations.cpp.i
data/agent/make/pmapwindbg.bat.i
data/agent/src/share/classes/com/sun/java/swing/action/AboutAction.java.i
@@ -3208,153 +3374,170 @@ data/src/share/vm/shark/sharkRuntime.cpp.i
data/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp.i
data/src/share/vm/prims/jvmtiEnvBase.cpp.i
data/src/share/vm/adlc/forms.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/FinalizerInfo.java.i
+data/agent/src/os/bsd/ps_core.c.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/project.properties.i
data/build/linux/makefiles/rules.make.i
data/src/share/vm/gc_implementation/g1/g1RemSet.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java.i
-data/src/cpu/sparc/vm/icBuffer_sparc.cpp.i
+data/src/share/vm/memory/allocation.hpp.i
+data/agent/src/os/win32/procList.cpp.i
data/src/share/vm/oops/methodDataOop.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/BoundedZoomAction.java.i
-data/src/share/tools/MakeDeps/DirectoryTreeNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/UnimpDecoder.java.i
+data/src/share/vm/prims/nativeLookup.hpp.i
+data/src/share/vm/opto/parseHelper.cpp.i
+data/src/share/vm/prims/jvmtiEventController.cpp.i
data/test/compiler/6796786/Test6796786.java.i
data/src/share/vm/utilities/debug.cpp.i
data/src/share/tools/IdealGraphVisualizer/Layout/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/LoadInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/LoaderConstraintTable.java.i
-data/make/linux/makefiles/hp.make.i
-data/src/share/vm/oops/arrayKlass.hpp.i
+data/test/compiler/6795161/Test.java.i
+data/src/share/vm/gc_implementation/shared/allocationStats.cpp.i
+data/src/share/vm/utilities/hashtable.hpp.i
data/test/compiler/6863420/Test.java.i
data/src/cpu/sparc/vm/c1_MacroAssembler_sparc.hpp.i
data/src/cpu/x86/vm/vmreg_x86.inline.hpp.i
-data/make/solaris/makefiles/debug.make.i
-data/src/os/windows/vm/perfMemory_windows.cpp.i
-data/agent/make/dumpflagsproc64.sh.i
+data/src/share/vm/utilities/array.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Port.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryPanel.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FPLoadInstruction.java.i
-data/src/cpu/sparc/vm/globalDefinitions_sparc.hpp.i
-data/src/share/vm/services/psMemoryPool.cpp.i
+data/test/compiler/6589834/Test_ia32.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java.i
data/src/share/vm/ci/ciMethodData.hpp.i
-data/src/share/vm/gc_implementation/shared/mutableSpace.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java.i
-data/agent/src/share/classes/com/sun/java/swing/ui/CommonUI.java.i
+data/src/share/vm/opto/lcm.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BlockSym.java.i
+data/src/share/vm/utilities/stack.inline.hpp.i
data/src/share/vm/opto/multnode.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java.i
+data/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp.i
+data/build/linux/makefiles/gcc.make.i
data/src/os/windows/vm/objectMonitor_windows.hpp.i
data/make/solaris/makefiles/jvmg.make.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/InputGraphProvider.java.i
-data/src/share/vm/memory/watermark.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/Location.java.i
data/src/share/vm/memory/permGen.cpp.i
-data/src/os/linux/vm/chaitin_linux.cpp.i
+data/src/share/vm/runtime/deoptimization.cpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/build.xml.i
-data/make/windows/cross_build.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java.i
+data/src/share/vm/classfile/symbolTable.cpp.i
data/agent/make/jhistowindbg64.bat.i
data/build/windows/makefiles/sanity.make.i
data/agent/src/os/win32/SwDbgSub.cpp.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Group.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/Annotation.java.i
-data/src/os/windows/vm/osThread_windows.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstIterator.java.i
+data/src/share/vm/libadt/port.cpp.i
+data/make/windows/projectfiles/core/Makefile.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86InstructionFactory.java.i
data/build/windows/create.bat.i
data/test/compiler/6991596/Test6991596.java.i
data/src/share/vm/code/nmethod.cpp.i
data/src/share/vm/includeDB_gc.i
-data/build/windows/makefiles/vm.make.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/JStack.java.i
-data/src/share/vm/runtime/osThread.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/LineWidget.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadFactory.java.i
+data/src/share/tools/launcher/jli_util.c.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExpandSuccessorsAction.java.i
data/build/solaris/platform_amd64.gcc.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/ServiceabilityAgentJVMDIModule.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/RevPtrsTreeNodeAdapter.java.i
-data/agent/src/os/win32/procList.cpp.i
+data/src/cpu/sparc/vm/icBuffer_sparc.cpp.i
+data/agent/test/libproc/libproctest.sh.i
data/src/os/linux/launcher/java_md.c.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/InputSlotWidget.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/Location.java.i
+data/src/share/vm/memory/watermark.hpp.i
data/src/share/vm/memory/restore.cpp.i
-data/src/share/vm/code/codeBlob.hpp.i
-data/agent/src/os/win32/README-commands.txt.i
-data/src/share/vm/code/relocInfo.hpp.i
+data/src/share/vm/services/management.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntegerEnum.java.i
+data/src/share/vm/prims/jvmtiEnter.xsl.i
data/build/solaris/makefiles/rules.make.i
-data/src/share/vm/code/scopeDesc.hpp.i
+data/src/share/vm/oops/compiledICHolderKlass.hpp.i
data/src/os/solaris/vm/jvm_solaris.h.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedStream.java.i
+data/src/share/vm/code/scopeDesc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86JavaCallWrapper.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/RegionNode.java.i
data/agent/src/scripts/start-rmiregistry.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java.i
+data/src/cpu/zero/vm/frame_zero.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/x86/LinuxX86ThreadContext.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCSwapInstruction.java.i
data/src/share/tools/ProjectCreator/MacroDefinitions.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramScene.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/treetable/AbstractTreeTableModel.java.i
data/build/linux/platform_amd64.suncc.i
-data/src/cpu/zero/vm/interpreterFrame_zero.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/CoprocessorDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedStream.java.i
+data/src/os/bsd/vm/c1_globals_bsd.hpp.i
data/src/os/solaris/vm/jvm_solaris.cpp.i
data/src/share/vm/opto/multnode.hpp.i
+data/src/share/vm/opto/superword.hpp.i
data/test/runtime/6626217/You_Have_Been_P0wned.java.i
data/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp.i
+data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/ReversePtrs.java.i
data/src/share/vm/ci/ciConstantPoolCache.cpp.i
data/test/compiler/6877254/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/CellTypeState.java.i
data/src/share/vm/ci/ciMethodBlocks.hpp.i
+data/src/os/linux/vm/c2_globals_linux.hpp.i
data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Bundle.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSGlobalTypes.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RdprInstruction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java.i
+data/agent/make/marks_notes.html.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/SharedObject.java.i
data/src/share/vm/prims/jvmtiClassFileReconstituter.cpp.i
data/make/linux/makefiles/ia64.make.i
data/src/share/vm/memory/iterator.hpp.i
data/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9DoneInstruction.java.i
-data/make/solaris/adlc_updater.i
+data/make/bsd/makefiles/i486.make.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/NMethod.java.i
data/src/cpu/x86/vm/depChecker_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/ClassObjectReferenceImpl.java.i
data/src/share/vm/code/codeCache.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/SOQLException.java.i
data/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad.i
-data/src/share/vm/opto/bytecodeInfo.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9InstructionDecoder.java.i
-data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp.i
+data/src/share/vm/gc_implementation/includeDB_gc_shared.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/SimpleTreeNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThread.java.i
data/src/share/vm/interpreter/bytecode.hpp.i
-data/src/cpu/zero/vm/jniFastGetField_zero.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/ArithmeticDecoder.java.i
data/src/os_cpu/solaris_x86/vm/bytes_solaris_x86.inline.hpp.i
data/src/cpu/x86/vm/assembler_x86_64.hpp.i
data/src/share/vm/classfile/resolutionErrors.cpp.i
data/test/compiler/5091921/Test6935022.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32OopHandle.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/LocationValue.java.i
+data/src/share/vm/shark/sharkConstant.hpp.i
data/src/cpu/sparc/vm/icache_sparc.cpp.i
data/src/share/vm/shark/sharkStack.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/StackFrameImpl.java.i
+data/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp.i
data/build/windows/projectfiles/common/Makefile.i
data/test/compiler/5091921/output6890943.txt.i
data/agent/src/share/classes/sun/jvm/hotspot/code/CompressedReadStream.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structure.gif.i
data/src/cpu/sparc/vm/stubGenerator_sparc.cpp.i
+data/make/jprt.gmk.i
data/src/share/vm/libadt/set.cpp.i
data/make/windows/makefiles/adlc.make.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/New16.gif.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ia64/IA64CurrentFrameGuess.java.i
-data/src/cpu/zero/vm/vtableStubs_zero.cpp.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/ExtendedPanAction.java.i
data/src/share/vm/prims/evmCompat.cpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomInAction.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/RemoveFilter.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGen.java.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/FigureWidget.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ThreadLocalAllocBuffer.java.i
-data/src/cpu/sparc/vm/templateTable_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/OopField.java.i
data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/BatikSVG.java.i
data/src/share/vm/runtime/memprofiler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeSipush.java.i
data/src/cpu/x86/vm/bytecodes_x86.hpp.i
+data/src/os_cpu/linux_sparc/vm/vmStructs_linux_sparc.hpp.i
data/make/linux/makefiles/makedeps.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_ia64/LinuxIA64JavaThreadPDAccess.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteTypeImpl.java.i
+data/build/solaris/platform_sparcv9.gcc.i
+data/build/solaris/makefiles/reorder_COMPILER2_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_sparc/SolarisSPARCJavaThreadPDAccess.java.i
data/make/linux/platform_ia64.i
data/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp.i
@@ -3363,16 +3546,16 @@ data/make/linux/makefiles/i486.make.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/save.gif.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/MatcherSelector.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/DebuggerUtilities.java.i
-data/src/share/vm/shark/sharkBuilder.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/RefType.java.i
data/src/share/vm/runtime/interfaceSupport.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java.i
data/src/share/vm/memory/universe.inline.hpp.i
data/src/share/vm/oops/oopsHierarchy.cpp.i
+data/agent/src/os/bsd/symtab.h.i
data/src/cpu/x86/vm/vm_version_x86_32.cpp.i
data/src/os_cpu/linux_zero/vm/os_linux_zero.cpp.i
data/src/share/vm/c1/c1_InstructionPrinter.cpp.i
-data/make/README.i
+data/test/compiler/5091921/Test6196102.java.i
data/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86CondJmpInstruction.java.i
data/src/share/vm/c1/c1_LIR.cpp.i
@@ -3380,11 +3563,15 @@ data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java.i
data/test/compiler/6851282/Test.java.i
data/src/share/vm/ci/ciTypeFlow.cpp.i
data/src/share/vm/opto/compile.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/elf/ELFStringTable.java.i
data/src/share/vm/memory/sharedHeap.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/BasicTypeSize.java.i
+data/make/bsd/adlc_updater.i
+data/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/JFloatField.java.i
-data/src/os/posix/launcher/java_md.c.i
+data/src/share/vm/gc_implementation/parNew/parGCAllocBuffer.cpp.i
data/THIRD_PARTY_README.i
data/agent/src/share/classes/sun/jvm/hotspot/HSDB.java.i
data/make/solaris/makefiles/reorder_TIERED_sparcv9.i
@@ -3392,16 +3579,16 @@ data/agent/src/share/classes/sun/jvm/hotspot/utilities/AbstractHeapGraphWriter.j
data/src/os/linux/vm/vtune_linux.cpp.i
data/src/share/vm/ci/ciTypeArrayKlass.hpp.i
data/build/solaris/makefiles/mapfile-vers-TIERED.i
-data/src/share/vm/memory/barrierSet.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86Helper.java.i
+data/build/solaris/makefiles/top.make.i
data/make/linux/platform_amd64.i
data/src/cpu/sparc/vm/bytecodes_sparc.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COMDATSelectionTypes.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java.i
-data/make/solaris/platform_amd64.gcc.i
-data/src/cpu/zero/vm/templateInterpreter_zero.cpp.i
-data/src/share/vm/utilities/vmError.hpp.i
-data/make/solaris/makefiles/reorder_TIERED_i486.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/BitType.java.i
+data/make/solaris/platform_amd64.gcc.i
+data/src/share/vm/utilities/accessFlags.hpp.i
+data/agent/src/scripts/start-debug-server.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/MonitorInfo.java.i
data/test/compiler/6695810/Test.java.i
data/test/compiler/6711117/Test.java.i
data/src/os/solaris/vm/osThread_solaris.cpp.i
@@ -3411,112 +3598,121 @@ data/agent/src/share/classes/sun/jvm/hotspot/memory/OffsetTableContigSpace.java.
data/agent/src/share/classes/sun/jvm/hotspot/debugger/ReadResult.java.i
data/src/share/vm/adlc/formssel.cpp.i
data/src/share/vm/runtime/vmStructs.cpp.i
-data/src/share/tools/MakeDeps/WinGammaPlatformVC9.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java.i
+data/src/share/vm/c1/c1_ValueStack.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/GenCollectedHeap.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/ControlFlowTopComponentSettings.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/posix/DSO.java.i
-data/test/runtime/6626217/many_loader2.java.foo.i
+data/make/windows/makefiles/launcher.make.i
+data/build/solaris/platform_sparc.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/build.xml.i
-data/src/share/vm/opto/regalloc.cpp.i
+data/src/share/vm/services/heapDumper.cpp.i
data/src/os/linux/vm/hpi_linux.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/InstructionVisitor.java.i
-data/src/share/vm/opto/classes.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Block_List.java.i
+data/src/share/vm/services/memoryService.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/OptionalHeaderWindowsSpecificFields.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9RdprInstruction.java.i
data/src/share/vm/classfile/stackMapFrame.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/layer.xml.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/widgets/OutputSlotWidget.java.i
data/src/cpu/x86/vm/interpreterRT_x86_32.cpp.i
data/src/cpu/x86/vm/interp_masm_x86_32.hpp.i
-data/make/windows/makefiles/shared.make.i
+data/src/share/vm/utilities/preserveException.cpp.i
data/src/share/vm/c1/c1_Optimizer.cpp.i
data/build/solaris/makefiles/jvmti.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86FloatRegister.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/DefaultOopVisitor.java.i
data/src/share/vm/runtime/jniPeriodicChecker.cpp.i
data/src/cpu/sparc/vm/frame_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V8FPop1Decoder.java.i
-data/build/windows/makefiles/debug.make.i
+data/make/solaris/makefiles/reorder_CORE_i486.i
data/src/os/solaris/dtrace/jhelper.d.i
data/src/share/vm/shark/shark_globals.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeBipush.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/MemoryInstructionDecoder.java.i
+data/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp.i
data/build/linux/makefiles/mapfile-vers-product.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/PropertiesSheet.java.i
data/src/os/windows/launcher/java_md.c.i
data/src/share/vm/memory/classify.cpp.i
data/build/solaris/makefiles/jsig.make.i
-data/make/solaris/makefiles/mapfile-vers-jvm_dtrace.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/Open16.gif.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/SlotLayout.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterChainProviderImplementation.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/SharedHeap.java.i
+data/src/cpu/sparc/vm/c1_FrameMap_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/MarkBits.java.i
+data/src/share/vm/ci/ciTypeArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/GenerationFactory.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/RawHeapVisitor.java.i
data/src/share/tools/IdealGraphVisualizer/Util/nbproject/suite.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicFunctionSym.java.i
data/src/share/vm/adlc/output_c.cpp.i
data/make/solaris/platform_i486.gcc.i
-data/agent/make/start-debug-server-windbg.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/SysPropsDumper.java.i
data/src/os_cpu/linux_sparc/vm/linux_sparc.s.i
-data/src/share/vm/runtime/vframe.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java.i
+data/make/linux/platform_i486.suncc.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64RegisterMap.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/META-INF/services/com.sun.hotspot.igv.filter.FilterChainProvider.i
data/src/share/vm/runtime/fieldType.cpp.i
data/make/solaris/makefiles/top.make.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java.i
data/agent/src/os/win32/initWinsock.cpp.i
data/src/share/vm/shark/sharkEntry.hpp.i
data/src/share/vm/services/g1MemoryPool.cpp.i
-data/src/share/vm/classfile/classFileStream.hpp.i
+data/src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/PMap.java.i
-data/make/solaris/makefiles/adlc.make.i
data/src/share/vm/classfile/stackMapFrame.cpp.i
data/src/share/vm/c1/c1_ValueType.hpp.i
data/src/os/linux/launcher/java.c.i
-data/agent/make/jdbproc64.sh.i
-data/agent/src/os/linux/ps_proc.c.i
+data/src/share/vm/ci/ciKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbolBase.java.i
data/make/windows/build_vm_def.sh.i
-data/src/share/tools/IdealGraphVisualizer/Filter/build.xml.i
+data/make/solaris/makefiles/hp1.make.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/removeSelfLoops.filter.i
+data/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp.i
data/src/share/vm/shark/llvmValue.hpp.i
data/src/share/vm/interpreter/cppInterpreter.cpp.i
data/make/linux/makefiles/zero.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/ServiceThread.java.i
-data/src/share/vm/oops/instanceKlass.cpp.i
-data/src/cpu/x86/vm/vm_version_x86_32.hpp.i
+data/src/share/vm/gc_implementation/shared/coTracker.cpp.i
+data/make/solaris/adlc_updater.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/MakeNotEntrantEvent.java.i
data/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp.i
-data/agent/test/jdi/VMConnection.java.i
data/src/share/vm/adlc/dict2.cpp.i
data/src/share/vm/oops/arrayKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/code/ExceptionBlob.java.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.properties.i
-data/make/linux/makefiles/buildtree.make.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java.i
+data/src/share/vm/oops/instanceMirrorKlass.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponent.form.i
+data/src/share/vm/libadt/dict.hpp.i
data/src/cpu/x86/vm/jniTypes_x86.hpp.i
-data/src/share/tools/IdealGraphVisualizer/nbproject/build-impl.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java.i
+data/src/share/vm/prims/jvmtiEventController.hpp.i
data/src/share/vm/runtime/vframe_hp.cpp.i
data/agent/make/mkinstall.i
data/test/compiler/6901572/Test.java.i
-data/src/share/vm/utilities/vmError.cpp.i
data/test/compiler/6797305/Test6797305.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VMObject.java.i
data/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/BooleanTypeImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86JmpInstruction.java.i
-data/make/windows/get_msc_ver.sh.i
-data/test/compiler/6912517/Test.java.i
-data/src/share/vm/runtime/stubCodeGenerator.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java.i
+data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/services/GroupCallback.java.i
+data/agent/src/os/bsd/salibelf.h.i
+data/src/share/vm/adlc/archDesc.hpp.i
+data/agent/make/dumpflagsproc64.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/Main.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEMoveDecoder.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/ObjectMonitor.java.i
+data/src/os/bsd/vm/os_bsd.hpp.i
data/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionAMD64.java.i
-data/src/share/vm/code/nmethod.hpp.i
+data/src/share/vm/gc_implementation/g1/heapRegion.cpp.i
data/test/compiler/5057225/Test5057225.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/ia64/IA64Registers.java.i
+data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/GraphCountGroupOrganizer.java.i
data/src/cpu/x86/vm/cppInterpreterGenerator_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/Server.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSPermGen.java.i
+data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/InterfaceTypeImpl.java.i
data/agent/src/os/win32/serverLists.hpp.i
-data/test/compiler/6866651/Test.java.i
+data/src/share/tools/MakeDeps/DirectoryTreeNode.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/FindPanel.java.i
data/build/linux/makefiles/buildtree.make.i
data/make/linux/makefiles/profiled.make.i
@@ -3524,65 +3720,70 @@ data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ByteCodeRewriter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerField.java.i
data/make/linux/makefiles/gcc.make.i
data/src/share/vm/gc_implementation/parallelScavenge/psMarkSweepDecorator.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/MonitorCacheDumpPanel.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArrayKlass.java.i
+data/src/share/vm/gc_implementation/parNew/parOopClosures.hpp.i
+data/src/cpu/x86/vm/copy_x86.hpp.i
data/src/cpu/x86/vm/templateInterpreter_x86_32.cpp.i
-data/src/share/vm/runtime/globals.hpp.i
+data/agent/src/share/classes/images/toolbarButtonGraphics/general/About24.gif.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/serialization/Printer.java.i
data/src/cpu/zero/vm/methodHandles_zero.cpp.i
-data/src/share/vm/memory/cardTableRS.cpp.i
+data/test/compiler/6987555/Test6987555.java.i
data/src/share/vm/prims/jvmtiRedefineClassesTrace.hpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponent.java.i
data/src/cpu/x86/vm/relocInfo_x86.hpp.i
-data/src/share/vm/opto/matcher.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java.i
+data/src/share/vm/services/lowMemoryDetector.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/suite.properties.i
data/src/share/vm/code/vtableStubs.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/LinuxVtblAccess.java.i
-data/src/share/vm/c1/c1_InstructionPrinter.hpp.i
+data/agent/make/soqlwindbg64.bat.i
+data/agent/make/jdbproc64.sh.i
data/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/MutationException.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/ViewPanel.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/sparc/DbxSPARCThreadContext.java.i
+data/test/compiler/6636138/Test1.java.i
data/make/linux/Makefile.i
data/src/share/vm/oops/oopsHierarchy.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/linestyle.filter.i
-data/src/share/tools/ProjectCreator/BuildConfig.java.i
+data/src/share/vm/memory/tenuredGeneration.cpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/suite.properties.i
data/src/os/posix/launcher/launcher.script.i
data/src/share/vm/oops/generateOopMap.cpp.i
data/src/share/vm/oops/symbolOop.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Difference/nbproject/suite.properties.i
+data/src/share/vm/utilities/bitMap.inline.hpp.i
data/src/share/vm/interpreter/bytecodeTracer.hpp.i
data/src/share/vm/ci/ciSymbol.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/Inspector.java.i
+data/src/cpu/zero/vm/stubRoutines_zero.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSTypes.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Block.java.i
-data/src/share/tools/launcher/wildcard.h.i
+data/src/share/vm/utilities/hashtable.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebugger.java.i
data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/EditFilterDialog.form.i
+data/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp.i
+data/src/os/bsd/vm/jvm_bsd.cpp.i
data/src/share/vm/gc_implementation/shared/immutableSpace.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java.i
+data/src/share/vm/services/psMemoryPool.cpp.i
data/test/gc/6581734/Test6581734.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/Bundle.properties.i
+data/src/share/vm/gc_implementation/parallelScavenge/adjoiningGenerations.cpp.i
data/src/share/vm/classfile/systemDictionary.hpp.i
-data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/difference.filter.i
-data/src/share/vm/code/oopRecorder.cpp.i
-data/src/os_cpu/linux_x86/vm/vmStructs_linux_x86.hpp.i
+data/src/share/vm/oops/typeArrayKlass.cpp.i
+data/src/share/vm/prims/jvmtiRedefineClasses.cpp.i
+data/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp.i
data/src/cpu/x86/vm/bytecodeInterpreter_x86.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArray.java.i
-data/src/cpu/sparc/vm/vtableStubs_sparc.cpp.i
+data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/CheckNode.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32OopHandle.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/DebugEvent.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50TypeIterator.java.i
data/src/share/vm/runtime/biasedLocking.cpp.i
data/src/share/vm/runtime/fieldDescriptor.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaString.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxBfEfRecord.java.i
+data/src/share/vm/runtime/vframe.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/project.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/AccessControl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/IntervalNode.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCLdstubInstruction.java.i
-data/src/share/tools/launcher/wildcard.c.i
+data/src/share/vm/runtime/frame.inline.hpp.i
+data/src/share/vm/opto/idealKit.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java.i
data/agent/src/scripts/start-debug-server.bat.i
-data/make/templates/gpl-header.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java.i
+data/src/os/windows/vm/c1_globals_windows.hpp.i
data/test/compiler/6968348/Test6968348.java.i
data/agent/src/os/win32/Makefile.i
data/src/share/vm/oops/klassOop.cpp.i
@@ -3590,206 +3791,228 @@ data/agent/src/share/classes/sun/jvm/hotspot/interpreter/OopMapCacheEntry.java.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/META-INF/services/com.sun.hotspot.igv.data.services.GroupReceiver.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebugger.java.i
data/src/share/tools/IdealGraphVisualizer/ControlFlow/src/com/sun/hotspot/igv/controlflow/Bundle.properties.i
-data/src/share/vm/prims/jvm.cpp.i
+data/src/share/vm/asm/assembler.inline.hpp.i
data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.InputGraphProvider.i
data/src/share/vm/memory/referencePolicy.cpp.i
data/src/share/vm/opto/opcodes.cpp.i
data/src/share/vm/gc_implementation/g1/sparsePRT.hpp.i
+data/src/os/bsd/vm/c2_globals_bsd.hpp.i
data/src/cpu/sparc/vm/c1_LinearScan_sparc.hpp.i
-data/src/cpu/sparc/vm/vm_version_sparc.cpp.i
+data/src/share/vm/memory/specialized_oop_closures.hpp.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/RemoveFilterSettingsAction.java.i
data/src/cpu/sparc/vm/globals_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcCDebugger.java.i
data/src/cpu/zero/vm/icache_zero.hpp.i
-data/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeInstanceOf.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/TestParser.java.i
data/agent/make/hsdbproc.sh.i
-data/src/share/vm/oops/instanceOop.cpp.i
-data/src/cpu/x86/vm/register_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/amd64/AMD64Register.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ConcreteMethodImpl.java.i
+data/src/share/vm/opto/indexSet.hpp.i
+data/test/compiler/6689060/Test.java.i
+data/src/share/vm/c1/c1_FrameMap.hpp.i
+data/src/share/vm/opto/callnode.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/sparc/RemoteSPARCThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/BooleanTreeNodeAdapter.java.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/nbproject/build-impl.xml.i
data/src/share/vm/utilities/debug.hpp.i
data/src/share/vm/prims/jvmtiThreadState.cpp.i
data/test/jprt.config.i
-data/agent/src/share/classes/com/sun/java/swing/ui/ToggleActionPropertyChangeListener.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java.i
+data/src/share/vm/code/relocInfo.hpp.i
+data/agent/make/start-debug-server-proc64.sh.i
+data/make/bsd/makefiles/mapfile-vers-product.i
+data/test/compiler/5091921/Test6559156.java.i
data/src/share/vm/prims/jvmti.xml.i
data/src/cpu/zero/vm/depChecker_zero.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/DiagramViewModel.java.i
+data/src/share/vm/prims/jniFastGetField.hpp.i
data/agent/test/jdi/runjpda.sh.i
-data/src/share/tools/LogCompilation/README.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CMSPermGen.java.i
data/src/cpu/x86/vm/icBuffer_x86.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/saveall.gif.i
-data/agent/make/clhsdbproc64.sh.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/BranchInstruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/TestHelloWorld.java.i
data/src/share/vm/gc_implementation/parallelScavenge/psGenerationCounters.cpp.i
data/build/linux/makefiles/core.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java.i
data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/LayoutManager.java.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/memory/SymbolTable.java.i
+data/src/share/vm/shark/sharkContext.hpp.i
data/src/share/vm/opto/runtime.hpp.i
-data/make/linux/makefiles/product.make.i
+data/src/share/vm/classfile/verifier.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceSwapDecoder.java.i
-data/src/share/vm/opto/runtime.cpp.i
data/src/share/vm/utilities/yieldingWorkgroup.hpp.i
+data/src/os/bsd/vm/jsig.c.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeNew.java.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/suite.properties.i
-data/src/share/vm/gc_implementation/g1/survRateGroup.hpp.i
+data/make/solaris/makefiles/mapfile-vers-jvm_db.i
+data/src/share/vm/utilities/vmError.cpp.i
data/src/share/vm/adlc/Doc/Syntax.doc.i
data/src/share/vm/shark/sharkInliner.hpp.i
data/src/share/vm/compiler/methodLiveness.hpp.i
data/src/share/vm/prims/jvmtiTagMap.hpp.i
data/test/gc/6845368/bigobj.java.d
-data/test/runtime/6819213/TestBootNativeLibraryPath.java.i
+data/make/linux/makefiles/top.make.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CCBranchDecoder.java.i
data/test/gc/6845368/bigobj.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FlushDecoder.java.i
+data/make/linux/makefiles/debug.make.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSelectAction.java.i
data/src/share/vm/compiler/oopMap.hpp.i
-data/test/compiler/6909839/Test6909839.java.i
+data/src/cpu/zero/vm/vtableStubs_zero.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/genfiles.properties.i
-data/make/solaris/makefiles/saproc.make.i
+data/src/share/vm/utilities/intHisto.hpp.i
data/src/share/vm/prims/jvmtiExtensions.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntry.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/build-impl.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64JavaCallWrapper.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/project.xml.i
data/src/share/vm/prims/jvmtiGetLoadedClasses.cpp.i
data/src/cpu/x86/vm/disassembler_x86.hpp.i
data/src/share/vm/gc_implementation/shared/collectorCounters.cpp.i
-data/src/share/vm/prims/jvmtiClassFileReconstituter.hpp.i
-data/src/share/vm/services/heapDumper.hpp.i
+data/agent/src/os/linux/ps_proc.c.i
data/src/cpu/x86/vm/interpreter_x86_32.cpp.i
-data/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.i
+data/src/os/bsd/vm/perfMemory_bsd.cpp.i
+data/build/linux/makefiles/optimized.make.i
data/src/share/vm/code/stubs.hpp.i
+data/agent/src/os/bsd/symtab.c.i
data/src/share/vm/utilities/elfSymbolTable.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/VMModifiers.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValueCollection.java.i
data/src/share/vm/utilities/xmlstream.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9MOVccInstruction.java.i
-data/src/os_cpu/linux_zero/vm/threadLS_linux_zero.cpp.i
+data/make/windows/projectfiles/tiered/vm.def.i
+data/src/share/vm/adlc/filebuff.hpp.i
data/src/share/vm/prims/jvmtiEnvBase.hpp.i
-data/src/cpu/sparc/vm/bytecodeInterpreter_sparc.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9AlternateSpaceLdstubDecoder.java.i
+data/src/share/vm/memory/heapInspection.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ReturnInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/nbproject/genfiles.properties.i
-data/agent/src/share/classes/com/sun/java/swing/action/SaveAction.java.i
+data/build/solaris/makefiles/fastdebug.make.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ArgumentSizeComputer.java.i
data/src/os/linux/vm/hpi_linux.hpp.i
data/src/share/vm/prims/privilegedStack.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionSPARC64Bit.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/PointerType.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSFileIndex.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/DebugInformationRecorder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/BasicCDebugInfoDataBase.java.i
+data/build/linux/README.i
data/src/os_cpu/linux_x86/vm/linux_x86_64.ad.i
-data/make/windows/projectfiles/core/vm.def.i
+data/src/share/vm/oops/klassVtable.cpp.i
data/build/linux/platform_i486.i
data/src/os_cpu/windows_x86/vm/vm_version_windows_x86.cpp.i
+data/build/linux/makefiles/dtrace.make.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/DiffGraphAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64ThreadContext.java.i
data/src/share/vm/runtime/compilationPolicy.cpp.i
-data/src/share/vm/ci/ciObjectFactory.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassFilter.java.i
+data/src/share/vm/classfile/classFileParser.cpp.i
+data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/ActionUtilities.java.i
data/build/linux/makefiles/top.make.i
+data/src/share/vm/gc_implementation/includeDB_gc_parallelScavenge.i
data/agent/src/os/solaris/proc/mapfile.i
data/make/linux/makefiles/adlc.make.i
data/agent/make/saenv64.bat.i
data/src/share/vm/oops/instanceKlassKlass.cpp.i
data/make/solaris/makefiles/jsig.make.i
-data/build/windows/projectfiles/kernel/vm.dsw.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/META-INF/services/com.sun.hotspot.igv.data.services.Scheduler.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/SignatureConverter.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedFloat.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/psOldGen.cpp.i
data/src/share/tools/IdealGraphVisualizer/Filter/nbproject/build-impl.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java.i
data/src/share/vm/ci/bcEscapeAnalyzer.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSStaticSym.java.i
data/test/compiler/5091921/Test6357214.java.i
data/src/os_cpu/linux_zero/vm/thread_linux_zero.cpp.i
data/test/runtime/6981737/Test6981737.java.i
data/src/os_cpu/linux_sparc/vm/threadLS_linux_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/WrongTypeException.java.i
+data/agent/doc/hsdb.html.i
data/src/share/vm/compiler/disassemblerEnv.hpp.i
-data/make/jprt.gmk.i
+data/src/share/vm/opto/c2_globals.hpp.i
data/src/share/vm/runtime/park.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/FindObjectByType.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/UnmappedAddressException.java.i
data/make/linux/makefiles/core.make.i
-data/src/share/tools/IdealGraphVisualizer/Settings/src/com/sun/hotspot/igv/settings/Settings.java.i
-data/src/share/vm/memory/genRemSet.inline.hpp.i
+data/src/share/vm/runtime/handles.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50WrongNumericTypeException.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntryConstants.java.i
+data/make/bsd/Makefile.i
+data/src/share/tools/IdealGraphVisualizer/Bytecodes/build.xml.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/register.filter.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Mark.java.i
data/test/runtime/6626217/from_loader2.java.i
+data/make/hotspot_distro.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/sparc/LinuxSPARCCFrame.java.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/nbproject/suite.properties.i
-data/src/cpu/zero/vm/frame_zero.inline.hpp.i
+data/test/compiler/6661247/Test.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteAddress.java.i
data/test/compiler/6769124/TestUnalignedLoad6769124.java.i
data/src/share/vm/shark/sharkCompiler.hpp.i
data/src/share/tools/IdealGraphVisualizer/ServerCompiler/nbproject/project.properties.i
-data/make/solaris/makefiles/mapfile-vers-jsig.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/linux/amd64/LinuxAMD64CFrame.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9ConditionFlags.java.i
-data/src/cpu/zero/vm/globalDefinitions_zero.hpp.i
-data/src/share/vm/runtime/advancedThresholdPolicy.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java.i
+data/src/share/vm/ci/compilerInterface.hpp.i
+data/test/runtime/6888954/vmerrors.sh.i
data/src/share/vm/prims/jvmtiUtil.cpp.i
data/src/os/windows/vm/os_share_windows.hpp.i
data/agent/src/share/classes/com/sun/java/swing/action/OkAction.java.i
-data/make/linux/makefiles/saproc.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java.i
+data/src/os/solaris/dtrace/generateJvmOffsets.h.i
data/src/share/vm/c1/c1_globals.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/basic/CompoundTypeKind.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/TypeVisitor.java.i
-data/test/compiler/6982370/Test6982370.java.i
-data/src/cpu/x86/vm/jniFastGetField_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIf.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteTypeImpl.java.i
+data/src/share/vm/ci/ciInstance.cpp.i
data/src/share/vm/c1/c1_Defs.hpp.i
data/make/solaris/makefiles/mapfile-vers-COMPILER2.i
data/build/solaris/makefiles/defs.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFRelocation.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLOperations.java.i
+data/src/share/vm/runtime/unhandledOops.hpp.i
+data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ExtendedSatelliteComponent.java.i
data/src/share/vm/interpreter/abstractInterpreter.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PopcInstruction.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/nbproject/genfiles.properties.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/ThreadProxy.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgThreadFactory.java.i
data/agent/src/os/win32/libInfo.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js.i
data/src/os/solaris/vm/jsig.c.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9CMoveDecoder.java.i
+data/src/cpu/zero/vm/globalDefinitions_zero.hpp.i
+data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Selector.java.i
-data/src/share/vm/ci/ciCallSite.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java.i
+data/src/share/vm/ci/ciObjArray.hpp.i
+data/src/cpu/sparc/vm/dump_sparc.cpp.i
+data/src/share/vm/prims/hpi_imported.h.i
data/src/share/vm/memory/filemap.hpp.i
data/src/share/vm/ci/ciExceptionHandler.hpp.i
data/build/linux/makefiles/adlc.make.i
-data/agent/src/os/win32/README.txt.i
-data/src/os/solaris/dtrace/jvm_dtrace.h.i
+data/src/share/vm/opto/loopPredicate.cpp.i
+data/test/runtime/7020373/Test7020373.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArrayKlassKlass.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRestoreInstruction.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java.i
data/make/windows/projectfiles/kernel/Makefile.i
-data/make/solaris/makefiles/reorder_COMPILER1_sparc.i
+data/src/share/vm/prims/jvmtiEnvThreadState.cpp.i
+data/test/compiler/6778657/Test.java.i
data/src/share/vm/gc_implementation/shared/mutableNUMASpace.hpp.i
-data/make/solaris/makefiles/buildtree.make.i
+data/src/share/vm/runtime/fprofiler.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/NameFilter.java.i
data/src/os_cpu/solaris_sparc/vm/threadLS_solaris_sparc.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/FloatDecoder.java.i
data/test/compiler/6942326/Test.java.i
-data/make/linux/makefiles/compiler2.make.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExportAction.java.i
+data/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad.i
data/agent/test/jdi/sasanity.sh.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86CurrentFrameGuess.java.i
data/agent/src/share/classes/images/toolbarButtonGraphics/general/Help24.gif.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Diagram.java.i
data/src/share/vm/services/memoryService.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/bugspot/tree/DoubleTreeNodeAdapter.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/Disassembler.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/nbproject/platform.properties.i
data/src/share/tools/IdealGraphVisualizer/View/nbproject/platform.properties.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/JavaThreadsPanel.java.i
+data/src/share/vm/runtime/sweeper.cpp.i
data/make/windows/projectfiles/compiler2/ADLCompiler.dsp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/OneContigSpaceCardGeneration.java.i
+data/src/os/bsd/vm/thread_bsd.inline.hpp.i
data/src/share/vm/classfile/vmSymbols.cpp.i
data/src/share/vm/opto/indexSet.cpp.i
data/src/cpu/x86/vm/cppInterpreter_x86.hpp.i
data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/InvertSelector.java.i
data/make/windows/platform_amd64.i
-data/src/cpu/sparc/vm/vm_version_sparc.hpp.i
-data/src/share/vm/ci/ciObjArray.cpp.i
+data/src/os_cpu/linux_x86/vm/assembler_linux_x86_64.cpp.i
+data/test/compiler/6982370/Test6982370.java.i
data/src/share/vm/utilities/elfSymbolTable.hpp.i
data/src/cpu/sparc/vm/c1_LinearScan_sparc.cpp.i
data/build/linux/Queens.class.i
@@ -3799,77 +4022,81 @@ data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/LogicDecoder.java.i
data/src/share/tools/IdealGraphVisualizer/Data/src/com/sun/hotspot/igv/data/Pair.java.i
data/src/cpu/x86/vm/c1_CodeStubs_x86.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCacheEntry.java.i
+data/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp.i
data/src/share/vm/memory/cardTableModRefBS.hpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/promotionInfo.hpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/SaveAsAction.java.i
+data/src/share/vm/runtime/jniHandles.hpp.i
+data/src/os/windows/launcher/java_md.h.i
data/src/share/vm/gc_implementation/includeDB_gc_serial.i
data/src/share/tools/IdealGraphVisualizer/RhinoScriptEngineProxy/nbproject/project.xml.i
data/src/share/vm/runtime/objectMonitor.inline.hpp.i
data/src/share/vm/gc_implementation/shared/gcUtil.cpp.i
data/src/share/vm/opto/loopUnswitch.cpp.i
-data/src/share/vm/c1/c1_ValueMap.cpp.i
+data/test/compiler/7009231/Test7009231.java.i
data/agent/src/share/classes/sun/jvm/hotspot/code/VMRegImpl.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/DbxAddress.java.i
+data/src/share/vm/gc_implementation/shared/coTracker.hpp.i
+data/make/bsd/makefiles/compiler1.make.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ProfileData.java.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/DefNewGeneration.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArrayKlass.java.i
data/test/compiler/6891750/Test6891750.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp.i
data/src/cpu/x86/vm/jniFastGetField_x86_64.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/bugspot/RegisterPanel.java.i
+data/src/share/tools/IdealGraphVisualizer/View/nbproject/build-impl.xml.i
+data/src/os/bsd/vm/stubRoutines_bsd.cpp.i
+data/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp.i
data/src/cpu/x86/vm/frame_x86.cpp.i
data/make/windows/projectfiles/kernel/vm.def.i
-data/src/cpu/zero/vm/relocInfo_zero.hpp.i
+data/src/share/tools/MakeDeps/UnixPlatform.java.i
+data/src/share/tools/IdealGraphVisualizer/Util/nbproject/build-impl.xml.i
data/agent/make/hsdbproc64.sh.i
-data/src/cpu/zero/vm/frame_zero.cpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/Bundle.properties.i
+data/src/share/vm/code/location.hpp.i
+data/src/share/vm/runtime/mutex.hpp.i
data/src/share/vm/runtime/jniPeriodicChecker.hpp.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/JmpDecoder.java.i
+data/src/share/vm/services/g1MemoryPool.hpp.i
+data/make/windows/projectfiles/core/vm.dsw.i
data/agent/src/share/classes/sun/jvm/hotspot/jdi/SACoreAttachingConnector.java.i
data/src/share/vm/opto/chaitin.cpp.i
data/build/solaris/makefiles/product.make.i
data/agent/src/os/solaris/dbx/README-commands.txt.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/HistoryComboBox.java.i
data/src/share/vm/gc_implementation/g1/g1MonitoringSupport.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyAddress.java.i
-data/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java.i
+data/src/share/tools/IdealGraphVisualizer/Graph/src/com/sun/hotspot/igv/graph/Bundle.properties.i
+data/src/share/vm/ci/ciMethodHandle.hpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/memory/Space.java.i
-data/src/share/vm/ci/ciMethodKlass.hpp.i
data/src/share/vm/gc_implementation/shared/adaptiveSizePolicy.hpp.i
data/src/share/vm/asm/register.hpp.i
-data/src/cpu/sparc/vm/frame_sparc.cpp.i
+data/make/README.i
data/src/os/solaris/vm/vmError_solaris.cpp.i
data/src/share/vm/oops/oop.inline.hpp.i
-data/agent/test/jdi/serialvm.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/LocationValue.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicPointerType.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dbx/x86/DbxX86Thread.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/IndirectAddress.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaTypeArray.java.i
+data/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp.i
+data/build/solaris/makefiles/adjust-mflags.sh.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Link.java.i
+data/build/solaris/makefiles/mapfile-vers-COMPILER1.i
+data/src/share/tools/IdealGraphVisualizer/Graph/nbproject/project.xml.i
+data/src/share/vm/opto/connode.hpp.i
+data/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp.i
data/src/share/vm/opto/machnode.cpp.i
-data/src/share/vm/gc_implementation/shared/collectorCounters.hpp.i
-data/src/share/vm/opto/output.cpp.i
+data/src/share/vm/prims/jvmtiExtensions.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/cdbg/LineNumberInfo.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java.i
data/src/share/vm/ci/ciSymbolKlass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogramElement.java.i
data/src/share/tools/IdealGraphVisualizer/Util/src/com/sun/hotspot/igv/util/ContextAction.java.i
data/src/share/vm/runtime/task.cpp.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/folder.gif.i
-data/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCIndirectCallInstruction.java.i
+data/src/share/tools/MakeDeps/WinGammaPlatform.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/tools/StackTrace.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPStoreDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCRegisterIndirectAddress.java.i
+data/build/solaris/makefiles/reorder_CORE_sparc.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_x86/LinuxSignals.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/src/com/sun/hotspot/igv/svg/layer.xml.i
+data/agent/src/share/classes/sun/jvm/hotspot/memory/CompactingPermGen.java.i
data/src/cpu/sparc/vm/runtime_sparc.cpp.i
-data/src/cpu/x86/vm/nativeInst_x86.hpp.i
+data/src/share/vm/classfile/symbolTable.hpp.i
data/make/windows/makefiles/debug.make.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/OverviewAction.java.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsPermGen.hpp.i
data/src/share/vm/c1/c1_LIRGenerator.cpp.i
data/src/cpu/x86/vm/cppInterpreter_x86.cpp.i
-data/src/cpu/sparc/vm/interp_masm_sparc.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/MachineTypes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/RTLDataTypes.java.i
data/src/share/vm/opto/gcm.cpp.i
@@ -3884,38 +4111,44 @@ data/src/share/vm/libadt/port.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/Instruction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/oops/Klass.java.i
+data/src/cpu/zero/vm/jniFastGetField_zero.cpp.i
data/src/os/linux/vm/attachListener_linux.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/RegisterMap.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjArray.java.i
data/src/share/vm/memory/classify.hpp.i
data/build/solaris/makefiles/sparc.make.i
data/src/cpu/sparc/vm/relocInfo_sparc.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/code/SingletonBlob.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java.i
+data/src/share/vm/interpreter/templateTable.hpp.i
+data/src/cpu/zero/vm/register_definitions_zero.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicAddressFieldWrapper.java.i
data/src/share/vm/opto/type.cpp.i
data/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp.i
data/src/os_cpu/solaris_x86/vm/os_solaris_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/ui/FindInHeapPanel.java.i
+data/test/compiler/7052494/Test7052494.java.i
+data/agent/src/os/win32/README.txt.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50SSSymbols.java.i
+data/make/bsd/makefiles/profiled.make.i
data/src/os/solaris/vm/c1_globals_solaris.hpp.i
data/src/os/linux/vm/mutex_linux.cpp.i
data/src/os/linux/vm/stubRoutines_linux.cpp.i
-data/src/cpu/x86/vm/c1_LinearScan_x86.cpp.i
-data/src/share/tools/IdealGraphVisualizer/Filter/src/com/sun/hotspot/igv/filter/helper.js.i
-data/src/os/linux/vm/dtraceJSDT_linux.cpp.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.cpp.i
+data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/nbproject/genfiles.properties.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/x86/WindbgX86ThreadContext.java.i
data/src/share/tools/MakeDeps/Util.java.i
-data/agent/src/os/solaris/proc/libproc.h.i
+data/src/os/posix/vm/os_posix.cpp.i
+data/src/share/vm/ci/ciObjArray.cpp.i
data/build/windows/makefiles/product.make.i
data/test/runtime/6878713/Test6878713.sh.i
data/src/share/vm/classfile/javaAssertions.hpp.i
-data/src/share/vm/utilities/numberSeq.cpp.i
-data/src/share/vm/oops/objArrayKlassKlass.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java.i
data/src/share/vm/oops/typeArrayOop.hpp.i
data/src/share/vm/includeDB_core.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg/WindbgCDebugInfoBuilder.java.i
data/src/share/vm/gc_implementation/parallelScavenge/gcTaskThread.cpp.i
-data/build/solaris/platform_sparcv9.gcc.i
+data/src/share/vm/oops/klassVtable.hpp.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentSettings.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/ui/MemoryViewer.java.i
-data/src/cpu/sparc/vm/register_definitions_sparc.cpp.i
+data/src/share/vm/opto/loopTransform.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCTrapInstruction.java.i
data/src/share/tools/IdealGraphVisualizer/Bytecodes/src/com/sun/hotspot/igv/bytecodes/BytecodeViewTopComponentWstcref.xml.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/MessageQueue.java.i
@@ -3925,17 +4158,19 @@ data/src/share/vm/utilities/exceptions.hpp.i
data/src/share/vm/code/vtableStubs.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp.i
data/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp.i
-data/agent/src/os/win32/libInfo.hpp.i
-data/agent/test/libproc/libproctest.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9WrprInstruction.java.i
-data/src/cpu/x86/vm/templateTable_x86_32.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/LivenessPath.java.i
+data/src/share/vm/ci/ciMethod.cpp.i
+data/src/share/tools/IdealGraphVisualizer/ControlFlow/nbproject/genfiles.properties.i
+data/build/solaris/makefiles/mapfile-vers-nonproduct.i
data/src/share/vm/prims/methodHandleWalk.hpp.i
data/src/share/tools/IdealGraphVisualizer/Settings/nbproject/suite.properties.i
data/src/share/vm/ci/ciConstant.cpp.i
data/src/cpu/zero/vm/vmStructs_zero.hpp.i
+data/agent/src/os/win32/IOBuf.cpp.i
+data/src/os/bsd/vm/os_bsd.cpp.i
data/agent/src/share/classes/com/sun/java/swing/action/BackAction.java.i
data/src/share/vm/oops/klassPS.hpp.i
-data/src/os/windows/vm/jvm_windows.h.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/color.filter.i
data/src/share/vm/ci/ciArray.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/livejvm/JNIHandleAccessor.java.i
data/src/share/vm/gc_implementation/parallelScavenge/asPSOldGen.cpp.i
@@ -3946,41 +4181,53 @@ data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/co
data/src/share/vm/oops/objArrayKlassKlass.cpp.i
data/src/os_cpu/linux_x86/vm/threadLS_linux_x86.cpp.i
data/test/compiler/6855164/Test.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCleanupReader.java.i
data/README.i
-data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtable.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/SSEShiftDecoder.java.i
data/test/runtime/6878713/testcase.jar.i
data/src/share/vm/gc_implementation/g1/concurrentMark.hpp.i
+data/src/share/vm/gc_implementation/shared/mutableSpace.cpp.i
data/src/cpu/sparc/vm/c1_FpuStackSim_sparc.cpp.i
+data/make/bsd/makefiles/tiered.make.i
+data/src/cpu/x86/vm/templateTable_x86_64.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrivilegedRegisters.java.i
-data/make/windows/create.bat.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/LongHashMap.java.i
+data/src/os_cpu/solaris_x86/vm/assembler_solaris_x86.cpp.i
data/agent/make/grantAll.policy.i
data/test/compiler/6646019/Test.java.i
+data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.i
+data/src/os_cpu/bsd_x86/vm/bsd_x86_32.s.i
data/src/share/tools/MakeDeps/ArgsParser.java.i
data/src/share/vm/oops/cpCacheOop.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/types/OopField.java.i
+data/src/cpu/sparc/vm/templateTable_sparc.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java.i
data/src/share/vm/opto/rootnode.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaThreadFactory.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCV9PrefetchInstruction.java.i
data/agent/make/dumpflagsproc.sh.i
-data/build/solaris/makefiles/reorder_TIERED_sparc.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteThreadFactory.java.i
-data/src/share/vm/gc_implementation/shared/gcPolicyCounters.hpp.i
-data/agent/make/jcoreproc64.sh.i
+data/agent/src/share/classes/sun/jvm/hotspot/opto/Phase.java.i
+data/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp.i
+data/src/share/vm/utilities/numberSeq.cpp.i
+data/src/share/vm/memory/barrierSet.hpp.i
+data/src/share/vm/Xusage.txt.i
data/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp.i
data/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp.i
-data/src/share/vm/runtime/sweeper.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86RotateInstruction.java.i
-data/src/share/vm/oops/klassOop.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/ObjectHistogram.java.i
+data/src/share/vm/opto/mulnode.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java.i
+data/src/share/vm/opto/classes.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9BranchDecoder.java.i
data/src/share/vm/shark/sharkStateScanner.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/MemoryInstructionDecoder.java.i
+data/src/share/tools/MakeDeps/DirectoryTree.java.i
data/src/share/vm/interpreter/interpreter.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java.i
+data/src/os/bsd/vm/interfaceSupport_bsd.hpp.i
data/src/share/vm/runtime/java.hpp.i
data/make/test/Queens.java.i
data/src/share/vm/services/dtraceAttacher.hpp.i
data/src/share/tools/IdealGraphVisualizer/NetworkConnection/src/com/sun/hotspot/igv/connection/layer.xml.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java.i
+data/src/share/tools/IdealGraphVisualizer/Filter/build.xml.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/MouseOverAction.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ZoomOutAction.java.i
data/src/share/vm/ci/ciConstant.hpp.i
@@ -3990,44 +4237,49 @@ data/src/os/linux/vm/objectMonitor_linux.hpp.i
data/src/share/vm/prims/methodHandleWalk.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/runtime/ResultTypeFinder.java.i
data/src/share/vm/runtime/perfData.hpp.i
-data/agent/src/share/classes/images/toolbarButtonGraphics/general/About24.gif.i
+data/src/share/vm/runtime/globals.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/ui/tree/CharTreeNodeAdapter.java.i
data/src/share/vm/oops/arrayOop.hpp.i
+data/test/compiler/7070134/words.d
data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/FPLoadDecoder.java.i
data/make/solaris/makefiles/compiler1.make.i
data/src/share/vm/code/dependencies.hpp.i
+data/make/bsd/makefiles/product.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java.i
+data/src/share/vm/utilities/vmError.hpp.i
data/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/tools/Tool.java.i
+data/src/share/vm/memory/heapInspection.cpp.i
data/src/cpu/zero/vm/templateInterpreter_zero.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/MachineDescriptionIA64.java.i
-data/src/share/tools/IdealGraphVisualizer/BatikSVGProxy/manifest.mf.i
-data/src/cpu/sparc/vm/jni_sparc.h.i
+data/src/share/tools/LogCompilation/README.i
+data/src/share/vm/memory/collectorPolicy.hpp.i
+data/src/share/vm/opto/runtime.cpp.i
data/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.hpp.i
-data/src/share/vm/runtime/threadCritical.hpp.i
+data/src/share/tools/IdealGraphVisualizer/ServerCompiler/src/com/sun/hotspot/igv/servercompiler/filters/linestyle.filter.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/images/up.gif.i
-data/build/linux/makefiles/optimized.make.i
+data/src/share/vm/memory/threadLocalAllocBuffer.inline.hpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java.i
data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/images/prev_diagram.png.i
data/src/share/vm/classfile/stackMapTable.hpp.i
-data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java.i
data/src/share/vm/oops/arrayKlassKlass.cpp.i
data/src/share/vm/runtime/thread.cpp.i
data/build/windows/projectfiles/tiered/vm.def.i
data/agent/src/share/classes/com/sun/java/swing/ui/CommonMenuBar.java.i
data/src/os_cpu/solaris_x86/vm/globals_solaris_x86.hpp.i
-data/make/hotspot_distro.i
+data/src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp.i
data/src/share/tools/IdealGraphVisualizer/HierarchicalLayout/src/com/sun/hotspot/igv/hierarchicallayout/HierarchicalClusterLayoutManager.java.i
-data/build/solaris/platform_i486.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/NextDiagramAction.java.i
data/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp.i
data/test/compiler/6772683/InterruptedTest.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCInstructionFactoryImpl.java.i
+data/make/linux/makefiles/saproc.make.i
data/src/share/vm/memory/generation.inline.hpp.i
-data/src/cpu/sparc/vm/dump_sparc.cpp.i
+data/src/share/vm/ci/ciCPCache.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/SALauncherLoader.java.i
-data/src/share/vm/gc_interface/collectedHeap.cpp.i
+data/test/compiler/6714694/Tester.java.i
data/src/share/vm/opto/idealKit.hpp.i
data/src/share/vm/memory/resourceArea.cpp.i
data/src/share/vm/ci/ciNullObject.cpp.i
-data/src/share/vm/prims/jvmtiEnvThreadState.cpp.i
+data/src/share/vm/prims/unsafe.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicCIntegerType.java.i
data/build/windows/makefiles/makedeps.make.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/HeapProgressThunk.java.i
@@ -4035,78 +4287,66 @@ data/src/share/vm/asm/register.cpp.i
data/src/cpu/x86/vm/frame_x86.inline.hpp.i
data/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Compilation.java.i
data/src/share/vm/ci/ciSymbolKlass.hpp.i
-data/make/windows/makefiles/launcher.make.i
+data/src/os_cpu/linux_zero/vm/bytes_linux_zero.inline.hpp.i
+data/agent/make/heapsumproc.sh.i
data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/FilterTopComponentSettings.xml.i
data/src/share/vm/interpreter/rewriter.hpp.i
data/src/cpu/x86/vm/c1_globals_x86.hpp.i
-data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java.i
data/src/share/tools/IdealGraphVisualizer/Data/nbproject/platform.properties.i
-data/src/share/tools/IdealGraphVisualizer/View/src/META-INF/services/com.sun.hotspot.igv.data.services.GraphViewer.i
-data/src/share/tools/IdealGraphVisualizer/Util/nbproject/build-impl.xml.i
+data/src/share/vm/opto/generateOptoStub.cpp.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/images/structured.gif.i
data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/actions/ImportAction.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/gc_implementation/parallelScavenge/PSYoungGen.java.i
+data/agent/test/jdi/VMConnection.java.i
data/test/compiler/6910484/Test.java.i
+data/make/bsd/README.i
data/make/windows/makefiles/compile.make.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/AlternateSpaceLdstubDecoder.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/jdi/ThreadReferenceImpl.java.i
+data/src/share/vm/shark/sharkInliner.cpp.i
+data/src/cpu/sparc/vm/interp_masm_sparc.cpp.i
data/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp.i
-data/src/share/vm/gc_implementation/includeDB_gc_concurrentMarkSweep.i
+data/src/share/vm/opto/classes.cpp.i
data/src/cpu/x86/vm/interpreterRT_x86_64.cpp.i
-data/src/share/tools/IdealGraphVisualizer/FilterWindow/src/com/sun/hotspot/igv/filterwindow/actions/NewFilterAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/AuxSymbolRecord.java.i
data/src/share/vm/runtime/stubCodeGenerator.hpp.i
data/test/compiler/6833129/Test.java.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32LDTEntry.java.i
+data/agent/src/share/classes/sun/jvm/hotspot/code/SingletonBlob.java.i
+data/test/runtime/6929067/Test6929067.sh.i
data/src/share/vm/runtime/unhandledOops.cpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/COFFException.java.i
+data/src/share/vm/oops/objArrayKlassKlass.hpp.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/V9PopcDecoder.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaObjArrayKlass.java.i
-data/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentGCThread.hpp.i
+data/test/runtime/6626217/many_loader2.java.foo.i
data/src/share/tools/ProjectCreator/WinGammaPlatformVC6.java.i
-data/build/solaris/makefiles/mapfile-vers-nonproduct.i
-data/agent/src/os/win32/IOBuf.cpp.i
+data/src/cpu/x86/vm/templateTable_x86_32.cpp.i
+data/src/share/tools/MakeDeps/WinGammaPlatformVC9.java.i
data/src/share/vm/opto/subnode.hpp.i
data/make/windows/makefiles/generated.make.i
-data/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp.i
+data/agent/src/share/classes/sun/jvm/hotspot/utilities/BasicHashtableEntry.java.i
+data/src/share/vm/gc_implementation/shared/collectorCounters.hpp.i
data/agent/src/os/win32/Reaper.cpp.i
data/src/share/vm/gc_implementation/parallelScavenge/psYoungGen.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SpecialStoreDecoder.java.i
-data/src/cpu/zero/vm/interp_masm_zero.cpp.i
+data/src/share/vm/libadt/set.hpp.i
+data/test/compiler/5091921/Test6890943.sh.i
data/agent/make/jsdbproc64.sh.i
data/src/share/vm/oops/klass.cpp.i
data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/coff/DebugVC50MemberAttributes.java.i
data/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeIinc.java.i
data/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp.i
-data/agent/src/share/classes/com/sun/java/swing/action/HelpMenu.java.i
-data/src/share/vm/opto/block.hpp.i
+data/src/cpu/sparc/vm/jni_sparc.h.i
+data/agent/src/share/classes/sun/jvm/hotspot/debugger/dummy/DummyDebugger.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaInstanceKlass.java.i
-data/agent/make/soqlwindbg.bat.i
+data/src/share/tools/IdealGraphVisualizer/View/src/com/sun/hotspot/igv/view/actions/ExtractAction.java.i
data/agent/src/share/classes/sun/jvm/hotspot/asm/sparc/SPARCWriteInstruction.java.i
data/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp.i
data/src/share/vm/gc_implementation/parallelScavenge/prefetchQueue.hpp.i
-data/agent/make/heapsumproc.sh.i
-data/agent/src/share/classes/sun/jvm/hotspot/runtime/linux/LinuxSignals.java.i
+data/src/share/tools/IdealGraphVisualizer/Coordinator/src/com/sun/hotspot/igv/coordinator/FolderNode.java.i
+data/src/share/tools/IdealGraphVisualizer/Layout/src/com/sun/hotspot/igv/layout/Cluster.java.i
data/agent/src/share/classes/sun/jvm/hotspot/utilities/memo/MemoizedBoolean.java.i
-data/src/cpu/sparc/vm/nativeInst_sparc.hpp.i
+data/src/share/vm/runtime/threadCritical.hpp.i
data/src/share/vm/runtime/monitorChunk.hpp.i
-data/build/windows/projectfiles/tiered/ADLCompiler.dsp.i
+data/make/solaris/makefiles/adlc.make.i
data/build/solaris/makefiles/mapfile-vers-jsig.i
data/src/os_cpu/solaris_x86/vm/threadLS_solaris_x86.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/debugger/win32/Win32ThreadContext.java.i
+data/agent/make/soqlwindbg.bat.i
data/src/share/vm/utilities/numberSeq.hpp.i
-data/agent/src/share/classes/sun/jvm/hotspot/asm/x86/X86MoveLoadInstruction.java.i
-data/src/cpu/sparc/vm/methodHandles_sparc.hpp.i
-data/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp.i
-data/src/share/vm/gc_implementation/g1/g1HRPrinter.cpp.i
-data/src/share/vm/gc_implementation/g1/g1HRPrinter.hpp.i
-data/src/share/vm/utilities/quickSort.cpp.i
-data/src/share/vm/utilities/quickSort.hpp.i
-data/test/compiler/6478991/NullCheckTest.java.i
-data/test/compiler/6956668/Test6956668.java.i
-data/test/compiler/6990212/Test6990212.java.i
-data/test/compiler/7044738/Test7044738.java.i
-data/test/compiler/7046096/Test7046096.java.i
-data/test/compiler/7047069/Test7047069.java.i
-data/test/compiler/7048332/Test7048332.java.i
-data/test/compiler/7052494/Test7052494.java.i
-data/test/gc/6941923/test6941923.sh.i
+data/src/share/vm/gc_implementation/shared/spaceDecorator.hpp.i
diff --git a/hotspot/.hg/store/undo b/hotspot/.hg/store/undo
index 4cc67b3..718c907 100644
Binary files a/hotspot/.hg/store/undo and b/hotspot/.hg/store/undo differ
diff --git a/jdk/.hg/undo.bookmarks b/hotspot/.hg/undo.bookmarks
similarity index 100%
copy from jdk/.hg/undo.bookmarks
copy to hotspot/.hg/undo.bookmarks
diff --git a/hotspot/.hg/undo.desc b/hotspot/.hg/undo.desc
index 499e4e4..9db92fd 100644
--- a/hotspot/.hg/undo.desc
+++ b/hotspot/.hg/undo.desc
@@ -1,3 +1,3 @@
-2619
+2621
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/hotspot
diff --git a/hotspot/.hg/undo.dirstate b/hotspot/.hg/undo.dirstate
index 3f2517a..556ad91 100644
Binary files a/hotspot/.hg/undo.dirstate and b/hotspot/.hg/undo.dirstate differ
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index 7364a6b..d39a5b8 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -183,3 +183,17 @@ c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
fe189d4a44e9e8f0c7d78fcbd1c63701745752ca jdk7-b144
0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
+31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02
+3a2fb61165dfc72e398179a2796d740c8da5b8c0 jdk8-b03
+0fa3ace511fe98fe948e751531f3e2b7c60c8376 jdk8-b04
+dce7d24674f4d0bed00de24f00119057fdce7cfb jdk8-b05
+0db80d8e77fccddf5e6fa49963226b54ac7d0f62 jdk8-b06
+3f0cf875af83f55ec5e1a5cea80455315f9322a2 jdk8-b07
+3a2fb61165dfc72e6de2adab1f2649a408f5e577 hs22-b01
+7c29742c41b44fb0cd5a13c7ac8834f3f2ca649e hs22-b02
+3a2fb61165dfc72e398179a2796d740c8da5b8c0 hs22-b03
+ce9bde819dcba4a5d2822229d9183e69c74326ca hs22-b04
+513a84dd0f8b56dc0836b4e0bdd5dd0a778fc634 hs22-b05
+650d15d8f37255d3b805aa00c5bd1c30984b203d hs22-b06
+da883b9e6d3788057f9577e72712998ed82c9b7e hs23-b01
+49ed7eacfd16616166ff066493143889741097af jdk8-b08
diff --git a/hotspot/THIRD_PARTY_README b/hotspot/THIRD_PARTY_README
index db47234..ee5463a 100644
--- a/hotspot/THIRD_PARTY_README
+++ b/hotspot/THIRD_PARTY_README
@@ -1,38 +1,12 @@
DO NOT TRANSLATE OR LOCALIZE.
+-----------------------------
-%% This notice is provided with respect to Thai dictionary for text breaking, which may be included with this software:
+%% This notice is provided with respect to ASM Bytecode Manipulation
+Framework v3.1, which is included with JRE 7, JDK 7, and OpenJDK 7.
---- begin of LICENSE file ---
+--- begin of LICENSE ---
-Copyright (C) 1982 The Royal Institute, Thai Royal Government.
-
-Copyright (C) 1998 National Electronics and Computer Technology Center,
- National Science and Technology Development Agency,
- Ministry of Science Technology and Environment,
- Thai Royal Government.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without
-limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to
-whom the Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---- end of LICENSE file ---
-%% This notice is provided with respect to ASM, which may be included with this software:
-Copyright (c) 2000-2007 INRIA, France Telecom
+Copyright (c) 2000-2005 INRIA, France Telecom
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -61,655 +35,1024 @@ 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.
-%% This notice is provided with respect to zlib 1.1.3, which may be included with this software:
-Acknowledgments:
+--- end of LICENSE ---
- The deflate format used by zlib was defined by Phil Katz. The deflate
- and zlib specifications were written by L. Peter Deutsch. Thanks to all the
- people who reported problems and suggested various improvements in zlib;
- they are too numerous to cite here.
+--------------------------------------------------------------------------------
-Copyright notice:
+%% This notice is provided with respect to CodeViewer 1.0, which is included
+with JDK 7.
- (C) 1995-1998 Jean-loup Gailly and Mark Adler
+--- begin of LICENSE ---
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
+Copyright 1999 by CoolServlets.com.
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it
- freely, subject to the following restrictions:
+Any errors or suggested improvements to this class can be reported as
+instructed on CoolServlets.com. We hope you enjoy this program... your
+comments will encourage further development! This software is distributed
+under the terms of the BSD License. Redistribution and use in source and
+binary forms, with or without modification, are permitted provided that the
+following conditions are met:
- 1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
- Jean-loup Gailly Mark Adler
- jloup at gzip.org madler at alumni.caltech.edu
+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.
-If you use the zlib library in a product, we would appreciate *not*
-receiving lengthy legal documents to sign. The sources are provided
-for free but without warranty of any kind. The library has been
-entirely written by Jean-loup Gailly and Mark Adler; it does not
-include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include
-in the file ChangeLog history information documenting your changes.
-
-%% This notice is provided with respect to W3C (DTD for XML Signatures), which may be included with this software:
-W3C® SOFTWARE NOTICE AND LICENSE
-Copyright © 1994-2002 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/
-This W3C work (including software, documents, or other related items) is being provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
-1.The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-2.Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © [$date-of-software] World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/"
-3.Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-____________________________________
-This formulation of W3C's notice and license became active on August 14 1998 so as to improve compatibility with GPL. This version ensures that W3C software licensing terms are no more restrictive than GPL and consequently W3C software may be distributed in GPL packages. See the older formulation for the policy prior to this date. Please see our Copyright FAQ for common questions about using materials from our site, including specific terms and conditions for packages like libwww, Amaya, and Jigsaw. Other questions about this notice can be directed to site-policy at w3.org.
-
-%% This notice is provided with respect to jscheme.jar, which may be included with this software:
-Software License Agreement
-Copyright © 1998-2002 by Peter Norvig.
-Permission is granted to anyone to use this software, in source or object code form, on any computer system, and to modify, compile, decompile, run, and redistribute it to anyone else, subject to the following restrictions:
-1.The author makes no warranty of any kind, either expressed or implied, about the suitability of this software for any purpose.
-2.The author accepts no liability of any kind for damages or other consequences of the use of this software, even if they arise from defects in the software.
-3.The origin of this software must not be misrepresented, either by explicit claim or by omission.
-4.Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. Altered versions may be distributed in packages under other licenses (such as the GNU license).
-If you find this software useful, it would be nice if you let me (peter at norvig.com) know about it, and nicer still if you send me modifications that you are willing to share. However, you are not required to do so.
-
-
-%% This notice is provided with respect to PC/SC Lite for Suse Linux v. 1.1.1, which may be included with this software:
-
-Copyright (c) 1999-2004 David Corcoran
-All rights reserved.
+Neither name of CoolServlets.com nor the names of its contributors may be
+used to endorse or promote products derived from this software without
+specific prior written permission.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+THIS SOFTWARE IS PROVIDED BY COOLSERVLETS.COM 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 AUTHOR 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."
-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. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-Changes to this license can be made only by the copyright author with
-explicit written consent.
+--- end of LICENSE ---
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+-------------------------------------------------------------------------------
+%% This notice is provided with respect to Cryptix AES 3.2.0, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
-%% This notice is provided with respect to IAIK PKCS Wrapper, which may be included with this software:
+--- begin of LICENSE ---
-Copyright (c) 2002 Graz University of Technology. All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,are permitted provided that the following conditions are met:
+Cryptix General License
+Copyright (c) 1995-2005 The Cryptix Foundation Limited.
+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 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.
+
+THIS SOFTWARE IS PROVIDED BY THE CRYPTIX FOUNDATION LIMITED 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 CRYPTIX FOUNDATION LIMITED 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.
+
+--- end of LICENSE ---
-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.
+%% This notice is provided with respect to CUP Parser Generator for
+Java 0.10k, which is included with JRE 7, JDK 7, and OpenJDK 7.
-3. The end-user documentation included with the redistribution, if any, must include the following acknowledgment:
+--- begin of LICENSE ---
- "This product includes software developed by IAIK of Graz University of Technology."
+Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
- Alternately, this acknowledgment may appear in the software itself, if and wherever such third-party acknowledgments normally appear.
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted, provided
+that the above copyright notice appear in all copies and that both the
+copyright notice and this permission notice and warranty disclaimer appear in
+supporting documentation, and that the names of the authors or their
+employers not be used in advertising or publicity pertaining to distribution of
+the software without specific, written prior permission.
-4. The names "Graz University of Technology" and "IAIK of Graz University of Technology" must not be used to endorse or promote products derived from this software without prior written permission.
+The authors and their employers disclaim all warranties with regard to
+this software, including all implied warranties of merchantability and fitness.
+In no event shall the authors or their employers be liable for any special,
+indirect or consequential damages or any damages whatsoever resulting from
+loss of use, data or profits, whether in an action of contract, negligence or
+other tortious action, arising out of or in connection with the use or
+performance of this software.
-5. Products derived from this software may not be called "IAIK PKCS Wrapper", nor may "IAIK" appear in their name, without prior written permission of Graz University of Technology.
+--- end of LICENSE ---
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 LICENSOR 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.
+-------------------------------------------------------------------------------
-%% This notice is provided with respect to Document Object Model (DOM) v. Level 3, which may be included with this software:
+%% This notice is provided with respect to Document Object Model (DOM) Level 2
+& 3, which is included with JRE 7, JDK 7, and OpenJDK 7.
-W3Cýý SOFTWARE NOTICE AND LICENSE
+--- begin of LICENSE ---
+
+W3C SOFTWARE NOTICE AND LICENSE
http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
-This work (and included software, documentation such as READMEs, or other related items) is being
-provided by the copyright holders under the following license. By obtaining, using and/or copying this work, you
-(the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-Permission to copy, modify, and distribute this software and its documentation, with or without modification, for
-any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies
-of the software and documentation or portions thereof, including modifications:
- 1.The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
- 2.Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the
- W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body
- of any redistributed or derivative code.
- 3.Notice of any changes or modifications to the files, including the date changes were made. (We
- recommend you provide URIs to the location from which the code is derived.)
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKENO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO,
-WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THEUSE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL ORCONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the
-software without specific, written prior permission. Title to copyright in this software and any associated
-documentation will at all times remain with copyright holders.
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee)
+agree that you have read, understood, and will comply with the following terms
+and conditions.
+
+Permission to copy, modify, and distribute this software and its
+documentation, with or without modification, for any purpose and without fee
+or royalty is hereby granted, provided that you include the following on ALL
+copies of the software and documentation or portions thereof, including
+modifications:
+
+ 1.The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+
+ 2.Any pre-existing intellectual property disclaimers, notices, or terms and
+ conditions. If none exist, the W3C Software Short Notice should be included
+ (hypertext is preferred, text is permitted) within the body of any
+ redistributed or derivative code.
+
+ 3.Notice of any changes or modifications to the files, including the date
+ changes were made. (We recommend you provide URIs to the location from
+ which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS
+MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR
+PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY
+THIRD PARTY PATENTS,COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL
+OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR
+DOCUMENTATION. The name and trademarks of copyright holders may NOT be used
+in advertising or publicity pertaining to the software without specific,
+written prior permission. Title to copyright in this software and any
+associated documentation will at all times remain with copyright holders.
____________________________________
-This formulation of W3C's notice and license became active on December 31 2002. This version removes the
-copyright ownership notice such that this license can be used with materials other than those owned by the
-W3C, reflects that ERCIM is now a host of the W3C, includes references to this specific dated version of the
-license, and removes the ambiguous grant of "use". Otherwise, this version is the same as the previous
-version and is written so as to preserve the Free Software Foundation's assessment of GPL compatibility and
-OSI's certification under the Open Source Definition. Please see our Copyright FAQ for common questions
-about using materials from our site, including specific terms and conditions for packages like libwww, Amaya,
-and Jigsaw. Other questions about this notice can be directed to
+This formulation of W3C's notice and license became active on December 31
+2002. This version removes the copyright ownership notice such that this
+license can be used with materials other than those owned by the W3C, reflects
+that ERCIM is now a host of the W3C, includes references to this specific
+dated version of the license, and removes the ambiguous grant of "use".
+Otherwise, this version is the same as the previous version and is written so
+as to preserve the Free Software Foundation's assessment of GPL compatibility
+and OSI's certification under the Open Source Definition. Please see our
+Copyright FAQ for common questions about using materials from our site,
+including specific terms and conditions for packages like libwww, Amaya, and
+Jigsaw. Other questions about this notice can be directed to
site-policy at w3.org.
-%% This notice is provided with respect to Xalan, Xerces, which may be included with this software:
-
-/*
- * The Apache Software License, Version 1.1
- *
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache at apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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.
- * ==================================================================== *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation and was
- * originally based on software copyright (c) 1999, International
- * Business Machines, Inc., http://www.ibm.com. For more
- * information on the Apache Software Foundation, please see
- *
-
-%% This notice is provided with respect to JavaScript, which may be included with this software:
-
-AMENDMENTS
-The Netscape Public License Version 1.1 ("NPL") consists of the Mozilla Public License Version 1.1 with the following Amendments, including Exhibit A-Netscape Public License. Files identified with "Exhibit A-Netscape Public License" are governed by the Netscape Public License Version 1.1.
-Additional Terms applicable to the Netscape Public License.
-I. Effect.
-These additional terms described in this Netscape Public License -- Amendments shall apply to the Mozilla Communicator client code and to all Covered Code under this License.
-II. ''Netscape's Branded Code'' means Covered Code that Netscape distributes and/or permits others to distribute under one or more trademark(s) which are controlled by Netscape but which are not licensed for use under this License.
-III. Netscape and logo.
-This License does not grant any rights to use the trademarks "Netscape'', the "Netscape N and horizon'' logo or the "Netscape lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript", "Smart Browsing" even if such marks are included in the Original Code or Modifications.
-IV. Inability to Comply Due to Contractual Obligation.
-Prior to licensing the Original Code under this License, Netscape has licensed third party code for use in Netscape's Branded Code. To the extent that Netscape is limited contractually from making such third party code available under this License, Netscape may choose to reintegrate such code into Covered Code without being required to distribute such code in Source Code form, even if such code would otherwise be considered ''Modifications'' under this License.
-V. Use of Modifications and Covered Code by Initial Developer.
-V.1. In General.
-The obligations of Section 3 apply to Netscape, except to the extent specified in this Amendment, Section V.2 and V.3.
-V.2. Other Products.
-Netscape may include Covered Code in products other than the Netscape's Branded Code which are released by Netscape during the two (2) years following the release date of the Original Code, without such additional products becoming subject to the terms of this License, and may license such additional products on different terms from those contained in this License.
-V.3. Alternative Licensing.
-Netscape may license the Source Code of Netscape's Branded Code, including Modifications incorporated therein, without such Netscape Branded Code becoming subject to the terms of this License, and may license such Netscape Branded Code on different terms from those contained in this License.
-
-VI. Litigation.
-Notwithstanding the limitations of Section 11 above, the provisions regarding litigation in Section 11(a), (b) and (c) of the License shall apply to all disputes relating to this License.
-
-EXHIBIT A-Netscape Public License.
-
-''The contents of this file are subject to the Netscape Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.mozilla.org/NPL/
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-The Original Code is Mozilla Communicator client code, released March 31, 1998.
-The Initial Developer of the Original Code is Netscape Communications Corporation. Portions created by Netscape are Copyright (C) 1998-1999 Netscape Communications Corporation. All Rights Reserved.
-Contributor(s): ______________________________________.
-
-Alternatively, the contents of this file may be used under the terms of the _____ license (the "[___] License"), in which case the provisions of [______] License are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the NPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the [___] License. If you do not delete the provisions above, a recipient may use your version of this file under either the NPL or the [___] License."
-
-MOZILLA PUBLIC LICENSE
-Version 1.1
-
-1. Definitions.
-1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party.
-1.1. ''Contributor'' means each entity that creates or contributes to the creation of Modifications.
-1.2. ''Contributor Version'' means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-1.3. ''Covered Code'' means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-1.4. ''Electronic Distribution Mechanism'' means a mechanism generally accepted in the software development community for the electronic transfer of data.
-1.5. ''Executable'' means Covered Code in any form other than Source Code.
-1.6. ''Initial Developer'' means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-1.7. ''Larger Work'' means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-1.8. ''License'' means this document.
-1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-1.9. ''Modifications'' means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-B. Any new file that contains any part of the Original Code or previous Modifications.
-
-1.10. ''Original Code'' means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-1.11. ''Source Code'' means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-1.12. "You'' (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You'' includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control'' means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-2. Source Code License.
-2.1. The Initial Developer Grant.
-The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof).
-
-(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License.
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices.
-
-2.2. Contributor Grant.
-Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
-
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-3.1. Application of License.
-The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-3.2. Availability of Source Code.
-Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-3.3. Description of Modifications.
-You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-3.4. Intellectual Property Matters
-(a) Third Party Claims.
-If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL'' which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-(b) Contributor APIs.
-If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
-
- (c) Representations.
-Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
-
-3.5. Required Notices.
-You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-3.6. Distribution of Executable Versions.
-You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-3.7. Larger Works.
-You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-4. Inability to Comply Due to Statute or Regulation.
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5. Application of this License.
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-6. Versions of the License.
-6.1. New Versions.
-Netscape Communications Corporation (''Netscape'') may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-6.2. Effect of New Versions.
-Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by Netscape. No one other than Netscape has the right to modify the terms applicable to Covered Code created under this License.
-6.3. Derivative Works.
-If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases ''Mozilla'', ''MOZILLAPL'', ''MOZPL'', ''Netscape'', "MPL", ''NPL'' or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the Mozilla Public License and Netscape Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-7. DISCLAIMER OF WARRANTY.
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS'' BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-8. TERMINATION.
-8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that:
-(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above.
-(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant.
-8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-9. LIMITATION OF LIABILITY.
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-10. U.S. GOVERNMENT END USERS.
-The Covered Code is a ''commercial item,'' as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of ''commercial computer software'' and ''commercial computer software documentation,'' as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
-11. MISCELLANEOUS.
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
-12. RESPONSIBILITY FOR CLAIMS.
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-13. MULTIPLE-LICENSED CODE.
-Initial Developer may designate portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the NPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF
-ANY KIND, either express or implied. See the License for the specific language governing rights and
-limitations under the License.
-The Original Code is ______________________________________.
-The Initial Developer of the Original Code is ________________________. Portions created by
- ______________________ are Copyright (C) ______ _______________________. All Rights
-Reserved.
-Contributor(s): ______________________________________.
-Alternatively, the contents of this file may be used under the terms of the _____ license (the "[___] License"), in which case the provisions of [______] License are applicable instead of those above. If you wish to allow use of your version of this file only under the terms of the [____] License and not to allow others to use your version of this file under the MPL, indicate your decision by deleting the provisions above and replace them with the notice and other provisions required by the [___] License. If you do not delete the provisions above, a recipient may use your version of this file under either the MPL or the [___] License."
-[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
-
-%% This notice is provided with respect to Mesa 3-D graphics library v. 5, which may be included with this software:
-
-Copyright (c) 2007 The Khronos Group Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and/or associated documentation files (the
-"Materials"), to deal in the Materials without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Materials, and to
-permit persons to whom the Materials are furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Materials.
-
-THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-
-%% This notice is provided with respect to Byte Code Engineering Library (BCEL), which may be included with this software:
-
- Apache Software License
-
- /*
-==================================================================== * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2001 The Apache Software Foundation. Allrights
- * reserved.
- *
- * Redistribution and use in source and binary forms, withor without
- * modification, are permitted provided that the followingconditions
- * are met:
- *
- * 1. Redistributions of source code must retain the abovecopyright
- * notice, this list of conditions and the followingdisclaimer.
- *
- * 2. Redistributions in binary form must reproduce theabove copyright
- * notice, this list of conditions and the followingdisclaimer in
- * the documentation and/or other materials providedwith the
- * distribution.
- *
- * 3. The end-user documentation included with theredistribution,
- * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation
-(http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in thesoftware itself,
- * if and wherever such third-party acknowledgmentsnormally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation"and
- * "Apache BCEL" must not be used to endorse or promoteproducts
- * derived from this software without prior writtenpermission. For
- * written permission, please contact apache at apache.org. *
- * 5. Products derived from this software may not be called"Apache",
- * "Apache BCEL", nor may "Apache" appear in their name,without
- * prior written permission of the Apache SoftwareFoundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED ORIMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIEDWARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSEARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWAREFOUNDATION OR
- * ITS 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) HOWEVERCAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING INANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
- * SUCH DAMAGE.
- *
-==================================================================== *
- * This software consists of voluntary contributions madeby many
- * individuals on behalf of the Apache Software
-Foundation. For more
- * information on the Apache Software Foundation, pleasesee
- * .
- */
-
-%% This notice is provided with respect to Regexp, Regular Expression Package, which may be included with this software:
-
-The Apache Software License, Version 1.1
-Copyright (c) 2001 The Apache Software Foundation. All rights
-reserved.
-Redistribution and use in source and binary forms, with or without modification,are permitted provided that the following conditions are met:
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Elliptic Curve Cryptography, which
+is included with JRE 7, JDK 7, and OpenJDK 7.
+
+You are receiving a copy of the Elliptic Curve Cryptography library in source
+form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7
+runtime.
+
+The terms of the Oracle license do NOT apply to the Elliptic Curve
+Cryptography library program; it is licensed under the following license,
+separately from the Oracle programs you receive. If you do not wish to install
+this program, you may delete the library named libsunec.so (on Solaris and
+Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory
+reserved for native libraries.
+
+--- begin of LICENSE ---
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to FontConfig 2.5, which is
+included with JRE 7, JDK 7, and OpenJDK 7 source distributions on
+Linux and Solaris.
+
+--- begin of LICENSE ---
+
+Copyright © 2001,2003 Keith Packard
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation, and that
+the name of Keith Packard not be used in advertising or publicity pertaining
+to distribution of the software without specific, written prior permission.
+Keith Packard makes no representations about the suitability of this software
+for any purpose. It is provided "as is" without express or implied warranty.
-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. The end-user documentation included with the redistribution,
-if any, must include the following acknowledgment:
-"This product includes software developed by the
-Apache Software Foundation (http://www.apache.org/)."
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Apache" and "Apache Software Foundation" and
-"Apache Turbine" must not be used to endorse or promote products
-derived from this software without prior written permission. For
-written permission, please contact apache at apache.org.
-
-5. Products derived from this software may not be called "Apache",
-"Apache Turbine", nor may "Apache" appear in their name, without
-prior written permission of the Apache Software Foundation.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 APACHE SOFTWARE FOUNDATION OR
-ITS 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.
-
-====================================================================
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation. For more
-information on the Apache Software Foundation, please see
-
-http://www.apache.org.
-
-%% This notice is provided with respect to CUP Parser Generator for Java, which may be included with this software:
-
-CUP Parser Generator Copyright Notice, License, and Disclaimer
-
-Copyright 1996-1999 by Scott Hudson, Frank Flannery, C. Scott Ananian
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided thatthe above copyright notice appear in all copies and that both the copyrightnotice and this permission notice and warranty disclaimer appear in
-supporting documentation, and that the names of the authors or their employersnot be used in advertising or publicity pertaining to distribution of
-the software without specific, written prior permission.
+KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL KEITH
+PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+
+--- end of LICENSE ---
-The authors and their employers disclaim all warranties with regard to thissoftware, including all implied warranties of merchantability and
-fitness. In no event shall the authors or their employers be liable for anyspecial, indirect or consequential damages or any damages whatsoever
-resulting from loss of use, data or profits, whether in an action of contract,negligence or other tortious action, arising out of or in connection withthe use or performance of this software.
+-------------------------------------------------------------------------------
-%% This notice is provided with respect to SAX v. 2.0.1, which may be included with this software:
+%% This notice is provided with respect to IAIK PKCS#11 Wrapper,
+which is included with JRE 7, JDK 7, and OpenJDK 7.
-Copyright Status
+--- begin of LICENSE ---
- SAX is free!
+IAIK PKCS#11 Wrapper License
- In fact, it's not possible to own a license to SAX, since it's been placed in the public
- domain.
+Copyright (c) 2002 Graz University of Technology. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- No Warranty
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
- Because SAX is released to the public domain, there is no warranty for the design or for
- the software implementation, to the extent permitted by applicable law. Except when
- otherwise stated in writing the copyright holders and/or other parties provide SAX "as is"
- without warranty of any kind, either expressed or implied, including, but not limited to, the
- implied warranties of merchantability and fitness for a particular purpose. The entire risk as
- to the quality and performance of SAX is with you. Should SAX prove defective, you
- assume the cost of all necessary servicing, repair or correction.
+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.
- In no event unless required by applicable law or agreed to in writing will any copyright
- holder, or any other party who may modify and/or redistribute SAX, be liable to you for
- damages, including any general, special, incidental or consequential damages arising out of
- the use or inability to use SAX (including but not limited to loss of data or data being
- rendered inaccurate or losses sustained by you or third parties or a failure of the SAX to
- operate with any other programs), even if such holder or other party has been advised of
- the possibility of such damages.
+3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment:
- Copyright Disclaimers
+ "This product includes software developed by IAIK of Graz University of
+ Technology."
- This page includes statements to that effect by David Megginson, who would have been
- able to claim copyright for the original work.
- SAX 1.0
+ Alternately, this acknowledgment may appear in the software itself, if and
+ wherever such third-party acknowledgments normally appear.
- Version 1.0 of the Simple API for XML (SAX), created collectively by the membership of
- the XML-DEV mailing list, is hereby released into the public domain.
+4. The names "Graz University of Technology" and "IAIK of Graz University of
+ Technology" must not be used to endorse or promote products derived from this
+ software without prior written permission.
- No one owns SAX: you may use it freely in both commercial and non-commercial
- applications, bundle it with your software distribution, include it on a CD-ROM, list the
- source code in a book, mirror the documentation at your own web site, or use it in any
- other way you see fit.
+5. Products derived from this software may not be called "IAIK PKCS Wrapper",
+ nor may "IAIK" appear in their name, without prior written permission of
+ Graz University of Technology.
- David Megginson, sax at megginson.com
- 1998-05-11
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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
+LICENSOR 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.
- SAX 2.0
+--- end of LICENSE ---
- I hereby abandon any property rights to SAX 2.0 (the Simple API for XML), and release
- all of the SAX 2.0 source code, compiled code, and documentation contained in this
- distribution into the Public Domain. SAX comes with NO WARRANTY or guarantee of
- fitness for any purpose.
+-------------------------------------------------------------------------------
- David Megginson, david at megginson.com
- 2000-05-05
+%% This notice is provided with respect to ICU4C 4.0.1 and ICU4J 4.4, which
+is included with JRE 7, JDK 7, and OpenJDK 7.
-%% This notice is provided with respect to Cryptix, which may be included with this software:
+--- begin of LICENSE ---
-Cryptix General License
+Copyright (c) 1995-2010 International Business Machines Corporation and others
-Copyright © 1995-2003 The Cryptix Foundation Limited. All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions aremet:
+All rights reserved.
- 1.Redistributions of source code must retain the 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.
-THIS SOFTWARE IS PROVIDED BY THE CRYPTIX FOUNDATION LIMITED AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS ORIMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE CRYPTIX FOUNDATION LIMITED OR CONTRIBUTORS BELIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESSINTERRUPTION) 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 OFTHE POSSIBILITY OF SUCH DAMAGE.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, and/or sell copies of the
+Software, and to permit persons to whom the Software is furnished to do so,
+provided that the above copyright notice(s) and this permission notice appear
+in all copies of the Software and that both the above copyright notice(s) and
+this permission notice appear in supporting documentation.
-%% This notice is provided with respect to X Window System, which may be included with this software:
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE
+LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+All trademarks and registered trademarks mentioned herein are the property of
+their respective owners.
-Copyright The Open Group
+--- end of LICENSE ---
-Permission to use, copy, modify, distribute, and sell this software and itsdocumentation for any purpose is hereby granted without fee, provided that theabove copyright notice appear in all copies and that both that copyright noticeand this permission notice appear in supporting documentation.
+-------------------------------------------------------------------------------
-The above copyright notice and this permission notice shall be included in allcopies or substantial portions of the Software.
+%% This notice is provided with respect to IJG JPEG 6b, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUPBE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OFCONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THESOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--- begin of LICENSE ---
+
+This software is copyright (C) 1991-1998, Thomas G. Lane.
+All Rights Reserved except as specified below.
-Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group.
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to these
+conditions:
+(1) If any part of the source code for this software is distributed, then this
+README file must be included, with this copyright and no-warranty notice
+unaltered; and any additions, deletions, or changes to the original files
+must be clearly indicated in accompanying documentation.
+(2) If only executable code is distributed, then the accompanying
+documentation must state that "this software is based in part on the work of
+the Independent JPEG Group".
+(3) Permission for use of this software is granted only if the user accepts
+full responsibility for any undesirable consequences; the authors accept
+NO LIABILITY for damages of any kind.
-Portions also covered by other licenses as noted in the above URL.
+These conditions apply to any software derived from or based on the IJG code,
+not just to the unmodified library. If you use our work, you ought to
+acknowledge us.
-%% This notice is provided with respect to Retroweaver, which may be included with this software:
+Permission is NOT granted for the use of any IJG author's name or company name
+in advertising or publicity relating to this software or products derived from
+it. This software may be referred to only as "the Independent JPEG Group's
+software".
-Copyright (c) February 2004, Toby Reyelts
-All rights reserved.
+We specifically permit and encourage the use of this software as the basis of
+commercial products, provided that all warranty or liability claims are
+assumed by the product vendor.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+--- end of LICENSE ---
-Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-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.
-Neither the name of Toby Reyelts nor the names of his 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, STRICTLIABILITY,
-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.
+%% This notice is provided with respect to JOpt-Simple v3.0, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
-%% This notice is provided with respect to stripper, which may be included with this software:
+--- begin of LICENSE ---
+
+ Copyright (c) 2004-2009 Paul R. Holser, Jr.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+--- end of LICENSE ---
+
+--------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Kerberos functionality, which
+which is included with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+ (C) Copyright IBM Corp. 1999 All Rights Reserved.
+ Copyright 1997 The Open Group Research Institute. All rights reserved.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Kerberos functionality from
+FundsXpress, INC., which is included with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+ Copyright (C) 1998 by the FundsXpress, INC.
-Stripper : debug information stripper
- Copyright (c) 2003 Kohsuke Kawaguchi
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.
+ Export of this software from the United States of America may require
+ a specific license from the United States Government. It is the
+ responsibility of any person or organization contemplating export to
+ obtain such a license before exporting.
+
+ WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ distribute this software and its documentation for any purpose and
+ without fee is hereby granted, provided that the above copyright
+ notice appear in all copies and that both that copyright notice and
+ this permission notice appear in supporting documentation, and that
+ the name of FundsXpress. not be used in advertising or publicity pertaining
+ to distribution of the software without specific, written prior
+ permission. FundsXpress makes no representations about the suitability of
+ this software for any purpose. It is provided "as is" without express
+ or implied warranty.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- 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.
-%% This notice is provided with respect to libpng official PNG reference library, which may be included with this software:
+--- end of LICENSE ---
-This copy of the libpng notices is provided for your convenience. In case ofany discrepancy between this copy and the notices in the file png.h that isincluded in the libpng distribution, the latter shall prevail.
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Kronos OpenGL headers, which is
+included with JDK 7 and OpenJDK 7 source distributions.
+
+--- begin of LICENSE ---
+
+ Copyright (c) 2007 The Khronos Group Inc.
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and/or associated documentation files (the "Materials"), to
+ deal in the Materials without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Materials, and to permit persons to whom the Materials are
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Materials.
+
+ THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN THE
+ MATERIALS.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% Portions Copyright Eastman Kodak Company 1992
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to libpng 1.2.18, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+This copy of the libpng notices is provided for your convenience. In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
-If you modify libpng you may insert additional notices immediately followingthis sentence.
+If you modify libpng you may insert additional notices immediately following
+this sentence.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are
+Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.2.5
+with the following individual added to the list of Contributing Authors
-libpng version 1.2.6, December 3, 2004, is
-Copyright (c) 2004 Glenn Randers-Pehrson, and is
-distributed according to the same disclaimer and license as libpng-1.2.5with the following individual added to the list of Contributing Authors
Cosmin Truta
-libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, areCopyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6with the following individuals added to the list of Contributing Authors
+libpng versions 1.0.7, July 1, 2000, through 1.2.5 - October 3, 2002, are
+Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-1.0.6
+with the following individuals added to the list of Contributing Authors
+
Simon-Pierre Cadieux
Eric S. Raymond
Gilles Vollant
and with the following additions to the disclaimer:
- There is no warranty against interference with your enjoyment of the library or against infringement. There is no warranty that our
- efforts or the library will fulfill any of your particular purposes or needs. This library is provided with all faults, and the entire risk of satisfactory quality, performance, accuracy, and effort is with the user.
+ There is no warranty against interference with your enjoyment of the
+ library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is with
+ the user.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
+distributed according to the same disclaimer and license as libpng-0.96,
+with the following individuals added to the list of Contributing Authors:
-libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, areCopyright (c) 1998, 1999 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,with the following individuals added to the list of Contributing Authors:
Tom Lane
Glenn Randers-Pehrson
Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are
Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,with the following individuals added to the list of Contributing Authors:
+Distributed according to the same disclaimer and license as libpng-0.88,
+with the following individuals added to the list of Contributing Authors:
+
John Bowler
Kevin Bracey
Sam Bushell
@@ -720,7 +1063,8 @@ Distributed according to the same disclaimer and license as libpng-0.88,with the
libpng versions 0.5, May 1995, through 0.88, January 1996, are
Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
-For the purposes of this copyright and license, "Contributing Authors"is defined as the following set of individuals:
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
Andreas Dilger
Dave Martindale
@@ -728,12 +1072,17 @@ For the purposes of this copyright and license, "Contributing Authors"is defined
Paul Schmidt
Tim Wegner
-The PNG Reference Library is supplied "AS IS". The Contributing Authorsand Group 42, Inc. disclaim all warranties, expressed or implied,
-including, without limitation, the warranties of merchantability and offitness for any purpose. The Contributing Authors and Group 42, Inc.
-assume no liability for direct, indirect, incidental, special, exemplary,or consequential damages, which may result from the use of the PNG
+The PNG Reference Library is supplied "AS IS". The Contributing Authors
+and Group 42, Inc. disclaim all warranties, expressed or implied,
+including, without limitation, the warranties of merchantability and of
+fitness for any purpose. The Contributing Authors and Group 42, Inc.
+assume no liability for direct, indirect, incidental, special, exemplary,
+or consequential damages, which may result from the use of the PNG
Reference Library, even if advised of the possibility of such damage.
-Permission is hereby granted to use, copy, modify, and distribute thissource code, or portions hereof, for any purpose, without fee, subjectto the following restrictions:
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
1. The origin of this source code must not be misrepresented.
@@ -743,306 +1092,1259 @@ Permission is hereby granted to use, copy, modify, and distribute thissource cod
3. This Copyright notice may not be removed or altered from any
source or altered source distribution.
-The Contributing Authors and Group 42, Inc. specifically permit, withoutfee, and encourage the use of this source code as a component to
-supporting the PNG file format in commercial products. If you use thissource code in a product, acknowledgment is not required but would be
+The Contributing Authors and Group 42, Inc. specifically permit, without
+fee, and encourage the use of this source code as a component to
+supporting the PNG file format in commercial products. If you use this
+source code in a product, acknowledgment is not required but would be
appreciated.
-A "png_get_copyright" function is available, for convenient use in "about"boxes and the like:
+A "png_get_copyright" function is available, for convenient use in "about"
+boxes and the like:
printf("%s",png_get_copyright(NULL));
Also, the PNG logo (in PNG format, of course) is supplied in the
files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31).
-Libpng is OSI Certified Open Source Software. OSI Certified Open Source is acertification mark of the Open Source Initiative.
+Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
+certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-December 3, 2004
+May 15, 2007
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to libungif 4.1.3, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
-%% This notice is provided with respect to Libungif - An uncompressed GIF library, which may be included with this software:
+--- begin of LICENSE ---
The GIFLIB distribution is Copyright (c) 1997 Eric S. Raymond
-Permission is hereby granted, free of charge, to any person obtaining a copyof this software and associated documentation files (the "Software"), to dealin the Software without restriction, including without limitation the rightsto use, copy, modify, merge, publish, distribute, sublicense, and/or sellcopies of the Software, and to permit persons to whom the Software is
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included inall copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THEAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHERLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS INTHE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
-%% This notice is provided with respect to XML Resolver library, Xalan J2, and StAX API, which may be included with this software:
+--- end of LICENSE ---
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+-------------------------------------------------------------------------------
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+%% This notice is provided with respect to Little CMS 2.0, which is
+included with OpenJDK 7.
- 1. Definitions.
+--- begin of LICENSE ---
- "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
- "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+Little CMS
+Copyright (c) 1998-2010 Marti Maria Saguer
- "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
- "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
+--- end of LICENSE ---
- "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+-------------------------------------------------------------------------------
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+%% Lucida is a registered trademark or trademark of Bigelow & Holmes in the
+U.S. and other countries.
- 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+-------------------------------------------------------------------------------
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
+%% This notice is provided with respect to Mesa 3D Graphics Library v4.1,
+which is included with JRE 7, JDK 7, and OpenJDK 7 source distributions.
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
+--- begin of LICENSE ---
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
+ Mesa 3-D graphics library
+ Version: 4.1
- (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+ Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
- You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+--- end of LICENSE ---
- 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
+-------------------------------------------------------------------------------
- 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+%% This notice is provided with respect to PC/SC Lite for Suse Linux v.1.1.1,
+which is included with JRE 7, JDK 7, and OpenJDK 7 on Linux and Solaris.
- END OF TERMS AND CONDITIONS
+--- begin of LICENSE ---
- APPENDIX: How to apply the Apache License to your work.
+Copyright (c) 1999-2004 David Corcoran <corcoran at linuxnet.com>
+Copyright (c) 1999-2004 Ludovic Rousseau <ludovic.rousseau (at) free.fr>
+All rights reserved.
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier
- identification within third-party archives.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
- Copyright [yyyy] [name of copyright owner]
+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. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by:
+ David Corcoran <corcoran at linuxnet.com>
+ http://www.linuxnet.com (MUSCLE)
+4. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+Changes to this license can be made only by the copyright author with
+explicit written consent.
- http://www.apache.org/licenses/LICENSE-2.0
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
- Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+--- end of LICENSE ---
-%% Some Portions licensed from IBM are available at:
-http://www.ibm.com/software/globalization/icu/
+-------------------------------------------------------------------------------
-%% This notice is provided with respect to ICU4J, ICU 1.8.1 and later, which may be included with this software:
+%% This notice is provided with respect to Relax NG Object/Parser v.20050510,
+which is included with JRE 7, JDK 7, and OpenJDK 7.
-ICU License - ICU 1.8.1 and later COPYRIGHT AND PERMISSION NOTICE Cop
-yright (c)
-1995-2003 International Business Machines Corporation and others All rightsreserved. Permission is hereby granted, free of charge, to any person obtaininga copy of this software and associated documentation files (the "Software"), todeal in the Software without restriction, including without limitation therights to use, copy, modify, merge, publish, distribute, and/or sell copies ofthe Software, and to permit persons to whom the Software is furnished to do so,provided that the above copyright notice(s) and this permission notice appear inall copies of the Software and that both the above copyright notice(s) and thispermission notice appear in supporting documentation. THE SOFTWARE IS PROVIDED"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOTLIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSEAND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHTHOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY C
- LAIM, OR ANYSPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTINGFROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCEOR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE ORPERFORMANCE OF THIS SOFTWARE. Except as contained in this notice, the name of acopyright holder shall not be used in advertising or otherwise to promote thesale, use or other dealings in this Software without prior written authorizationof the copyright holder.
+--- begin of LICENSE ---
-%% This notice is provided with respect to Jing, which may be included with this software:
+Copyright (c) Kohsuke Kawaguchi
-Jing Copying Conditions
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions: The above copyright
+notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
-Copyright (c) 2001-2003 Thai Open Source Software Center Ltd
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to RelaxNGCC v1.12, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+Copyright (c) 2000-2003 Daisuke Okajima and Kohsuke Kawaguchi.
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,are permitted provided that the following conditions are met:
+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.
- * Redistributions of source code must retain the above copyright notice,this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,this list of conditions and the following disclaimer in the documentation and/orother materials provided with the distribution.
- * Neither the name of the Thai Open Source Software Center Ltd nor the namesof its contributors may be used to endorse or promote products derived from thissoftware without specific prior written permission.
+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.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ANDANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIEDWARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AREDISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANYDIRECT, 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 ONANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THISSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment:
-%% This notice is provided with respect to RELAX NG Object Model/Parser, which may be included with this software:
+ "This product includes software developed by Daisuke Okajima
+ and Kohsuke Kawaguchi (http://relaxngcc.sf.net/)."
+Alternately, this acknowledgment may appear in the software itself, if and
+wherever such third-party acknowledgments normally appear.
-The MIT License
+4. The names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission. For
+ written permission, please contact the copyright holders.
-Copyright (c)
+5. Products derived from this software may not be called "RELAXNGCC", nor may
+ "RELAXNGCC" appear in their name, without prior written permission of the
+ copyright holders.
-Permission is hereby granted, free of charge, to any person obtaining a copy ofthis software and associated documentation files (the "Software"), to deal inthe Software without restriction, including without limitation the rights touse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies ofthe Software, and to permit persons to whom the Software is furnished to do so,subject to the following conditions:
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED 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 APACHE
+SOFTWARE FOUNDATION OR ITS 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.
+
+--- end of LICENSE ---
-The above copyright notice and this permission notice shall be included in allcopies or substantial portions of the Software.
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Mozilla Rhino v1.7R3, which
+is included with JRE 7, JDK 7, and OpenJDK 7
+
+--- begin of LICENSE ---
+
+ MOZILLA PUBLIC LICENSE
+ Version 1.1
+
+ ---------------
+
+1. Definitions.
+
+ 1.0.1. "Commercial Use" means distribution or otherwise making the
+ Covered Code available to a third party.
+
+ 1.1. "Contributor" means each entity that creates or contributes to
+ the creation of Modifications.
+
+ 1.2. "Contributor Version" means the combination of the Original
+ Code, prior Modifications used by a Contributor, and the Modifications
+ made by that particular Contributor.
+
+ 1.3. "Covered Code" means the Original Code or Modifications or the
+ combination of the Original Code and Modifications, in each case
+ including portions thereof.
+
+ 1.4. "Electronic Distribution Mechanism" means a mechanism generally
+ accepted in the software development community for the electronic
+ transfer of data.
+
+ 1.5. "Executable" means Covered Code in any form other than Source
+ Code.
+
+ 1.6. "Initial Developer" means the individual or entity identified
+ as the Initial Developer in the Source Code notice required by Exhibit
+ A.
+
+ 1.7. "Larger Work" means a work which combines Covered Code or
+ portions thereof with code not governed by the terms of this License.
+
+ 1.8. "License" means this document.
+
+ 1.8.1. "Licensable" means having the right to grant, to the maximum
+ extent possible, whether at the time of the initial grant or
+ subsequently acquired, any and all of the rights conveyed herein.
+
+ 1.9. "Modifications" means any addition to or deletion from the
+ substance or structure of either the Original Code or any previous
+ Modifications. When Covered Code is released as a series of files, a
+ Modification is:
+ A. Any addition to or deletion from the contents of a file
+ containing Original Code or previous Modifications.
+
+ B. Any new file that contains any part of the Original Code or
+ previous Modifications.
+
+ 1.10. "Original Code" means Source Code of computer software code
+ which is described in the Source Code notice required by Exhibit A as
+ Original Code, and which, at the time of its release under this
+ License is not already Covered Code governed by this License.
+
+ 1.10.1. "Patent Claims" means any patent claim(s), now owned or
+ hereafter acquired, including without limitation, method, process,
+ and apparatus claims, in any patent Licensable by grantor.
+
+ 1.11. "Source Code" means the preferred form of the Covered Code for
+ making modifications to it, including all modules it contains, plus
+ any associated interface definition files, scripts used to control
+ compilation and installation of an Executable, or source code
+ differential comparisons against either the Original Code or another
+ well known, available Covered Code of the Contributor's choice. The
+ Source Code can be in a compressed or archival form, provided the
+ appropriate decompression or de-archiving software is widely available
+ for no charge.
+
+ 1.12. "You" (or "Your") means an individual or a legal entity
+ exercising rights under, and complying with all of the terms of, this
+ License or a future version of this License issued under Section 6.1.
+ For legal entities, "You" includes any entity which controls, is
+ controlled by, or is under common control with You. For purposes of
+ this definition, "control" means (a) the power, direct or indirect,
+ to cause the direction or management of such entity, whether by
+ contract or otherwise, or (b) ownership of more than fifty percent
+ (50%) of the outstanding shares or beneficial ownership of such
+ entity.
+
+2. Source Code License.
+
+ 2.1. The Initial Developer Grant.
+ The Initial Developer hereby grants You a world-wide, royalty-free,
+ non-exclusive license, subject to third party intellectual property
+ claims:
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Initial Developer to use, reproduce,
+ modify, display, perform, sublicense and distribute the Original
+ Code (or portions thereof) with or without Modifications, and/or
+ as part of a Larger Work; and
+
+ (b) under Patents Claims infringed by the making, using or
+ selling of Original Code, to make, have made, use, practice,
+ sell, and offer for sale, and/or otherwise dispose of the
+ Original Code (or portions thereof).
+
+ (c) the licenses granted in this Section 2.1(a) and (b) are
+ effective on the date Initial Developer first distributes
+ Original Code under the terms of this License.
+
+ (d) Notwithstanding Section 2.1(b) above, no patent license is
+ granted: 1) for code that You delete from the Original Code; 2)
+ separate from the Original Code; or 3) for infringements caused
+ by: i) the modification of the Original Code or ii) the
+ combination of the Original Code with other software or devices.
+
+ 2.2. Contributor Grant.
+ Subject to third party intellectual property claims, each Contributor
+ hereby grants You a world-wide, royalty-free, non-exclusive license
+
+ (a) under intellectual property rights (other than patent or
+ trademark) Licensable by Contributor, to use, reproduce, modify,
+ display, perform, sublicense and distribute the Modifications
+ created by such Contributor (or portions thereof) either on an
+ unmodified basis, with other Modifications, as Covered Code
+ and/or as part of a Larger Work; and
+
+ (b) under Patent Claims infringed by the making, using, or
+ selling of Modifications made by that Contributor either alone
+ and/or in combination with its Contributor Version (or portions
+ of such combination), to make, use, sell, offer for sale, have
+ made, and/or otherwise dispose of: 1) Modifications made by that
+ Contributor (or portions thereof); and 2) the combination of
+ Modifications made by that Contributor with its Contributor
+ Version (or portions of such combination).
+
+ (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
+ effective on the date Contributor first makes Commercial Use of
+ the Covered Code.
+
+ (d) Notwithstanding Section 2.2(b) above, no patent license is
+ granted: 1) for any code that Contributor has deleted from the
+ Contributor Version; 2) separate from the Contributor Version;
+ 3) for infringements caused by: i) third party modifications of
+ Contributor Version or ii) the combination of Modifications made
+ by that Contributor with other software (except as part of the
+ Contributor Version) or other devices; or 4) under Patent Claims
+ infringed by Covered Code in the absence of Modifications made by
+ that Contributor.
+
+3. Distribution Obligations.
+
+ 3.1. Application of License.
+ The Modifications which You create or to which You contribute are
+ governed by the terms of this License, including without limitation
+ Section 2.2. The Source Code version of Covered Code may be
+ distributed only under the terms of this License or a future version
+ of this License released under Section 6.1, and You must include a
+ copy of this License with every copy of the Source Code You
+ distribute. You may not offer or impose any terms on any Source Code
+ version that alters or restricts the applicable version of this
+ License or the recipients' rights hereunder. However, You may include
+ an additional document offering the additional rights described in
+ Section 3.5.
+
+ 3.2. Availability of Source Code.
+ Any Modification which You create or to which You contribute must be
+ made available in Source Code form under the terms of this License
+ either on the same media as an Executable version or via an accepted
+ Electronic Distribution Mechanism to anyone to whom you made an
+ Executable version available; and if made available via Electronic
+ Distribution Mechanism, must remain available for at least twelve (12)
+ months after the date it initially became available, or at least six
+ (6) months after a subsequent version of that particular Modification
+ has been made available to such recipients. You are responsible for
+ ensuring that the Source Code version remains available even if the
+ Electronic Distribution Mechanism is maintained by a third party.
+
+ 3.3. Description of Modifications.
+ You must cause all Covered Code to which You contribute to contain a
+ file documenting the changes You made to create that Covered Code and
+ the date of any change. You must include a prominent statement that
+ the Modification is derived, directly or indirectly, from Original
+ Code provided by the Initial Developer and including the name of the
+ Initial Developer in (a) the Source Code, and (b) in any notice in an
+ Executable version or related documentation in which You describe the
+ origin or ownership of the Covered Code.
+
+ 3.4. Intellectual Property Matters
+ (a) Third Party Claims.
+ If Contributor has knowledge that a license under a third party's
+ intellectual property rights is required to exercise the rights
+ granted by such Contributor under Sections 2.1 or 2.2,
+ Contributor must include a text file with the Source Code
+ distribution titled "LEGAL" which describes the claim and the
+ party making the claim in sufficient detail that a recipient will
+ know whom to contact. If Contributor obtains such knowledge after
+ the Modification is made available as described in Section 3.2,
+ Contributor shall promptly modify the LEGAL file in all copies
+ Contributor makes available thereafter and shall take other steps
+ (such as notifying appropriate mailing lists or newsgroups)
+ reasonably calculated to inform those who received the Covered
+ Code that new knowledge has been obtained.
+
+ (b) Contributor APIs.
+ If Contributor's Modifications include an application programming
+ interface and Contributor has knowledge of patent licenses which
+ are reasonably necessary to implement that API, Contributor must
+ also include this information in the LEGAL file.
+
+ (c) Representations.
+ Contributor represents that, except as disclosed pursuant to
+ Section 3.4(a) above, Contributor believes that Contributor's
+ Modifications are Contributor's original creation(s) and/or
+ Contributor has sufficient rights to grant the rights conveyed by
+ this License.
+
+ 3.5. Required Notices.
+ You must duplicate the notice in Exhibit A in each file of the Source
+ Code. If it is not possible to put such notice in a particular Source
+ Code file due to its structure, then You must include such notice in a
+ location (such as a relevant directory) where a user would be likely
+ to look for such a notice. If You created one or more Modification(s)
+ You may add your name as a Contributor to the notice described in
+ Exhibit A. You must also duplicate this License in any documentation
+ for the Source Code where You describe recipients' rights or ownership
+ rights relating to Covered Code. You may choose to offer, and to
+ charge a fee for, warranty, support, indemnity or liability
+ obligations to one or more recipients of Covered Code. However, You
+ may do so only on Your own behalf, and not on behalf of the Initial
+ Developer or any Contributor. You must make it absolutely clear than
+ any such warranty, support, indemnity or liability obligation is
+ offered by You alone, and You hereby agree to indemnify the Initial
+ Developer and every Contributor for any liability incurred by the
+ Initial Developer or such Contributor as a result of warranty,
+ support, indemnity or liability terms You offer.
+
+ 3.6. Distribution of Executable Versions.
+ You may distribute Covered Code in Executable form only if the
+ requirements of Section 3.1-3.5 have been met for that Covered Code,
+ and if You include a notice stating that the Source Code version of
+ the Covered Code is available under the terms of this License,
+ including a description of how and where You have fulfilled the
+ obligations of Section 3.2. The notice must be conspicuously included
+ in any notice in an Executable version, related documentation or
+ collateral in which You describe recipients' rights relating to the
+ Covered Code. You may distribute the Executable version of Covered
+ Code or ownership rights under a license of Your choice, which may
+ contain terms different from this License, provided that You are in
+ compliance with the terms of this License and that the license for the
+ Executable version does not attempt to limit or alter the recipient's
+ rights in the Source Code version from the rights set forth in this
+ License. If You distribute the Executable version under a different
+ license You must make it absolutely clear that any terms which differ
+ from this License are offered by You alone, not by the Initial
+ Developer or any Contributor. You hereby agree to indemnify the
+ Initial Developer and every Contributor for any liability incurred by
+ the Initial Developer or such Contributor as a result of any such
+ terms You offer.
+
+ 3.7. Larger Works.
+ You may create a Larger Work by combining Covered Code with other code
+ not governed by the terms of this License and distribute the Larger
+ Work as a single product. In such a case, You must make sure the
+ requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Code due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description
+ must be included in the LEGAL file described in Section 3.4 and must
+ be included with all distributions of the Source Code. Except to the
+ extent prohibited by statute or regulation, such description must be
+ sufficiently detailed for a recipient of ordinary skill to be able to
+ understand it.
+
+5. Application of this License.
+
+ This License applies to code to which the Initial Developer has
+ attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+ 6.1. New Versions.
+ Netscape Communications Corporation ("Netscape") may publish revised
+ and/or new versions of the License from time to time. Each version
+ will be given a distinguishing version number.
+
+ 6.2. Effect of New Versions.
+ Once Covered Code has been published under a particular version of the
+ License, You may always continue to use it under the terms of that
+ version. You may also choose to use such Covered Code under the terms
+ of any subsequent version of the License published by Netscape. No one
+ other than Netscape has the right to modify the terms applicable to
+ Covered Code created under this License.
+
+ 6.3. Derivative Works.
+ If You create or use a modified version of this License (which you may
+ only do in order to apply it to code which is not already Covered Code
+ governed by this License), You must (a) rename Your license so that
+ the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
+ "MPL", "NPL" or any confusingly similar phrase do not appear in your
+ license (except to note that your license differs from this License)
+ and (b) otherwise make it clear that Your version of the license
+ contains terms which differ from the Mozilla Public License and
+ Netscape Public License. (Filling in the name of the Initial
+ Developer, Original Code or Contributor in the notice described in
+ Exhibit A shall not of themselves be deemed to be modifications of
+ this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+ COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
+ DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
+ THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
+ IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
+ YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
+ COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
+ OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
+ ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+ 8.1. This License and the rights granted hereunder will terminate
+ automatically if You fail to comply with terms herein and fail to cure
+ such breach within 30 days of becoming aware of the breach. All
+ sublicenses to the Covered Code which are properly granted shall
+ survive any termination of this License. Provisions which, by their
+ nature, must remain in effect beyond the termination of this License
+ shall survive.
+
+ 8.2. If You initiate litigation by asserting a patent infringement
+ claim (excluding declatory judgment actions) against Initial Developer
+ or a Contributor (the Initial Developer or Contributor against whom
+ You file such action is referred to as "Participant") alleging that:
+
+ (a) such Participant's Contributor Version directly or indirectly
+ infringes any patent, then any and all rights granted by such
+ Participant to You under Sections 2.1 and/or 2.2 of this License
+ shall, upon 60 days notice from Participant terminate prospectively,
+ unless if within 60 days after receipt of notice You either: (i)
+ agree in writing to pay Participant a mutually agreeable reasonable
+ royalty for Your past and future use of Modifications made by such
+ Participant, or (ii) withdraw Your litigation claim with respect to
+ the Contributor Version against such Participant. If within 60 days
+ of notice, a reasonable royalty and payment arrangement are not
+ mutually agreed upon in writing by the parties or the litigation claim
+ is not withdrawn, the rights granted by Participant to You under
+ Sections 2.1 and/or 2.2 automatically terminate at the expiration of
+ the 60 day notice period specified above.
+
+ (b) any software, hardware, or device, other than such Participant's
+ Contributor Version, directly or indirectly infringes any patent, then
+ any rights granted to You by such Participant under Sections 2.1(b)
+ and 2.2(b) are revoked effective as of the date You first made, used,
+ sold, distributed, or had made, Modifications made by that
+ Participant.
+
+ 8.3. If You assert a patent infringement claim against Participant
+ alleging that such Participant's Contributor Version directly or
+ indirectly infringes any patent where such claim is resolved (such as
+ by license or settlement) prior to the initiation of patent
+ infringement litigation, then the reasonable value of the licenses
+ granted by such Participant under Sections 2.1 or 2.2 shall be taken
+ into account in determining the amount or value of any payment or
+ license.
+
+ 8.4. In the event of termination under Sections 8.1 or 8.2 above,
+ all end user license agreements (excluding distributors and resellers)
+ which have been validly granted by You or any distributor hereunder
+ prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+ UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
+ (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
+ DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
+ OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
+ ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+ CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
+ WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+ COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
+ INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
+ LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
+ RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
+ PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+ THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+ The Covered Code is a "commercial item," as that term is defined in
+ 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
+ software" and "commercial computer software documentation," as such
+ terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
+ C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
+ all U.S. Government End Users acquire Covered Code with only those
+ rights set forth herein.
+
+11. MISCELLANEOUS.
+
+ This License represents the complete agreement concerning subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. This License shall be governed by
+ California law provisions (except to the extent applicable law, if
+ any, provides otherwise), excluding its conflict-of-law provisions.
+ With respect to disputes in which at least one party is a citizen of,
+ or an entity chartered or registered to do business in the United
+ States of America, any litigation relating to this License shall be
+ subject to the jurisdiction of the Federal Courts of the Northern
+ District of California, with venue lying in Santa Clara County,
+ California, with the losing party responsible for costs, including
+ without limitation, court costs and reasonable attorneys' fees and
+ expenses. The application of the United Nations Convention on
+ Contracts for the International Sale of Goods is expressly excluded.
+ Any law or regulation which provides that the language of a contract
+ shall be construed against the drafter shall not apply to this
+ License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+ As between Initial Developer and the Contributors, each party is
+ responsible for claims and damages arising, directly or indirectly,
+ out of its utilization of rights under this License and You agree to
+ work with Initial Developer and Contributors to distribute such
+ responsibility on an equitable basis. Nothing herein is intended or
+ shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+ Initial Developer may designate portions of the Covered Code as
+ "Multiple-Licensed". "Multiple-Licensed" means that the Initial
+ Developer permits you to utilize portions of the Covered Code under
+ Your choice of the NPL or the alternative licenses, if any, specified
+ by the Initial Developer in the file described in Exhibit A.
+
+EXHIBIT A - Mozilla Public License.
+
+ ``The contents of this file are subject to the Mozilla Public License
+ Version 1.1 (the "License"); you may not use this file except in
+ compliance with the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS"
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ License for the specific language governing rights and limitations
+ under the License.
+
+ The Original Code is ______________________________________.
+
+ The Initial Developer of the Original Code is ________________________.
+ Portions created by ______________________ are Copyright (C) ______
+ _______________________. All Rights Reserved.
+
+ Contributor(s): ______________________________________.
+
+ Alternatively, the contents of this file may be used under the terms
+ of the _____ license (the "[___] License"), in which case the
+ provisions of [______] License are applicable instead of those
+ above. If you wish to allow use of your version of this file only
+ under the terms of the [____] License and not to allow others to use
+ your version of this file under the MPL, indicate your decision by
+ deleting the provisions above and replace them with the notice and
+ other provisions required by the [___] License. If you do not delete
+ the provisions above, a recipient may use your version of this file
+ under either the MPL or the [___] License."
+
+ [NOTE: The text of this Exhibit A may differ slightly from the text of
+ the notices in the Source Code files of the Original Code. You should
+ use the text of this Exhibit A rather than the text found in the
+ Original Code Source Code for Your Modifications.]
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to SAX 2.0.1, which is included
+with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+ SAX is free!
+
+ In fact, it's not possible to own a license to SAX, since it's been placed in
+ the public domain.
+
+ No Warranty
+
+ Because SAX is released to the public domain, there is no warranty for the
+ design or for the software implementation, to the extent permitted by
+ applicable law. Except when otherwise stated in writing the copyright holders
+ and/or other parties provide SAX "as is" without warranty of any kind, either
+ expressed or implied, including, but not limited to, the implied warranties
+ of merchantability and fitness for a particular purpose. The entire risk as
+ to the quality and performance of SAX is with you. Should SAX prove
+ defective, you assume the cost of all necessary servicing, repair or
+ correction.
+
+ In no event unless required by applicable law or agreed to in writing will
+ any copyright holder, or any other party who may modify and/or redistribute
+ SAX, be liable to you for damages, including any general, special, incidental
+ or consequential damages arising out of the use or inability to use SAX
+ (including but not limited to loss of data or data being rendered inaccurate
+ or losses sustained by you or third parties or a failure of the SAX to
+ operate with any other programs), even if such holder or other party has been
+ advised of the possibility of such damages.
+
+ Copyright Disclaimers
+
+ This page includes statements to that effect by David Megginson, who would
+ have been able to claim copyright for the original work. SAX 1.0
+
+ Version 1.0 of the Simple API for XML (SAX), created collectively by the
+ membership of the XML-DEV mailing list, is hereby released into the public
+ domain.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS ORIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESSFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS ORCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHERIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR INCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ No one owns SAX: you may use it freely in both commercial and non-commercial
+ applications, bundle it with your software distribution, include it on a
+ CD-ROM, list the source code in a book, mirror the documentation at your own
+ web site, or use it in any other way you see fit.
-%% This notice is provided with respect to XFree86-VidMode Extension, which may be included with this software:
+ David Megginson, sax at megginson.com
+ 1998-05-11
-Version 1.1 of XFree86 ProjectLicence.
+ SAX 2.0
- Copyright (C) 1994-2004 The XFree86 Project, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person obtaining a copyof this software and associated documentation files (the "Software"), to deal inthe Software without restriction, including without limitation the rights touse, copy, modify, merge, publish, distribute, sublicence, and/or sell copies ofthe Software, and to permit persons to whom the Software is furnished to do so,subject to the following conditions:
-
- 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 copyrightnotice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution, and in thesame place and form as other copyright, license and disclaimer information. 3. The end-user documentation included with the redistribution, if any,must include the following acknowledgment: "This product includes softwaredeveloped by The XFree86 Project, Inc (http://www.xfree86.org/) and itscontributors", in the same place and form as other third-party acknowledgments.Alternately, this acknowledgment may appear in the software itself, in the sameform and location as other such third-party acknowledgments.
- 4. Except as contained in this notice, the name of The XFree86 Project,Inc shall not be used in advertising or otherwise to promote the sale, use orother dealings in this Software without prior written authorization from TheXFree86 Project, Inc.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY ANDFITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE XFREE86PROJECT, INC OR ITS 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; ORBUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER INCONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISINGIN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITYOF SUCH DAMAGE.
-
-%% This notice is provided with respect to XML Security, which may be included with this software:
-
- The Apache Software License,
- Version 1.1
-
-
- PDF
-
-
- Copyright (C) 2002 The Apache SoftwareFoundation.
- All rights reserved. Redistribution anduse in
- source and binary forms, with or withoutmodifica-
- tion, are permitted provided that thefollowing
- conditions are met: 1. Redistributions ofsource
- code must retain the above copyrightnotice, this
- list of conditions and the followingdisclaimer.
- 2. Redistributions in binary form mustreproduce
- the above copyright notice, this list of conditions and the following disclaimerin the
- documentation and/or other materialsprovided with
- the distribution. 3. The end-userdocumentation
- included with the redistribution, if any,must
- include the following acknowledgment:"This
- product includes software developed bythe Apache
- Software Foundation
-(http://www.apache.org/)."
- Alternately, this acknowledgment mayappear in the
- software itself, if and wherever suchthird-party
- acknowledgments normally appear. 4. Thenames
- "Apache Forrest" and "Apache SoftwareFoundation"
- must not be used to endorse or promoteproducts
- derived from this software without priorwritten
- permission. For written permission,please contact
- apache at apache.org. 5. Products derivedfrom this
- software may not be called "Apache", normay
- "Apache" appear in their name, withoutprior
- written permission of the Apache Software Foundation. THIS SOFTWARE IS PROVIDED``AS IS''
- AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THEIMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESSFOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NOEVENT
- SHALL THE APACHE SOFTWARE FOUNDATION ORITS
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT,INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, ORCONSEQUENTIAL
- DAMAGES (INCLU- DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ORSERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANYTHEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICTLIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OROTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF
- SUCH DAMAGE. This software consists ofvoluntary
- contributions made by many individuals onbehalf
- of the Apache Software Foundation. Formore
- information on the Apache SoftwareFoundation,
- please see .
-
-%% This notice is provided with respect to Independent JPEG Group's software (libjpeg), which may be included with this software:
-
-In plain English:
-
-1. We don't promise that this software works. (But if you find any bugs,
- please let us know!)
-2. You can use this software for whatever you want. You don't have to pay us.
-3. You may not pretend that you wrote this software. If you use it in a program, you must acknowledge somewhere in your documentation that you've used the IJG code.
-
-In legalese:
-
-The authors make NO WARRANTY or representation, either express or implied, with respect to this software, its quality, accuracy, merchantability, or fitness for a particular purpose. This software is provided "AS IS", and you, its user, assume the entire risk as to its quality and accuracy.
+ I hereby abandon any property rights to SAX 2.0 (the Simple API for XML), and
+ release all of the SAX 2.0 source code, compiled code, and documentation
+ contained in this distribution into the Public Domain. SAX comes with NO
+ WARRANTY or guarantee of fitness for any purpose.
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
+ David Megginson, david at megginson.com
+ 2000-05-05
-Permission is hereby granted to use, copy, modify, and distribute this software (or portions thereof) for any purpose, without fee, subject to these conditions:
+--- end of LICENSE ---
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice unaltered; and any additions, deletions, or changes to the original files must be clearly indicated in accompanying documentation.
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to SoftFloat version 2b, which is
+included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM.
+
+--- begin of LICENSE ---
+
+Use of any of this software is governed by the terms of the license below:
+
+SoftFloat was written by me, John R. Hauser. This work was made possible in
+part by the International Computer Science Institute, located at Suite 600,
+1947 Center Street, Berkeley, California 94704. Funding was partially
+provided by the National Science Foundation under grant MIP-9311980. The
+original version of this code was written as part of a project to build
+a fixed-point vector processor in collaboration with the University of
+California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek.
+
+THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort
+has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT
+TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO
+PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL
+LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO
+FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER
+SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES,
+COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE
+SOFTWARE.
+
+Derivative works are acceptable, even for commercial purposes, provided
+that the minimal documentation requirements stated in the source code are
+satisfied.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% Portions licensed from Taligent, Inc.
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Thai Dictionary, which is
+included with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+Copyright (C) 1982 The Royal Institute, Thai Royal Government.
+
+Copyright (C) 1998 National Electronics and Computer Technology Center,
+National Science and Technology Development Agency,
+Ministry of Science Technology and Environment,
+Thai Royal Government.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Unicode 6.0.0, CLDR v1.4.1, & CLDR
+v1.9, which is included with JRE 7, JDK 7, and OpenJDK 7.
+
+--- begin of LICENSE ---
+
+Unicode Terms of Use
+
+For the general privacy policy governing access to this site, see the Unicode
+Privacy Policy. For trademark usage, see the Unicode® Consortium Name and
+Trademark Usage Policy.
+
+A. Unicode Copyright.
+ 1. Copyright © 1991-2011 Unicode, Inc. All rights reserved.
+
+ 2. Certain documents and files on this website contain a legend indicating
+ that "Modification is permitted." Any person is hereby authorized,
+ without fee, to modify such documents and files to create derivative
+ works conforming to the Unicode® Standard, subject to Terms and
+ Conditions herein.
+
+ 3. Any person is hereby authorized, without fee, to view, use, reproduce,
+ and distribute all documents and files solely for informational
+ purposes in the creation of products supporting the Unicode Standard,
+ subject to the Terms and Conditions herein.
+
+ 4. Further specifications of rights and restrictions pertaining to the use
+ of the particular set of data files known as the "Unicode Character
+ Database" can be found in Exhibit 1.
+
+ 5. Each version of the Unicode Standard has further specifications of
+ rights and restrictions of use. For the book editions (Unicode 5.0 and
+ earlier), these are found on the back of the title page. The online
+ code charts carry specific restrictions. All other files, including
+ online documentation of the core specification for Unicode 6.0 and
+ later, are covered under these general Terms of Use.
+
+ 6. No license is granted to "mirror" the Unicode website where a fee is
+ charged for access to the "mirror" site.
+
+ 7. Modification is not permitted with respect to this document. All copies
+ of this document must be verbatim.
+
+B. Restricted Rights Legend. Any technical data or software which is licensed
+ to the United States of America, its agencies and/or instrumentalities
+ under this Agreement is commercial technical data or commercial computer
+ software developed exclusively at private expense as defined in FAR 2.101,
+ or DFARS 252.227-7014 (June 1995), as applicable. For technical data, use,
+ duplication, or disclosure by the Government is subject to restrictions as
+ set forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov
+ 1995) and this Agreement. For Software, in accordance with FAR 12-212 or
+ DFARS 227-7202, as applicable, use, duplication or disclosure by the
+ Government is subject to the restrictions set forth in this Agreement.
+
+C. Warranties and Disclaimers.
+ 1. This publication and/or website may include technical or typographical
+ errors or other inaccuracies . Changes are periodically added to the
+ information herein; these changes will be incorporated in new editions
+ of the publication and/or website. Unicode may make improvements and/or
+ changes in the product(s) and/or program(s) described in this
+ publication and/or website at any time.
+
+ 2. If this file has been purchased on magnetic or optical media from
+ Unicode, Inc. the sole and exclusive remedy for any claim will be
+ exchange of the defective media within ninety (90) days of original
+ purchase.
+
+ 3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR SOFTWARE IS
+ PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS, IMPLIED,
+ OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
+ UNICODE AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR
+ OMISSIONS IN THIS PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH
+ ARE REFERENCED BY OR LINKED TO THIS PUBLICATION OR THE UNICODE WEBSITE.
+
+D. Waiver of Damages. In no event shall Unicode or its licensors be liable for
+ any special, incidental, indirect or consequential damages of any kind, or
+ any damages whatsoever, whether or not Unicode was advised of the
+ possibility of the damage, including, without limitation, those resulting
+ from the following: loss of use, data or profits, in connection with the
+ use, modification or distribution of this information or its derivatives.
+
+E.Trademarks & Logos.
+ 1. The Unicode Word Mark and the Unicode Logo are trademarks of Unicode,
+ Inc. “The Unicode Consortium†and “Unicode, Inc.†are trade names of
+ Unicode, Inc. Use of the information and materials found on this
+ website indicates your acknowledgement of Unicode, Inc.’s exclusive
+ worldwide rights in the Unicode Word Mark, the Unicode Logo, and the
+ Unicode trade names.
+
+ 2. The Unicode Consortium Name and Trademark Usage Policy (“Trademark
+ Policyâ€) are incorporated herein by reference and you agree to abide by
+ the provisions of the Trademark Policy, which may be changed from time
+ to time in the sole discretion of Unicode, Inc.
+
+ 3. All third party trademarks referenced herein are the property of their
+ respective owners.
+
+Miscellaneous.
+ 1. Jurisdiction and Venue. This server is operated from a location in the
+ State of California, United States of America. Unicode makes no
+ representation that the materials are appropriate for use in other
+ locations. If you access this server from other locations, you are
+ responsible for compliance with local laws. This Agreement, all use of
+ this site and any claims and damages resulting from use of this site are
+ governed solely by the laws of the State of California without regard to
+ any principles which would apply the laws of a different jurisdiction.
+ The user agrees that any disputes regarding this site shall be resolved
+ solely in the courts located in Santa Clara County, California. The user
+ agrees said courts have personal jurisdiction and agree to waive any
+ right to transfer the dispute to any other forum.
+
+ 2. Modification by Unicode. Unicode shall have the right to modify this
+ Agreement at any time by posting it to this site. The user may not
+ assign any part of this Agreement without Unicode’s prior written
+ consent.
+
+ 3. Taxes. The user agrees to pay any taxes arising from access to this
+ website or use of the information herein, except for those based on
+ Unicode’s net income.
+
+ 4. Severability. If any provision of this Agreement is declared invalid or
+ unenforceable, the remaining provisions of this Agreement shall remain
+ in effect.
+
+ 5. Entire Agreement. This Agreement constitutes the entire agreement
+ between the parties.
+
+EXHIBIT 1
+UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+
+Unicode Data Files include all data files under the directories
+http://www.unicode.org/Public/, http://www.unicode.org/reports/, and
+http://www.unicode.org/cldr/data/. Unicode Data Files do not include PDF
+online code charts under the directory http://www.unicode.org/Public/.
+Software includes any source code published in the Unicode Standard or under
+the directories http://www.unicode.org/Public/,
+http://www.unicode.org/reports/, and http://www.unicode.org/cldr/data/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING,
+INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA
+FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO
+BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT
+AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR
+SOFTWARE.
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under the
+Terms of Use in http://www.unicode.org/copyright.html.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the Unicode data files and any associated documentation (the "Data Files")
+or Unicode software and any associated documentation (the "Software") to deal
+in the Data Files or Software without restriction, including without
+limitation the rights to use, copy, modify, merge, publish, distribute, and/or
+sell copies of the Data Files or Software, and to permit persons to whom the
+Data Files or Software are furnished to do so, provided that (a) the above
+copyright notice(s) and this permission notice appear with all copies of the
+Data Files or Software, (b) both the above copyright notice(s) and this
+permission notice appear in associated documentation, and (c) there is clear
+notice in each modified Data File or in the Software as well as in the
+documentation associated with the Data File(s) or Software that the data or
+software has been modified.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
+PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
+THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE
+DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in these Data Files or Software without prior written authorization of the
+copyright holder.
+
+Unicode and the Unicode logo are trademarks of Unicode, Inc. in the United
+States and other countries. All third party trademarks referenced herein are
+the property of their respective owners.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to UPX v3.01, which is included
+with JRE 7 on Windows.
+
+--- begin of LICENSE ---
+
+Use of any of this software is governed by the terms of the license below:
+
+
+ ooooo ooo ooooooooo. ooooooo ooooo
+ `888' `8' `888 `Y88. `8888 d8'
+ 888 8 888 .d88' Y888..8P
+ 888 8 888ooo88P' `8888'
+ 888 8 888 .8PY888.
+ `88. .8' 888 d8' `888b
+ `YbodP' o888o o888o o88888o
+
+
+ The Ultimate Packer for eXecutables
+ Copyright (c) 1996-2000 Markus Oberhumer & Laszlo Molnar
+ http://wildsau.idv.uni-linz.ac.at/mfx/upx.html
+ http://www.nexus.hu/upx
+ http://upx.tsx.org
-(2) If only executable code is distributed, then the accompanying documentation must state that "this software is based in part on the work of the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts full responsibility for any undesirable consequences; the authors accept NO LIABILITY for damages of any kind.
+PLEASE CAREFULLY READ THIS LICENSE AGREEMENT, ESPECIALLY IF YOU PLAN
+TO MODIFY THE UPX SOURCE CODE OR USE A MODIFIED UPX VERSION.
-These conditions apply to any software derived from or based on the IJG code, not just to the unmodified library. If you use our work, you ought to acknowledge us.
-Permission is NOT granted for the use of any IJG author's name or company name in advertising or publicity relating to this software or products derived from it. This software may be referred to only as "the Independent JPEG Group's software".
+ABSTRACT
+========
-We specifically permit and encourage the use of this software as the basis of commercial products, provided that all warranty or liability claims are assumed by the product vendor.
+ UPX and UCL are copyrighted software distributed under the terms
+ of the GNU General Public License (hereinafter the "GPL").
-ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. ansi2knr.c is NOT covered by the above copyright and conditions, but instead by the usual distribution terms of the Free Software Foundation; principally, that you must include source code if you redistribute it. (See the file ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part of any program generated from the IJG code, this does not limit you more than the foregoing paragraphs do.
+ The stub which is imbedded in each UPX compressed program is part
+ of UPX and UCL, and contains code that is under our copyright. The
+ terms of the GNU General Public License still apply as compressing
+ a program is a special form of linking with our stub.
-The Unix configuration script "configure" was produced with GNU Autoconf. It is copyright by the Free Software Foundation but is freely distributable. The same holds for its supporting scripts (config.guess, config.sub, ltconfig, ltmain.sh). Another support script, install-sh, is copyright by M.I.T. but is also freely distributable.
+ As a special exception we grant the free usage of UPX for all
+ executables, including commercial programs.
+ See below for details and restrictions.
-It appears that the arithmetic coding option of the JPEG spec is covered by patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot legally be used without obtaining one or more licenses. For this reason, support for arithmetic coding has been removed from the free JPEG software. (Since arithmetic coding provides only a marginal gain over the unpatented Huffman mode, it is unlikely that very many implementations will support it.) So far as we are aware, there are no patent restrictions on the remaining code.
-The IJG distribution formerly included code to read and write GIF files. To avoid entanglement with the Unisys LZW patent, GIF reading support has been removed altogether, and the GIF writer has been simplified to produce "uncompressed GIFs". This technique does not use the LZW algorithm; the resulting GIF files are larger than usual, but are readable by all standard GIF decoders.
+COPYRIGHT
+=========
-We are required to state that
- "The Graphics Interchange Format(c) is the Copyright property of
- CompuServe Incorporated. GIF(sm) is a Service Mark property of
- CompuServe Incorporated."
+ UPX and UCL are copyrighted software. All rights remain with the authors.
+
+ UPX is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
+ UPX is Copyright (C) 1996-2000 Laszlo Molnar
+
+ UCL is Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer
+
+
+GNU GENERAL PUBLIC LICENSE
+==========================
+
+ UPX and the UCL library are free software; you can redistribute them
+ and/or modify them under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 of
+ the License, or (at your option) any later version.
+
+ UPX and UCL are distributed in the hope that they will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING.
+
+
+SPECIAL EXCEPTION FOR COMPRESSED EXECUTABLES
+============================================
+
+ The stub which is imbedded in each UPX compressed program is part
+ of UPX and UCL, and contains code that is under our copyright. The
+ terms of the GNU General Public License still apply as compressing
+ a program is a special form of linking with our stub.
+
+ Hereby Markus F.X.J. Oberhumer and Laszlo Molnar grant you special
+ permission to freely use and distribute all UPX compressed programs
+ (including commercial ones), subject to the following restrictions:
+
+ 1. You must compress your program with a completely unmodified UPX
+ version; either with our precompiled version, or (at your option)
+ with a self compiled version of the unmodified UPX sources as
+ distributed by us.
+ 2. This also implies that the UPX stub must be completely unmodfied, i.e.
+ the stub imbedded in your compressed program must be byte-identical
+ to the stub that is produced by the official unmodified UPX version.
+ 3. The decompressor and any other code from the stub must exclusively get
+ used by the unmodified UPX stub for decompressing your program at
+ program startup. No portion of the stub may get read, copied,
+ called or otherwise get used or accessed by your program.
+
+
+ANNOTATIONS
+===========
+
+ - You can use a modified UPX version or modified UPX stub only for
+ programs that are compatible with the GNU General Public License.
+
+ - We grant you special permission to freely use and distribute all UPX
+ compressed programs. But any modification of the UPX stub (such as,
+ but not limited to, removing our copyright string or making your
+ program non-decompressible) will immediately revoke your right to
+ use and distribute a UPX compressed program.
+
+ - UPX is not a software protection tool; by requiring that you use
+ the unmodified UPX version for your proprietary programs we
+ make sure that any user can decompress your program. This protects
+ both you and your users as nobody can hide malicious code -
+ any program that cannot be decompressed is highly suspicious
+ by definition.
+
+ - You can integrate all or part of UPX and UCL into projects that
+ are compatible with the GNU GPL, but obviously you cannot grant
+ any special exceptions beyond the GPL for our code in your project.
+
+ - We want to actively support manufacturers of virus scanners and
+ similar security software. Please contact us if you would like to
+ incorporate parts of UPX or UCL into such a product.
+
+
+
+Markus F.X.J. Oberhumer Laszlo Molnar
+markus.oberhumer at jk.uni-linz.ac.at ml1050 at cdata.tvnet.hu
+
+Linz, Austria, 25 Feb 2000
+
+Additional License(s)
+
+The UPX license file is at http://upx.sourceforge.net/upx-license.html.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to Xfree86-VidMode Extension 1.0,
+which is included with JRE 7, JDK 7, and OpenJDK 7 on Linux and Solaris.
+
+--- begin of LICENSE ---
+
+Version 1.1 of XFree86 ProjectLicence.
+
+Copyright (C) 1994-2004 The XFree86 Project, Inc. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicence, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so,subject to the following conditions:
+
+ 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, and in the same place
+ and form as other copyright, license and disclaimer information.
+
+ 3. The end-user documentation included with the redistribution, if any,must
+ include the following acknowledgment: "This product includes
+ software developed by The XFree86 Project, Inc (http://www.xfree86.org/) and
+ its contributors", in the same place and form as other third-party
+ acknowledgments. Alternately, this acknowledgment may appear in the software
+ itself, in the same form and location as other such third-party
+ acknowledgments.
+
+ 4. Except as contained in this notice, the name of The XFree86 Project,Inc
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization from
+ The XFree86 Project, Inc.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 XFREE86 PROJECT, INC OR ITS 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.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to X Window System 6.8.2, which is
+included with JRE 7, JDK 7, and OpenJDK 7 on Linux and Solaris.
+
+--- begin of LICENSE ---
+
+ Licenses
+The X.Org Foundation March 2004
+
+1. Introduction
+
+The X.org Foundation X Window System distribution is a compilation of code and
+documentation from many sources. This document is intended primarily as a
+guide to the licenses used in the distribution: you must check each file
+and/or package for precise redistribution terms. None-the-less, this summary
+may be useful to many users. No software incorporating the XFree86 1.1 license
+has been incorporated.
+
+This document is based on the compilation from XFree86.
-%% This notice is provided with respect to X Resize and Rotate (Xrandr) Extension, which may be included with this software:
2. XFree86 License
XFree86 code without an explicit copyright is covered by the following
@@ -1050,567 +2352,1034 @@ copyright/license:
Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from the XFree86 Project.
+
+3. Other Licenses
+
+Portions of code are covered by the following licenses/copyrights. See
+individual files for the copyright dates.
+
+3.1. X/MIT Copyrights
+
+3.1.1. X Consortium
+
+Copyright (C) <date> X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86
-PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE X
+CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of the XFree86 Project shall not be
+Except as contained in this notice, the name of the X Consortium shall not be
used in advertising or otherwise to promote the sale, use or other dealings in
-this Software without prior written authorization from the XFree86 Project.
+this Software without prior written authorization from the X Consortium.
-%% This notice is provided with respect to fontconfig, which may be included with this software:
-Id: COPYING,v 1.3 2003/04/04 20:17:40 keithp Exp $
-Copyright 2001,2003 Keith Packard
+X Window System is a trademark of X Consortium, Inc.
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Keith Packard makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-%% This notice is provided with respect to XFree86, which may be included with this software:
-Copyright (C) 1994-2002 The XFree86 Project, Inc. All Rights Reserved.
+3.1.2. The Open Group
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated
-documentation files (the "Software"), to deal in the Software without
-restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to the
-following conditions:
+Copyright <date> The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that the
+above copyright notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting documentation.
The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the
-Software.
+copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT
-NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM,
-DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of the XFree86 Project shall not be
-used in advertising or otherwise
-to promote the sale, use or other dealings in this Software without prior
-written authorization from the XFree86
-Project.
-%% This notice is provided with respect to Fast Infoset, which may be included with this software:
-* Fast Infoset ver. 0.1 software ("Software")
-*
-* Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
-*
-* Software is licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License. You may
-* obtain a copy of the License at:
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-* License for the specific language governing permissions and limitations.
-*
-* Oracle supports and benefits from the global community of open source
-* developers, and thanks the community for its important contributions and
-* open standards-based technology, which Oracle has adopted into many of its
-* products.
-*
-* Please note that portions of Software may be provided with notices and
-* open source licenses from such communities and third parties that govern the
-* use of those portions, and any licenses granted hereunder do not alter any
-* rights and obligations you may have under such open source licenses,
-* however, the disclaimer of warranty and limitation of liability provisions
-* in this License will apply to all Software in this distribution.
-*
-* You acknowledge that the Software is not designed, licensed or intended
-* for use in the design, construction, operation or maintenance of any nuclear
-* facility.
-*
-* Apache License
-* Version 2.0, January 2004
-* http://www.apache.org/licenses/
-*
-*/
-/*
-* ====================================================================
-*
-* This code is subject to the freebxml License, Version 1.1
-*
-* Copyright (c) 2001 - 2005 freebxml.org. All rights reserved.
-*
-* $Header: /cvs/fi/FastInfoset/src/com/sun/xml/internal/fastinfoset/AbstractResourceBundle.java,v 1.2
-* ====================================================================
-*/
-%% This notice is provided with respect to Kerberos, which may be included with this software:
-
-/*
- * Copyright (C) 1998 by the FundsXpress, INC.
- *
- * All rights reserved.
- *
- * Export of this software from the United States of America may require
- * a specific license from the United States Government. It is the
- * responsibility of any person or organization contemplating export to
- * obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of FundsXpress. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission. FundsXpress makes no representations about the suitability of
- * this software for any purpose. It is provided "as is" without express
- * or implied warranty.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-%% This notice is provided with respect to Unicode's CLDR data repository, which may be included with this software:
-
- Unicode Copyright
-
- For the general privacy policy governing access to this site, see the
-Unicode Privacy Policy. For trademark usage, see the the Unicode Consortium
-Trademarks and Logo Policy.
- Notice to End User: Terms of Use
- Carefully read the following legal agreement ("Agreement"). Use or copying
-of the software and/or codes provided with this agreement (The "Software")
-constitutes your acceptance of these terms
-
- 1. Unicode Copyright.
- 1. Copyright © 1991-2005 Unicode, Inc. All rights reserved.
- 2. Certain documents and files on this website contain a legend
-indicating that "Modification is permitted." Any person is hereby authorized,
-without fee, to modify such documents and files to create derivative works
-conforming to the Unicode® Standard, subject to Terms and Conditions herein.
- 3. Any person is hereby authorized, without fee, to view, use,
-reproduce, and distribute all documents and files solely for informational
-purposes in the creation of products supporting the Unicode Standard, subject to
-the Terms and Conditions herein.
- 4. Further specifications of rights and restrictions pertaining to
-the use of the particular set of data files known as the "Unicode Character
-Database" can be found in Exhibit 1.
- 5. Further specifications of rights and restrictions pertaining to
-the use of the particular set of files that constitute the online edition of The
-Unicode Standard, Version 4.0, may be found in V4.0 online edition.
- 6. No license is granted to "mirror" the Unicode website where a
-fee is charged for access to the "mirror" site.
- 7. Modification is not permitted with respect to this document. All
-copies of this document must be verbatim.
- 2. Restricted Rights Legend. Any technical data or software which is
-licensed to the United States of America, its agencies and/or instrumentalities
-under this Agreement is commercial technical data or commercial computer
-software developed exclusively at private expense as defined in FAR 2.101, or
-DFARS 252.227-7014 (June 1995), as applicable. For technical data, use,
-duplication, or disclosure by the Government is subject to restrictions as set
-forth in DFARS 202.227-7015 Technical Data, Commercial and Items (Nov 1995) and
-this Agreement. For Software, in accordance with FAR 12-212 or DFARS 227-7202,
-as applicable, use, duplication or disclosure by the Government is subject to
-the restrictions set forth in this Agreement.
- 3. Warranties and Disclaimers.
- 1. This publication and/or website may include technical or
-typographical errors or other inaccuracies . Changes are periodically added to
-the information herein; these changes will be incorporated in new editions of
-the publication and/or website. Unicode may make improvements and/or changes in
-the product(s) and/or program(s) described in this publication and/or website at
-any time.
- 2. If this file has been purchased on magnetic or optical media
-from Unicode, Inc. the sole and exclusive remedy for any claim will be exchange
-of the defective media within ninety (90) days of original purchase.
- 3. EXCEPT AS PROVIDED IN SECTION C.2, THIS PUBLICATION AND/OR
-SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND EITHER EXPRESS,
-IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. UNICODE
-AND ITS LICENSORS ASSUME NO RESPONSIBILITY FOR ERRORS OR OMISSIONS IN THIS
-PUBLICATION AND/OR SOFTWARE OR OTHER DOCUMENTS WHICH ARE REFERENCED BY OR LINKED
-TO THIS PUBLICATION OR THE UNICODE WEBSITE.
- 4. Waiver of Damages. In no event shall Unicode or its licensors be
-liable for any special, incidental, indirect or consequential damages of any
-kind, or any damages whatsoever, whether or not Unicode was advised of the
-possibility of the damage, including, without limitation, those resulting from
-the following: loss of use, data or profits, in connection with the use,
-modification or distribution of this information or its derivatives.
- 5. Trademarks.
- 1. Unicode and the Unicode logo are registered trademarks of
-Unicode, Inc.
- 2. This site contains product names and corporate names of other
-companies. All product names and company names and logos mentioned herein are
-the trademarks or registered trademarks of their respective owners. Other
-products and corporate names mentioned herein which are trademarks of a third
-party are used only for explanation and for the owners' benefit and with no
-intent to infringe.
- 3. Use of third party products or information referred to herein is
-at the user's risk.
- 6. Miscellaneous.
- 1. Jurisdiction and Venue. This server is operated from a location
-in the State of California, United States of America. Unicode makes no
-representation that the materials are appropriate for use in other locations. If
-you access this server from other locations, you are responsible for compliance
-with local laws. This Agreement, all use of this site and any claims and damages
-resulting from use of this site are governed solely by the laws of the State of
-California without regard to any principles which would apply the laws of a
-different jurisdiction. The user agrees that any disputes regarding this site
-shall be resolved solely in the courts located in Santa Clara County,
-California. The user agrees said courts have personal jurisdiction and agree to
-waive any right to transfer the dispute to any other forum.
- 2. Modification by Unicode Unicode shall have the right to modify
-this Agreement at any time by posting it to this site. The user may not assign
-any part of this Agreement without Unicode's prior written consent.
- 3. Taxes. The user agrees to pay any taxes arising from access to
-this website or use of the information herein, except for those based on
-Unicode's net income.
- 4. Severability. If any provision of this Agreement is declared
-invalid or unenforceable, the remaining provisions of this Agreement shall
-remain in effect.
- 5. Entire Agreement. This Agreement constitutes the entire
-agreement between the parties.
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings in
+this Software without prior written authorization from The Open Group. 3.2.
+Berkeley-based copyrights:
-EXHIBIT 1
-UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
+o
+3.2.1. General
- Unicode Data Files include all data files under the directories
-http://www.unicode.org/Public/ and http://www.unicode.org/reports/. Unicode
-Software includes any source code under the directories
-http://www.unicode.org/Public/ and http://www.unicode.org/reports/.
-
- NOTICE TO USER: Carefully read the following legal agreement. BY
-DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES
-("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND
-AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU
-DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES
-OR SOFTWARE.
-
- COPYRIGHT AND PERMISSION NOTICE
-
- Copyright Ã?Â,Ã,© 1991-2004 Unicode, Inc. All rights reserved. Distributed under
-the Terms of Use in http://www.unicode.org/copyright.html.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
-of the Unicode data files and associated documentation (the "Data Files") or
-Unicode software and associated documentation (the "Software") to deal in the
-Data Files or Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files or
-Software are furnished to do so, provided that (a) the above copyright notice(s)
-and this permission notice appear with all copies of the Data Files or Software,
-(b) both the above copyright notice(s) and this permission notice appear in
-associated documentation, and (c) there is clear notice in each modified Data
-File or in the Software as well as in the documentation associated with the Data
-File(s) or Software that the data or software has been modified.
-
- THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD
-PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
-OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
- Except as contained in this notice, the name of a copyright holder shall not
-be used in advertising or otherwise to promote the sale, use or other dealings
-in these Data Files or Software without prior written authorization of the
-copyright holder.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
- Unicode and the Unicode logo are trademarks of Unicode, Inc., and may be
-registered in some jurisdictions. All other trademarks and registered trademarks
-mentioned herein are the property of their respective owners.
-%% This notice is provided with respect to RSA PKCS#11 Header Files & Specification, which may be included with this software:
-
-/*
- * Copyright (C) 1998 by the FundsXpress, INC.
- *
- * All rights reserved.
- *
- * Export of this software from the United States of America may require
- * a specific license from the United States Government. It is the
- * responsibility of any person or organization contemplating export to
- * obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of FundsXpress. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission. FundsXpress makes no representations about the suitability of
- * this software for any purpose. It is provided "as is" without express
- * or implied warranty.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-%% This notice is provided with respect to certain files/code which may included in the implementation of AWT within the software:
-
-******************************************************
-BEGIN src/solaris/native/sun/awt/HPkeysym.h
-Copyright 1987, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
-
-All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of Hewlett Packard
-or Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
+ 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. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. 3.2.2. UCB/LBL
+
+Copyright (c) 1993 The Regents of the University of California. All rights
+reserved.
+
+This software was developed by the Computer Systems Engineering group at
+Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
+Berkeley.
+
+All advertising materials mentioning features or use of this software must
+display the following acknowledgement: This product includes software
+developed by the University of California, Lawrence Berkeley Laboratory.
+
+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. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement: This product includes software
+ developed by the University of California, Berkeley and its contributors.
+
+ 4. Neither the name of the University 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 REGENTS 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 REGENTS 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. 3.2.3. The
+NetBSD Foundation, Inc.
+
+Copyright (c) 2003 The NetBSD Foundation, Inc. All rights reserved.
+
+This code is derived from software contributed to The NetBSD Foundation by Ben
+Collver <collver1 at attbi.com>
+
+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. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement: This product includes software
+ developed by the NetBSD Foundation, Inc. and its contributors.
+
+ 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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. 3.2.4. Theodore
+Ts'o.
+
+Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999. 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,
+ and the entire permission notice in its entirety, including the disclaimer
+ of warranties.
+
+ 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. he name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED. IN NO
+EVENT SHALL THE AUTHOR 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 NOT ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE. 3.2.5. Theo de Raadt and Damien Miller
+
+Copyright (c) 1995,1999 Theo de Raadt. All rights reserved. Copyright (c)
+2001-2002 Damien Miller. 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.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. 3.2.6. Todd C. Miller
+
+Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 3.2.7. Thomas
+Winischhofer
+
+Copyright (C) 2001-2004 Thomas Winischhofer
+
+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. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED 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 AUTHOR 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. 3.3. NVIDIA Corp
+
+Copyright (c) 1996 NVIDIA, Corp. All rights reserved.
+
+NOTICE TO USER: The source code is copyrighted under U.S. and international
+laws. NVIDIA, Corp. of Sunnyvale, California owns the copyright and as design
+patents pending on the design and interface of the NV chips. Users and
+possessors of this source code are hereby granted a nonexclusive, royalty-free
+copyright and design patent license to use this code in individual and
+commercial software.
+
+Any use of this source code must include, in the user documentation and
+internal comments to the code, notices to the end user as follows:
+
+Copyright (c) 1996 NVIDIA, Corp. NVIDIA design patents pending in the U.S. and
+foreign countries.
+
+NVIDIA, CORP. MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
+CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED
+WARRANTY OF ANY KIND. NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
+THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL NVIDIA, CORP. BE LIABLE
+FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY
+DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE. 3.4. GLX Public
+License
+
+GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
+
+Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
+grants permission to Recipient (defined below), under Recipient's copyrights
+in the Original Software (defined below), to use, copy, modify, merge,
+publish, distribute, sublicense and/or sell copies of Subject Software
+(defined below), and to permit persons to whom the Subject Software is
+furnished in accordance with this License to do the same, subject to all of
+the following terms and conditions, which Recipient accepts by engaging in any
+such use, copying, modifying, merging, publishing, distributing, sublicensing
+or selling:
+
+1. Definitions.
+
+ (a) "Original Software" means source code of computer software code which
+ is described in Exhibit A as Original Software.
+
+ (b) "Modifications" means any addition to or deletion from the substance
+ or structure of either the Original Software or any previous
+ Modifications. When Subject Software is released as a series of files, a
+ Modification means (i) any addition to or deletion from the contents of a
+ file containing Original Software or previous Modifications and (ii) any
+ new file that contains any part of the Original Code or previous
+ Modifications.
+
+ (c) "Subject Software" means the Original Software or Modifications or the
+ combination of the Original Software and Modifications, or portions of any
+ of the foregoing.
+
+ (d) "Recipient" means an individual or a legal entity exercising rights
+ under, and complying with all of the terms of, this License. For legal
+ entities, "Recipient" includes any entity which controls, is controlled
+ by, or is under common control with Recipient. For purposes of this
+ definition, "control" of an entity means (a) the power, direct or
+ indirect, to direct or manage such entity, or (b) ownership of fifty
+ percent (50%) or more of the outstanding shares or beneficial ownership of
+ such entity.
+
+2. Redistribution of Source Code Subject to These Terms. Redistributions of
+Subject Software in source code form must retain the notice set forth in
+Exhibit A, below, in every file. A copy of this License must be included in
+any documentation for such Subject Software where the recipients' rights
+relating to Subject Software are described. Recipient may distribute the
+source code version of Subject Software under a license of Recipient's choice,
+which may contain terms different from this License, provided that (i)
+Recipient is in compliance with the terms of this License, and (ii) the
+license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13 of
+this License, which terms may not be modified or superseded by any other terms
+of such license. If Recipient distributes the source code version under a
+different license Recipient must make it absolutely clear that any terms which
+differ from this License are offered by Recipient alone, not by SGI. Recipient
+hereby agrees to indemnify SGI for any liability incurred by SGI as a result
+of any such terms Recipient offers.
+
+3. Redistribution in Executable Form. The notice set forth in Exhibit A must
+be conspicuously included in any notice in an executable version of Subject
+Software, related documentation or collateral in which Recipient describes the
+user's rights relating to the Subject Software. Recipient may distribute the
+executable version of Subject Software under a license of Recipient's choice,
+which may contain terms different from this License, provided that (i)
+Recipient is in compliance with the terms of this License, and (ii) the
+license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
+this License, which terms may not be modified or superseded by any other terms
+of such license. If Recipient distributes the executable version under a
+different license Recipient must make it absolutely clear that any terms which
+differ from this License are offered by Recipient alone, not by SGI. Recipient
+hereby agrees to indemnify SGI for any liability incurred by SGI as a result
+of any such terms Recipient offers.
+
+4. Termination. This License and the rights granted hereunder will terminate
+automatically if Recipient fails to comply with terms herein and fails to cure
+such breach within 30 days of the breach. Any sublicense to the Subject
+Software which is properly granted shall survive any termination of this
+License absent termination by the terms of such sublicense. Provisions which,
+by their nature, must remain in effect beyond the termination of this License
+shall survive.
+
+5. No Trademark Rights. This License does not grant any rights to use any
+trade name, trademark or service mark whatsoever. No trade name, trademark or
+service mark of SGI may be used to endorse or promote products derived from
+the Subject Software without prior written permission of SGI.
+
+6. No Other Rights. This License does not grant any rights with respect to the
+OpenGL API or to any software or hardware implementation thereof or to any
+other software whatsoever, nor shall any other rights or licenses not
+expressly granted hereunder arise by implication, estoppel or otherwise with
+respect to the Subject Software. Title to and ownership of the Original
+Software at all times remains with SGI. All rights in the Original Software
+not expressly granted under this License are reserved.
+
+7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
+applicable laws and regulations in connection with use and distribution of the
+Subject Software, including but not limited to, all export and import control
+laws and regulations of the U.S. government and other countries. Recipient may
+not distribute Subject Software that (i) in any way infringes (directly or
+contributorily) the rights (including patent, copyright, trade secret,
+trademark or other intellectual property rights of any kind) of any other
+person or entity or (ii) breaches any representation or warranty, express,
+implied or statutory, which under any applicable law it might be deemed to
+have been distributed.
+
+8. Claims of Infringement. If Recipient at any time has knowledge of any one
+or more third party claims that reproduction, modification, use, distribution,
+import or sale of Subject Software (including particular functionality or code
+incorporated in Subject Software) infringes the third party's intellectual
+property rights, Recipient must place in a well-identified web page bearing
+the title "LEGAL" a description of each such claim and a description of the
+party making each such claim in sufficient detail that a user of the Subject
+Software will know whom to contact regarding the claim. Also, upon gaining
+such knowledge of any such claim, Recipient must conspicuously include the URL
+for such web page in the Exhibit A notice required under Sections 2 and 3,
+above, and in the text of any related documentation, license agreement or
+collateral in which Recipient describes end user's rights relating to the
+Subject Software. If Recipient obtains such knowledge after it makes Subject
+Software available to any other person or entity, Recipient shall take other
+steps (such as notifying appropriate mailing lists or newsgroups) reasonably
+calculated to inform those who received the Subject Software that new
+knowledge has been obtained.
+
+9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
+RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
+PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
+HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
+WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
+CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
+CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
+STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
+COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
+THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
+TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
+THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT
+ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
+THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
+
+11. Indemnity. Recipient shall be solely responsible for damages arising,
+directly or indirectly, out of its utilization of rights under this License.
+Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc. from
+and against any loss, liability, damages, costs or expenses (including the
+payment of reasonable attorneys fees) arising out of Recipient's use,
+modification, reproduction and distribution of the Subject Software or out of
+any representation or warranty made by Recipient.
+
+12. U.S. Government End Users. The Subject Software is a "commercial item"
+consisting of "commercial computer software" as such terms are defined in
+title 48 of the Code of Federal Regulations and all U.S. Government End Users
+acquire only the rights set forth in this License and are subject to the terms
+of this License.
+
+13. Miscellaneous. This License represents the complete agreement concerning
+subject matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed so as to achieve as nearly as
+possible the same economic effect as the original provision and the remainder
+of this License will remain in effect. This License shall be governed by and
+construed in accordance with the laws of the United States and the State of
+California as applied to agreements entered into and to be performed entirely
+within California between California residents. Any litigation relating to
+this License shall be subject to the exclusive jurisdiction of the Federal
+Courts of the Northern District of California (or, absent subject matter
+jurisdiction in such courts, the courts of the State of California), with
+venue lying exclusively in Santa Clara County, California, with the losing
+party responsible for costs, including without limitation, court costs and
+reasonable attorneys fees and expenses. The application of the United Nations
+Convention on Contracts for the International Sale of Goods is expressly
+excluded. Any law or regulation which provides that the language of a contract
+shall be construed against the drafter shall not apply to this License.
+
+Exhibit A
+
+The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and 13
+of the GLX Public License Version 1.0 (the "License"). You may not use this
+file except in compliance with those sections of the License. You may obtain a
+copy of the License at Silicon Graphics, Inc., attn: Legal Services, 2011 N.
+Shoreline Blvd., Mountain View, CA 94043 or at
+http://www.sgi.com/software/opensource/glx/license.html.
+
+Software distributed under the License is distributed on an "AS IS" basis. ALL
+WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
+INFRINGEMENT. See the License for the specific language governing rights and
+limitations under the License.
+
+The Original Software is GLX version 1.2 source code, released February, 1999.
+The developer of the Original Software is Silicon Graphics, Inc. Those
+portions of the Subject Software created by Silicon Graphics, Inc. are
+Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. 3.5. CID
+Font Code Public License
+
+CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
+
+Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
+hereby grants permission to Recipient (defined below), under SGI's copyrights
+in the Original Software (defined below), to use, copy, modify, merge,
+publish, distribute, sublicense and/or sell copies of Subject Software
+(defined below) in both source code and executable form, and to permit persons
+to whom the Subject Software is furnished in accordance with this License to
+do the same, subject to all of the following terms and conditions, which
+Recipient accepts by engaging in any such use, copying, modifying, merging,
+publication, distributing, sublicensing or selling:
+
+1. Definitions.
+
+ a. "Original Software" means source code of computer software code that is
+ described in Exhibit A as Original Software.
+
+ b. "Modifications" means any addition to or deletion from the substance or
+ structure of either the Original Software or any previous Modifications.
+ When Subject Software is released as a series of files, a Modification
+ means (i) any addition to or deletion from the contents of a file
+ containing Original Software or previous Modifications and (ii) any new
+ file that contains any part of the Original Code or previous
+ Modifications.
+
+ c. "Subject Software" means the Original Software or Modifications or the
+ combination of the Original Software and Modifications, or portions of any
+ of the foregoing.
+
+ d. "Recipient" means an individual or a legal entity exercising rights
+ under the terms of this License. For legal entities, "Recipient" includes
+ any entity that controls, is controlled by, or is under common control
+ with Recipient. For purposes of this definition, "control" of an entity
+ means (i) the power, direct or indirect, to direct or manage such entity,
+ or (ii) ownership of fifty percent (50%) or more of the outstanding shares
+ or beneficial ownership of such entity.
+
+ e. "Required Notice" means the notice set forth in Exhibit A to this
+ License.
+
+ f. "Accompanying Technology" means any software or other technology that
+ is not a Modification and that is distributed or made publicly available
+ by Recipient with the Subject Software. Separate software files that do
+ not contain any Original Software or any previous Modification shall not
+ be deemed a Modification, even if such software files are aggregated as
+ part of a product, or in any medium of storage, with any file that does
+ contain Original Software or any previous Modification.
+
+2. License Terms. All distribution of the Subject Software must be made
+subject to the terms of this License. A copy of this License and the Required
+Notice must be included in any documentation for Subject Software where
+Recipient's rights relating to Subject Software and/or any Accompanying
+Technology are described. Distributions of Subject Software in source code
+form must also include the Required Notice in every file distributed. In
+addition, a ReadMe file entitled "Important Legal Notice" must be distributed
+with each distribution of one or more files that incorporate Subject Software.
+That file must be included with distributions made in both source code and
+executable form. A copy of the License and the Required Notice must be
+included in that file. Recipient may distribute Accompanying Technology under
+a license of Recipient's choice, which may contain terms different from this
+License, provided that (i) Recipient is in compliance with the terms of this
+License, (ii) such other license terms do not modify or supersede the terms of
+this License as applicable to the Subject Software, (iii) Recipient hereby
+indemnifies SGI for any liability incurred by SGI as a result of the
+distribution of Accompanying Technology or the use of other license terms.
+
+3. Termination. This License and the rights granted hereunder will terminate
+automatically if Recipient fails to comply with terms herein and fails to cure
+such breach within 30 days of the breach. Any sublicense to the Subject
+Software that is properly granted shall survive any termination of this
+License absent termination by the terms of such sublicense. Provisions which,
+by their nature, must remain in effect beyond the termination of this License
+shall survive.
+
+4. Trademark Rights. This License does not grant any rights to use any trade
+name, trademark or service mark whatsoever. No trade name, trademark or
+service mark of SGI may be used to endorse or promote products derived from or
+incorporating any Subject Software without prior written permission of SGI.
+
+5. No Other Rights. No rights or licenses not expressly granted hereunder
+shall arise by implication, estoppel or otherwise. Title to and ownership of
+the Original Software at all times remains with SGI. All rights in the
+Original Software not expressly granted under this License are reserved.
+
+6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
+applicable laws and regulations in connection with use and distribution of the
+Subject Software, including but not limited to, all export and import control
+laws and regulations of the U.S. government and other countries. Recipient may
+not distribute Subject Software that (i) in any way infringes (directly or
+contributorily) the rights (including patent, copyright, trade secret,
+trademark or other intellectual property rights of any kind) of any other
+person or entity, or (ii) breaches any representation or warranty, express,
+implied or statutory, which under any applicable law it might be deemed to
+have been distributed.
+
+7. Claims of Infringement. If Recipient at any time has knowledge of any one
+or more third party claims that reproduction, modification, use, distribution,
+import or sale of Subject Software (including particular functionality or code
+incorporated in Subject Software) infringes the third party's intellectual
+property rights, Recipient must place in a well-identified web page bearing
+the title "LEGAL" a description of each such claim and a description of the
+party making each such claim in sufficient detail that a user of the Subject
+Software will know whom to contact regarding the claim. Also, upon gaining
+such knowledge of any such claim, Recipient must conspicuously include the URL
+for such web page in the Required Notice, and in the text of any related
+documentation, license agreement or collateral in which Recipient describes
+end user's rights relating to the Subject Software. If Recipient obtains such
+knowledge after it makes Subject Software available to any other person or
+entity, Recipient shall take other steps (such as notifying appropriate
+mailing lists or newsgroups) reasonably calculated to provide such knowledge
+to those who received the Subject Software.
+
+8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
+WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
+LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS,
+MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
+RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
+PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY
+SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
+ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
+HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
+WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
+CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
+ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
+LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
+
+10. Indemnity. Recipient shall be solely responsible for damages arising,
+directly or indirectly, out of its utilization of rights under this License.
+Recipient will defend, indemnify and hold SGI and its successors and assigns
+harmless from and against any loss, liability, damages, costs or expenses
+(including the payment of reasonable attorneys fees) arising out of
+(Recipient's use, modification, reproduction and distribution of the Subject
+Software or out of any representation or warranty made by Recipient.
+
+11. U.S. Government End Users. The Subject Software is a "commercial item"
+consisting of "commercial computer software" as such terms are defined in
+title 48 of the Code of Federal Regulations and all U.S. Government End Users
+acquire only the rights set forth in this License and are subject to the terms
+of this License.
+
+12. Miscellaneous. This License represents the complete agreement concerning
+subject matter hereof. If any provision of this License is held to be
+unenforceable by any judicial or administrative authority having proper
+jurisdiction with respect thereto, such provision shall be reformed so as to
+achieve as nearly as possible the same economic effect as the original
+provision and the remainder of this License will remain in effect. This
+License shall be governed by and construed in accordance with the laws of the
+United States and the State of California as applied to agreements entered
+into and to be performed entirely within California between California
+residents. Any litigation relating to this License shall be subject to the
+exclusive jurisdiction of the Federal Courts of the Northern District of
+California (or, absent subject matter jurisdiction in such courts, the courts
+of the State of California), with venue lying exclusively in Santa Clara
+County, California, with the losing party responsible for costs, including
+without limitation, court costs and reasonable attorneys fees and expenses.
+The application of the United Nations Convention on Contracts for the
+International Sale of Goods is expressly excluded. Any law or regulation that
+provides that the language of a contract shall be construed against the
+drafter shall not apply to this License.
+
+Exhibit A
+
+Copyright (c) 1994-1999 Silicon Graphics, Inc.
+
+The contents of this file are subject to the CID Font Code Public License
+Version 1.0 (the "License"). You may not use this file except in compliance
+with the License. You may obtain a copy of the License at Silicon Graphics,
+Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
+or at http://www.sgi.com/software/opensource/cid/license.html
+
+Software distributed under the License is distributed on an "AS IS" basis. ALL
+WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
+WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF
+NON-INFRINGEMENT. See the License for the specific language governing rights
+and limitations under the License.
+
+The Original Software (as defined in the License) is CID font code that was
+developed by Silicon Graphics, Inc. Those portions of the Subject Software (as
+defined in the License) that were created by Silicon Graphics, Inc. are
+Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
+
+[NOTE: When using this text in connection with Subject Software delivered
+solely in object code form, Recipient may replace the words "this file" with
+"this software" in both the first and second sentences.] 3.6. Bitstream Vera
+Fonts Copyright
+
+The fonts have a generous copyright, allowing derivative works (as long as
+"Bitstream" or "Vera" are not in the names), and full redistribution (so long
+as they are not *sold* by themselves). They can be be bundled, redistributed
+and sold with any software.
+
+The fonts are distributed under the following copyright:
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a
+trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated documentation
+files (the "Font Software"), to reproduce and distribute the Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit persons to
+whom the Font Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright and trademark notices and this permission notice shall be
+included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular the
+designs of glyphs or characters in the Fonts may be modified and additional
+glyphs or characters may be added to the Fonts, only if the fonts are renamed
+to names not containing either the words "Bitstream" or the word "Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream Vera"
+names.
+
+The Font Software may be sold as part of a larger software package but no copy
+of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
+SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO
+USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome Foundation,
+and Bitstream Inc., shall not be used in advertising or otherwise to promote
+the sale, use or other dealings in this Font Software without prior written
+authorization from the Gnome Foundation or Bitstream Inc., respectively. For
+further information, contact: fonts at gnome dot org. 3.7. Bigelow & Holmes
+Inc and URW++ GmbH Luxi font license
+
+Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
+code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a
+registered trademark of Bigelow & Holmes Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of these Fonts and associated documentation files (the "Font Software"), to
+deal in the Font Software, including without limitation the rights to use,
+copy, merge, publish, distribute, sublicense, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright and trademark notices and this permission notice shall be
+included in all copies of one or more of the Font Software.
+
+The Font Software may not be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may not be modified nor may
+additional glyphs or characters be added to the Fonts. This License becomes
+null and void when the Fonts or Font Software have been modified.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++
+GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY
+GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
+INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT
+SOFTWARE.
+
+Except as contained in this notice, the names of Bigelow & Holmes Inc. and
+URW++ GmbH. shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in this Font Software without prior written
+authorization from Bigelow & Holmes Inc. and URW++ GmbH.
+
+For further information, contact:
+
+info at urwpp.de or design at bigelowandholmes.com
+
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to zlib v1.2.3, which is included
+with JRE 7, JDK 7, and OpenJDK 7
+
+--- begin of LICENSE ---
+
+ version 1.2.3, July 18th, 2005
+
+ Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+ This software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
+
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
+
+ Jean-loup Gailly Mark Adler
+ jloup at gzip.org madler at alumni.caltech.edu
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
+
+%% This notice is provided with respect to the following which is
+included with JRE 7, JDK 7, and OpenJDK 7, except where noted:
+
+ Apache Derby 10.8.1.2 [included with JDK 7 only]
+ Apache Jakarta BCEL 5.2
+ Apache Jakarta Regexp 1.4
+ Apache Santuario XMLSec-Java 1.4.2
+ Apache Xalan-Java 2.7.1
+ Apache Xerces2 Java 2.10.0
+ Apache XML Resolver 1.1
+
+
+--- begin of LICENSE ---
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+--- end of LICENSE ---
+
+-------------------------------------------------------------------------------
-HEWLETT-PACKARD MAKES NO WARRANTY OF ANY KIND WITH REGARD
-TO THIS SOFWARE, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. Hewlett-Packard shall not be liable for errors
-contained herein or direct, indirect, special, incidental or
-consequential damages in connection with the furnishing,
-performance, or use of this material.
-
-END src/solaris/native/sun/awt/HPkeysym.h
-******************************************************
-******************************************************
-BEGIN src/solaris/native/sun/awt/Xrandr.h
-/*
- * $XFree86: xc/lib/Xrandr/Xrandr.h,v 1.9 2002/09/29 23:39:44 keithp Exp $
- *
- * Copyright © 2000 Compaq Computer Corporation, Inc.
- * Copyright © 2002 Hewlett-Packard Company, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Compaq not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. HP makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL COMPAQ
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Jim Gettys, HP Labs, HP.
- */
-
-
-END src/solaris/native/sun/awt/Xrandr.h
-******************************************************
-BEGIN src/solaris/native/sun/awt/extutil.h
-/*
- * $Xorg: extutil.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $
- *
-Copyright 1989, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- * Author: Jim Fulton, MIT The Open Group
- *
- * Xlib Extension-Writing Utilities
- *
- * This package contains utilities for writing the client API for various
- * protocol extensions. THESE INTERFACES ARE NOT PART OF THE X STANDARD AND
- * ARE SUBJECT TO CHANGE!
- */
-/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
-
-END src/solaris/native/sun/awt/extutil.h
-******************************************************
-BEGIN src/solaris/native/sun/awt/fontconfig.h
-/*
- * $RCSId: xc/lib/fontconfig/fontconfig/fontconfig.h,v 1.30 2002/09/26 00:17:27
-keithp Exp $
- *
- * Copyright © 2001 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
-
-END src/solaris/native/sun/awt/fontconfig.h
-******************************************************
-BEGIN src/solaris/native/sun/awt/list.c
-AND src/solaris/native/sun/awt/list.h
-AND src/solaris/native/sun/awt/multiVis.c
-AND src/solaris/native/sun/awt/multiVis.h
-AND src/solaris/native/sun/awt/wsutils.h
-
-Copyright (c) 1994 Hewlett-Packard Co.
-Copyright (c) 1996 X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the X Consortium.
-
-END src/solaris/native/sun/awt/list.c
-AND src/solaris/native/sun/awt/list.h
-AND src/solaris/native/sun/awt/multiVis.c
-AND src/solaris/native/sun/awt/multiVis.h
-AND src/solaris/native/sun/awt/wsutils.h
-
-*****************************************************************
-BEGIN src/solaris/native/sun/awt/randr.h
-
- *
- * Copyright © 2000, Compaq Computer Corporation,
- * Copyright © 2002, Hewlett Packard, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Compaq or HP not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. HP makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * HP DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL HP
- * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Jim Gettys, HP Labs, Hewlett-Packard, Inc.
-
-END src/solaris/native/sun/awt/randr.h
-*****************************************************
-
-BEGIN src/solaris/native/sun/java2d/opengl/J2D_GL/glx.h
- * Mesa 3-D graphics library
- * Version: 4.1
- *
- * Copyright (C) 1999-2002 Brian Paul All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-END src/solaris/native/sun/java2d/opengl/J2D_GL/glx.h
diff --git a/hotspot/agent/make/Makefile b/hotspot/agent/make/Makefile
index c1c8dda..981d2c8 100644
--- a/hotspot/agent/make/Makefile
+++ b/hotspot/agent/make/Makefile
@@ -48,17 +48,18 @@ sun.jvm.hotspot.asm.x86 \
sun.jvm.hotspot.bugspot \
sun.jvm.hotspot.bugspot.tree \
sun.jvm.hotspot.c1 \
+sun.jvm.hotspot.ci \
sun.jvm.hotspot.code \
sun.jvm.hotspot.compiler \
sun.jvm.hotspot.debugger \
sun.jvm.hotspot.debugger.amd64 \
+sun.jvm.hotspot.debugger.bsd \
+sun.jvm.hotspot.debugger.bsd.amd64 \
+sun.jvm.hotspot.debugger.bsd.x86 \
sun.jvm.hotspot.debugger.cdbg \
sun.jvm.hotspot.debugger.cdbg.basic \
sun.jvm.hotspot.debugger.cdbg.basic.amd64 \
sun.jvm.hotspot.debugger.cdbg.basic.x86 \
-sun.jvm.hotspot.debugger.dbx \
-sun.jvm.hotspot.debugger.dbx.sparc \
-sun.jvm.hotspot.debugger.dbx.x86 \
sun.jvm.hotspot.debugger.dummy \
sun.jvm.hotspot.debugger.ia64 \
sun.jvm.hotspot.debugger.linux \
@@ -76,7 +77,6 @@ sun.jvm.hotspot.debugger.remote.amd64 \
sun.jvm.hotspot.debugger.remote.sparc \
sun.jvm.hotspot.debugger.remote.x86 \
sun.jvm.hotspot.debugger.sparc \
-sun.jvm.hotspot.debugger.win32 \
sun.jvm.hotspot.debugger.win32.coff \
sun.jvm.hotspot.debugger.windbg \
sun.jvm.hotspot.debugger.windbg.amd64 \
@@ -91,9 +91,14 @@ sun.jvm.hotspot.interpreter \
sun.jvm.hotspot.jdi \
sun.jvm.hotspot.livejvm \
sun.jvm.hotspot.memory \
+sun.jvm.hotspot.opto \
sun.jvm.hotspot.oops \
+sun.jvm.hotspot.prims \
sun.jvm.hotspot.runtime \
sun.jvm.hotspot.runtime.amd64 \
+sun.jvm.hotspot.runtime.bsd \
+sun.jvm.hotspot.runtime.bsd_amd64 \
+sun.jvm.hotspot.runtime.bsd_x86 \
sun.jvm.hotspot.runtime.ia64 \
sun.jvm.hotspot.runtime.linux \
sun.jvm.hotspot.runtime.linux_amd64 \
@@ -139,17 +144,18 @@ sun/jvm/hotspot/asm/x86/*.java \
sun/jvm/hotspot/bugspot/*.java \
sun/jvm/hotspot/bugspot/tree/*.java \
sun/jvm/hotspot/c1/*.java \
+sun/jvm/hotspot/ci/*.java \
sun/jvm/hotspot/code/*.java \
sun/jvm/hotspot/compiler/*.java \
sun/jvm/hotspot/debugger/*.java \
sun/jvm/hotspot/debugger/amd64/*.java \
+sun/jvm/hotspot/debugger/bsd/*.java \
+sun/jvm/hotspot/debugger/bsd/amd64/*.java \
+sun/jvm/hotspot/debugger/bsd/x86/*.java \
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/x86/*.java \
-sun/jvm/hotspot/debugger/dbx/*.java \
-sun/jvm/hotspot/debugger/dbx/sparc/*.java \
-sun/jvm/hotspot/debugger/dbx/x86/*.java \
sun/jvm/hotspot/debugger/dummy/*.java \
sun/jvm/hotspot/debugger/ia64/*.java \
sun/jvm/hotspot/debugger/linux/*.java \
@@ -165,7 +171,6 @@ sun/jvm/hotspot/debugger/remote/amd64/*.java \
sun/jvm/hotspot/debugger/remote/sparc/*.java \
sun/jvm/hotspot/debugger/remote/x86/*.java \
sun/jvm/hotspot/debugger/sparc/*.java \
-sun/jvm/hotspot/debugger/win32/*.java \
sun/jvm/hotspot/debugger/win32/coff/*.java \
sun/jvm/hotspot/debugger/windbg/*.java \
sun/jvm/hotspot/debugger/windbg/ia64/*.java \
@@ -176,8 +181,13 @@ sun/jvm/hotspot/jdi/*.java \
sun/jvm/hotspot/livejvm/*.java \
sun/jvm/hotspot/memory/*.java \
sun/jvm/hotspot/oops/*.java \
+sun/jvm/hotspot/opto/*.java \
+sun/jvm/hotspot/prims/*.java \
sun/jvm/hotspot/runtime/*.java \
sun/jvm/hotspot/runtime/amd64/*.java \
+sun/jvm/hotspot/runtime/bsd/*.java \
+sun/jvm/hotspot/runtime/bsd_amd64/*.java \
+sun/jvm/hotspot/runtime/bsd_x86/*.java \
sun/jvm/hotspot/runtime/ia64/*.java \
sun/jvm/hotspot/runtime/linux/*.java \
sun/jvm/hotspot/runtime/linux_amd64/*.java \
diff --git a/hotspot/agent/make/saenv.sh b/hotspot/agent/make/saenv.sh
index b41a311..81c2d15 100644
--- a/hotspot/agent/make/saenv.sh
+++ b/hotspot/agent/make/saenv.sh
@@ -70,6 +70,14 @@ fi
SA_CLASSPATH=$STARTDIR/../build/classes:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar:$STARTDIR/lib/js.jar
+if [ ! -z "$SA_TYPEDB" ]; then
+ if [ ! -f $SA_TYPEDB ]; then
+ echo "$SA_TYPEDB is unreadable"
+ exit 1
+ fi
+ OPTIONS="-Dsun.jvm.hotspot.typedb=$SA_TYPEDB ${OPTIONS}"
+fi
+
OPTIONS="-Djava.system.class.loader=sun.jvm.hotspot.SALauncherLoader ${OPTIONS}"
SA_JAVA_CMD="$SA_PREFIX_CMD $SA_JAVA -showversion ${OPTIONS} -cp $SA_CLASSPATH $SA_OPTIONS"
diff --git a/hotspot/agent/make/saenv64.sh b/hotspot/agent/make/saenv64.sh
index 98d5885..c00dc0d 100644
--- a/hotspot/agent/make/saenv64.sh
+++ b/hotspot/agent/make/saenv64.sh
@@ -67,6 +67,14 @@ fi
SA_CLASSPATH=$STARTDIR/../build/classes:$STARTDIR/../src/share/lib/js.jar:$STARTDIR/sa.jar::$STARTDIR/lib/js.jar
+if [ ! -z "$SA_TYPEDB" ]; then
+ if [ ! -f $SA_TYPEDB ]; then
+ echo "$SA_TYPEDB is unreadable"
+ exit 1
+ fi
+ OPTIONS="-Dsun.jvm.hotspot.typedb=$SA_TYPEDB ${OPTIONS}"
+fi
+
OPTIONS="-Djava.system.class.loader=sun.jvm.hotspot.SALauncherLoader ${OPTIONS}"
SA_JAVA_CMD="$SA_PREFIX_CMD $SA_JAVA -d64 -showversion ${OPTIONS} -cp $SA_CLASSPATH $SA_OPTIONS"
diff --git a/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c b/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
new file mode 100644
index 0000000..85b07f7
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/BsdDebuggerLocal.c
@@ -0,0 +1,413 @@
+/*
+ * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include <stdlib.h>
+#include <jni.h>
+#include "libproc.h"
+
+#if defined(x86_64) && !defined(amd64)
+#define amd64 1
+#endif
+
+#ifdef i386
+#include "sun_jvm_hotspot_debugger_x86_X86ThreadContext.h"
+#endif
+
+#ifdef amd64
+#include "sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext.h"
+#endif
+
+#if defined(sparc) || defined(sparcv9)
+#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
+#endif
+
+static jfieldID p_ps_prochandle_ID = 0;
+static jfieldID threadList_ID = 0;
+static jfieldID loadObjectList_ID = 0;
+
+static jmethodID createClosestSymbol_ID = 0;
+static jmethodID createLoadObject_ID = 0;
+static jmethodID getThreadForThreadId_ID = 0;
+static jmethodID listAdd_ID = 0;
+
+#define CHECK_EXCEPTION_(value) if ((*env)->ExceptionOccurred(env)) { return value; }
+#define CHECK_EXCEPTION if ((*env)->ExceptionOccurred(env)) { return;}
+#define THROW_NEW_DEBUGGER_EXCEPTION_(str, value) { throw_new_debugger_exception(env, str); return value; }
+#define THROW_NEW_DEBUGGER_EXCEPTION(str) { throw_new_debugger_exception(env, str); return;}
+
+static void throw_new_debugger_exception(JNIEnv* env, const char* errMsg) {
+ (*env)->ThrowNew(env, (*env)->FindClass(env, "sun/jvm/hotspot/debugger/DebuggerException"), errMsg);
+}
+
+static struct ps_prochandle* get_proc_handle(JNIEnv* env, jobject this_obj) {
+ jlong ptr = (*env)->GetLongField(env, this_obj, p_ps_prochandle_ID);
+ return (struct ps_prochandle*)(intptr_t)ptr;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: init0
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0
+ (JNIEnv *env, jclass cls) {
+ jclass listClass;
+
+ if (init_libproc(getenv("LIBSAPROC_DEBUG") != NULL) != true) {
+ THROW_NEW_DEBUGGER_EXCEPTION("can't initialize libproc");
+ }
+
+ // fields we use
+ p_ps_prochandle_ID = (*env)->GetFieldID(env, cls, "p_ps_prochandle", "J");
+ CHECK_EXCEPTION;
+ threadList_ID = (*env)->GetFieldID(env, cls, "threadList", "Ljava/util/List;");
+ CHECK_EXCEPTION;
+ loadObjectList_ID = (*env)->GetFieldID(env, cls, "loadObjectList", "Ljava/util/List;");
+ CHECK_EXCEPTION;
+
+ // methods we use
+ createClosestSymbol_ID = (*env)->GetMethodID(env, cls, "createClosestSymbol",
+ "(Ljava/lang/String;J)Lsun/jvm/hotspot/debugger/cdbg/ClosestSymbol;");
+ CHECK_EXCEPTION;
+ createLoadObject_ID = (*env)->GetMethodID(env, cls, "createLoadObject",
+ "(Ljava/lang/String;JJ)Lsun/jvm/hotspot/debugger/cdbg/LoadObject;");
+ CHECK_EXCEPTION;
+ getThreadForThreadId_ID = (*env)->GetMethodID(env, cls, "getThreadForThreadId",
+ "(J)Lsun/jvm/hotspot/debugger/ThreadProxy;");
+ CHECK_EXCEPTION;
+ // java.util.List method we call
+ listClass = (*env)->FindClass(env, "java/util/List");
+ CHECK_EXCEPTION;
+ listAdd_ID = (*env)->GetMethodID(env, listClass, "add", "(Ljava/lang/Object;)Z");
+ CHECK_EXCEPTION;
+}
+
+JNIEXPORT jint JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getAddressSize
+ (JNIEnv *env, jclass cls)
+{
+#ifdef _LP64
+ return 8;
+#else
+ return 4;
+#endif
+
+}
+
+
+static void fillThreadsAndLoadObjects(JNIEnv* env, jobject this_obj, struct ps_prochandle* ph) {
+ int n = 0, i = 0;
+
+ // add threads
+ n = get_num_threads(ph);
+ for (i = 0; i < n; i++) {
+ jobject thread;
+ jobject threadList;
+ lwpid_t lwpid;
+
+ lwpid = get_lwp_id(ph, i);
+ thread = (*env)->CallObjectMethod(env, this_obj, getThreadForThreadId_ID,
+ (jlong)lwpid);
+ CHECK_EXCEPTION;
+ threadList = (*env)->GetObjectField(env, this_obj, threadList_ID);
+ CHECK_EXCEPTION;
+ (*env)->CallBooleanMethod(env, threadList, listAdd_ID, thread);
+ CHECK_EXCEPTION;
+ }
+
+ // add load objects
+ n = get_num_libs(ph);
+ for (i = 0; i < n; i++) {
+ uintptr_t base;
+ const char* name;
+ jobject loadObject;
+ jobject loadObjectList;
+
+ base = get_lib_base(ph, i);
+ name = get_lib_name(ph, i);
+ loadObject = (*env)->CallObjectMethod(env, this_obj, createLoadObject_ID,
+ (*env)->NewStringUTF(env, name), (jlong)0, (jlong)base);
+ CHECK_EXCEPTION;
+ loadObjectList = (*env)->GetObjectField(env, this_obj, loadObjectList_ID);
+ CHECK_EXCEPTION;
+ (*env)->CallBooleanMethod(env, loadObjectList, listAdd_ID, loadObject);
+ CHECK_EXCEPTION;
+ }
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: attach0
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__I
+ (JNIEnv *env, jobject this_obj, jint jpid) {
+
+ struct ps_prochandle* ph;
+ if ( (ph = Pgrab(jpid)) == NULL) {
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the process");
+ }
+ (*env)->SetLongField(env, this_obj, p_ps_prochandle_ID, (jlong)(intptr_t)ph);
+ fillThreadsAndLoadObjects(env, this_obj, ph);
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: attach0
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__Ljava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *env, jobject this_obj, jstring execName, jstring coreName) {
+ const char *execName_cstr;
+ const char *coreName_cstr;
+ jboolean isCopy;
+ struct ps_prochandle* ph;
+
+ execName_cstr = (*env)->GetStringUTFChars(env, execName, &isCopy);
+ CHECK_EXCEPTION;
+ coreName_cstr = (*env)->GetStringUTFChars(env, coreName, &isCopy);
+ CHECK_EXCEPTION;
+
+ if ( (ph = Pgrab_core(execName_cstr, coreName_cstr)) == NULL) {
+ (*env)->ReleaseStringUTFChars(env, execName, execName_cstr);
+ (*env)->ReleaseStringUTFChars(env, coreName, coreName_cstr);
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the core file");
+ }
+ (*env)->SetLongField(env, this_obj, p_ps_prochandle_ID, (jlong)(intptr_t)ph);
+ (*env)->ReleaseStringUTFChars(env, execName, execName_cstr);
+ (*env)->ReleaseStringUTFChars(env, coreName, coreName_cstr);
+ fillThreadsAndLoadObjects(env, this_obj, ph);
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: detach0
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_detach0
+ (JNIEnv *env, jobject this_obj) {
+ struct ps_prochandle* ph = get_proc_handle(env, this_obj);
+ if (ph != NULL) {
+ Prelease(ph);
+ }
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: lookupByName0
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0
+ (JNIEnv *env, jobject this_obj, jstring objectName, jstring symbolName) {
+ const char *objectName_cstr, *symbolName_cstr;
+ jlong addr;
+ jboolean isCopy;
+ struct ps_prochandle* ph = get_proc_handle(env, this_obj);
+
+ objectName_cstr = NULL;
+ if (objectName != NULL) {
+ objectName_cstr = (*env)->GetStringUTFChars(env, objectName, &isCopy);
+ CHECK_EXCEPTION_(0);
+ }
+ symbolName_cstr = (*env)->GetStringUTFChars(env, symbolName, &isCopy);
+ CHECK_EXCEPTION_(0);
+
+ addr = (jlong) lookup_symbol(ph, objectName_cstr, symbolName_cstr);
+
+ if (objectName_cstr != NULL) {
+ (*env)->ReleaseStringUTFChars(env, objectName, objectName_cstr);
+ }
+ (*env)->ReleaseStringUTFChars(env, symbolName, symbolName_cstr);
+ return addr;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: lookupByAddress0
+ * Signature: (J)Lsun/jvm/hotspot/debugger/cdbg/ClosestSymbol;
+ */
+JNIEXPORT jobject JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByAddress0
+ (JNIEnv *env, jobject this_obj, jlong addr) {
+ uintptr_t offset;
+ const char* sym = NULL;
+
+ struct ps_prochandle* ph = get_proc_handle(env, this_obj);
+ sym = symbol_for_pc(ph, (uintptr_t) addr, &offset);
+ if (sym == NULL) return 0;
+ return (*env)->CallObjectMethod(env, this_obj, createClosestSymbol_ID,
+ (*env)->NewStringUTF(env, sym), (jlong)offset);
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: readBytesFromProcess0
+ * Signature: (JJ)Lsun/jvm/hotspot/debugger/ReadResult;
+ */
+JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0
+ (JNIEnv *env, jobject this_obj, jlong addr, jlong numBytes) {
+
+ jboolean isCopy;
+ jbyteArray array;
+ jbyte *bufPtr;
+ ps_err_e err;
+
+ array = (*env)->NewByteArray(env, numBytes);
+ CHECK_EXCEPTION_(0);
+ bufPtr = (*env)->GetByteArrayElements(env, array, &isCopy);
+ CHECK_EXCEPTION_(0);
+
+ err = ps_pread(get_proc_handle(env, this_obj), (psaddr_t) (uintptr_t)addr, bufPtr, numBytes);
+ (*env)->ReleaseByteArrayElements(env, array, bufPtr, 0);
+ return (err == PS_OK)? array : 0;
+}
+
+JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+
+ struct reg gregs;
+ jboolean isCopy;
+ jlongArray array;
+ jlong *regs;
+
+ struct ps_prochandle* ph = get_proc_handle(env, this_obj);
+ if (get_lwp_regs(ph, lwp_id, &gregs) != true) {
+ THROW_NEW_DEBUGGER_EXCEPTION_("get_thread_regs failed for a lwp", 0);
+ }
+
+#undef NPRGREG
+#ifdef i386
+#define NPRGREG sun_jvm_hotspot_debugger_x86_X86ThreadContext_NPRGREG
+#endif
+#ifdef ia64
+#define NPRGREG IA64_REG_COUNT
+#endif
+#ifdef amd64
+#define NPRGREG sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_NPRGREG
+#endif
+#if defined(sparc) || defined(sparcv9)
+#define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG
+#endif
+
+ array = (*env)->NewLongArray(env, NPRGREG);
+ CHECK_EXCEPTION_(0);
+ regs = (*env)->GetLongArrayElements(env, array, &isCopy);
+
+#undef REG_INDEX
+
+#ifdef i386
+#define REG_INDEX(reg) sun_jvm_hotspot_debugger_x86_X86ThreadContext_##reg
+
+ regs[REG_INDEX(GS)] = (uintptr_t) gregs.r_gs;
+ regs[REG_INDEX(FS)] = (uintptr_t) gregs.r_fs;
+ regs[REG_INDEX(ES)] = (uintptr_t) gregs.r_es;
+ regs[REG_INDEX(DS)] = (uintptr_t) gregs.r_ds;
+ regs[REG_INDEX(EDI)] = (uintptr_t) gregs.r_edi;
+ regs[REG_INDEX(ESI)] = (uintptr_t) gregs.r_esi;
+ regs[REG_INDEX(FP)] = (uintptr_t) gregs.r_ebp;
+ regs[REG_INDEX(SP)] = (uintptr_t) gregs.r_isp;
+ regs[REG_INDEX(EBX)] = (uintptr_t) gregs.r_ebx;
+ regs[REG_INDEX(EDX)] = (uintptr_t) gregs.r_edx;
+ regs[REG_INDEX(ECX)] = (uintptr_t) gregs.r_ecx;
+ regs[REG_INDEX(EAX)] = (uintptr_t) gregs.r_eax;
+ regs[REG_INDEX(PC)] = (uintptr_t) gregs.r_eip;
+ regs[REG_INDEX(CS)] = (uintptr_t) gregs.r_cs;
+ regs[REG_INDEX(SS)] = (uintptr_t) gregs.r_ss;
+
+#endif /* i386 */
+
+#if ia64
+ regs = (*env)->GetLongArrayElements(env, array, &isCopy);
+ int i;
+ for (i = 0; i < NPRGREG; i++ ) {
+ regs[i] = 0xDEADDEAD;
+ }
+#endif /* ia64 */
+
+#ifdef amd64
+#define REG_INDEX(reg) sun_jvm_hotspot_debugger_amd64_AMD64ThreadContext_##reg
+
+ regs[REG_INDEX(R15)] = gregs.r_r15;
+ regs[REG_INDEX(R14)] = gregs.r_r14;
+ regs[REG_INDEX(R13)] = gregs.r_r13;
+ regs[REG_INDEX(R12)] = gregs.r_r12;
+ regs[REG_INDEX(RBP)] = gregs.r_rbp;
+ regs[REG_INDEX(RBX)] = gregs.r_rbx;
+ regs[REG_INDEX(R11)] = gregs.r_r11;
+ regs[REG_INDEX(R10)] = gregs.r_r10;
+ regs[REG_INDEX(R9)] = gregs.r_r9;
+ regs[REG_INDEX(R8)] = gregs.r_r8;
+ regs[REG_INDEX(RAX)] = gregs.r_rax;
+ regs[REG_INDEX(RCX)] = gregs.r_rcx;
+ regs[REG_INDEX(RDX)] = gregs.r_rdx;
+ regs[REG_INDEX(RSI)] = gregs.r_rsi;
+ regs[REG_INDEX(RDI)] = gregs.r_rdi;
+ regs[REG_INDEX(RIP)] = gregs.r_rip;
+ regs[REG_INDEX(CS)] = gregs.r_cs;
+ regs[REG_INDEX(RSP)] = gregs.r_rsp;
+ regs[REG_INDEX(SS)] = gregs.r_ss;
+// regs[REG_INDEX(FSBASE)] = gregs.fs_base;
+// regs[REG_INDEX(GSBASE)] = gregs.gs_base;
+// regs[REG_INDEX(DS)] = gregs.ds;
+// regs[REG_INDEX(ES)] = gregs.es;
+// regs[REG_INDEX(FS)] = gregs.fs;
+// regs[REG_INDEX(GS)] = gregs.gs;
+
+#endif /* amd64 */
+
+#if defined(sparc) || defined(sparcv9)
+
+#define REG_INDEX(reg) sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_##reg
+
+#ifdef _LP64
+ regs[REG_INDEX(R_PSR)] = gregs.tstate;
+ regs[REG_INDEX(R_PC)] = gregs.tpc;
+ regs[REG_INDEX(R_nPC)] = gregs.tnpc;
+ regs[REG_INDEX(R_Y)] = gregs.y;
+#else
+ regs[REG_INDEX(R_PSR)] = gregs.psr;
+ regs[REG_INDEX(R_PC)] = gregs.pc;
+ regs[REG_INDEX(R_nPC)] = gregs.npc;
+ regs[REG_INDEX(R_Y)] = gregs.y;
+#endif
+ regs[REG_INDEX(R_G0)] = 0 ;
+ regs[REG_INDEX(R_G1)] = gregs.u_regs[0];
+ regs[REG_INDEX(R_G2)] = gregs.u_regs[1];
+ regs[REG_INDEX(R_G3)] = gregs.u_regs[2];
+ regs[REG_INDEX(R_G4)] = gregs.u_regs[3];
+ regs[REG_INDEX(R_G5)] = gregs.u_regs[4];
+ regs[REG_INDEX(R_G6)] = gregs.u_regs[5];
+ regs[REG_INDEX(R_G7)] = gregs.u_regs[6];
+ regs[REG_INDEX(R_O0)] = gregs.u_regs[7];
+ regs[REG_INDEX(R_O1)] = gregs.u_regs[8];
+ regs[REG_INDEX(R_O2)] = gregs.u_regs[ 9];
+ regs[REG_INDEX(R_O3)] = gregs.u_regs[10];
+ regs[REG_INDEX(R_O4)] = gregs.u_regs[11];
+ regs[REG_INDEX(R_O5)] = gregs.u_regs[12];
+ regs[REG_INDEX(R_O6)] = gregs.u_regs[13];
+ regs[REG_INDEX(R_O7)] = gregs.u_regs[14];
+#endif /* sparc */
+
+
+ (*env)->ReleaseLongArrayElements(env, array, regs, JNI_COMMIT);
+ return array;
+}
diff --git a/hotspot/agent/src/os/bsd/Makefile b/hotspot/agent/src/os/bsd/Makefile
new file mode 100644
index 0000000..65909bd
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/Makefile
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+ARCH := $(shell if ([ `uname -m` = "ia64" ]) ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+GCC = gcc
+
+JAVAH = ${JAVA_HOME}/bin/javah
+
+SOURCES = salibelf.c \
+ symtab.c \
+ libproc_impl.c \
+ ps_proc.c \
+ ps_core.c \
+ hsearch_r.c \
+ BsdDebuggerLocal.c
+
+INCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/$(shell uname -s | tr "[:upper:]" "[:lower:]")
+
+OBJS = $(SOURCES:.c=.o)
+
+LIBS = -lutil -lthread_db
+
+CFLAGS = -c -fPIC -g -Wall -D_ALLBSD_SOURCE -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
+
+LIBSA = $(ARCH)/libsaproc.so
+
+all: $(LIBSA)
+
+BsdDebuggerLocal.o: BsdDebuggerLocal.c
+ $(JAVAH) -jni -classpath ../../../../../build/bsd-i586/hotspot/outputdir/bsd_i486_compiler2/generated/saclasses \
+ sun.jvm.hotspot.debugger.x86.X86ThreadContext \
+ sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
+ $(GCC) $(CFLAGS) $<
+
+.c.obj:
+ $(GCC) $(CFLAGS)
+
+ifndef LDNOMAP
+ LFLAGS_LIBSA = -Xlinker --version-script=mapfile
+endif
+
+$(LIBSA): $(OBJS) mapfile
+ if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi
+ $(GCC) -shared $(LFLAGS_LIBSA) -o $(LIBSA) $(OBJS) $(LIBS)
+
+test.o: $(LIBSA) test.c
+ $(GCC) -c -o test.o -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES) test.c
+
+test: test.o
+ $(GCC) -o test test.o -L$(ARCH) -lsaproc $(LIBS)
+
+clean:
+ rm -f $(LIBSA)
+ rm -f $(OBJS)
+ rm -f test.o
+ -rmdir $(ARCH)
+
diff --git a/hotspot/agent/src/os/bsd/StubDebuggerLocal.c b/hotspot/agent/src/os/bsd/StubDebuggerLocal.c
new file mode 100644
index 0000000..bce0bab
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/StubDebuggerLocal.c
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#include <stdlib.h>
+#include <jni.h>
+
+#define CHECK_EXCEPTION_(value) if ((*env)->ExceptionOccurred(env)) { return value; }
+#define CHECK_EXCEPTION if ((*env)->ExceptionOccurred(env)) { return;}
+#define THROW_NEW_DEBUGGER_EXCEPTION_(str, value) { throw_new_debugger_exception(env, str); return value; }
+#define THROW_NEW_DEBUGGER_EXCEPTION(str) { throw_new_debugger_exception(env, str); return;}
+
+static void throw_new_debugger_exception(JNIEnv* env, const char* errMsg) {
+ (*env)->ThrowNew(env, (*env)->FindClass(env, "sun/jvm/hotspot/debugger/DebuggerException"), errMsg);
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: init0
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0
+ (JNIEnv *env, jclass cls) {
+}
+
+JNIEXPORT jint JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getAddressSize
+ (JNIEnv *env, jclass cls)
+{
+#ifdef _LP64
+ return 8;
+#else
+ return 4;
+#endif
+
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: attach0
+ * Signature: (I)V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__I
+ (JNIEnv *env, jobject this_obj, jint jpid) {
+
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the process");
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: attach0
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__Ljava_lang_String_2Ljava_lang_String_2
+ (JNIEnv *env, jobject this_obj, jstring execName, jstring coreName) {
+ THROW_NEW_DEBUGGER_EXCEPTION("Can't attach to the core file");
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: detach0
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_detach0
+ (JNIEnv *env, jobject this_obj) {
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: lookupByName0
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)J
+ */
+JNIEXPORT jlong JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0
+ (JNIEnv *env, jobject this_obj, jstring objectName, jstring symbolName) {
+ return 0;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: lookupByAddress0
+ * Signature: (J)Lsun/jvm/hotspot/debugger/cdbg/ClosestSymbol;
+ */
+JNIEXPORT jobject JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByAddress0
+ (JNIEnv *env, jobject this_obj, jlong addr) {
+ return 0;
+}
+
+/*
+ * Class: sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal
+ * Method: readBytesFromProcess0
+ * Signature: (JJ)Lsun/jvm/hotspot/debugger/ReadResult;
+ */
+JNIEXPORT jbyteArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0
+ (JNIEnv *env, jobject this_obj, jlong addr, jlong numBytes) {
+ return 0;
+}
+
+JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
diff --git a/hotspot/agent/src/os/bsd/elfmacros.h b/hotspot/agent/src/os/bsd/elfmacros.h
new file mode 100644
index 0000000..0d089c2
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/elfmacros.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 _ELFMACROS_H_
+#define _ELFMACROS_H_
+
+#define ELF_NHDR Elf_Note
+
+#if defined(_LP64)
+#define ELF_EHDR Elf64_Ehdr
+#define ELF_SHDR Elf64_Shdr
+#define ELF_PHDR Elf64_Phdr
+#define ELF_SYM Elf64_Sym
+#define ELF_DYN Elf64_Dyn
+#define ELF_ADDR Elf64_Addr
+
+#ifndef ELF_ST_TYPE
+#define ELF_ST_TYPE ELF64_ST_TYPE
+#endif
+
+#else
+
+#define ELF_EHDR Elf32_Ehdr
+#define ELF_SHDR Elf32_Shdr
+#define ELF_PHDR Elf32_Phdr
+#define ELF_SYM Elf32_Sym
+#define ELF_DYN Elf32_Dyn
+#define ELF_ADDR Elf32_Addr
+
+#ifndef ELF_ST_TYPE
+#define ELF_ST_TYPE ELF32_ST_TYPE
+#endif
+
+#endif
+
+
+#endif /* _ELFMACROS_H_ */
diff --git a/hotspot/agent/src/os/bsd/libproc.h b/hotspot/agent/src/os/bsd/libproc.h
new file mode 100644
index 0000000..74bb84c
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/libproc.h
@@ -0,0 +1,127 @@
+/*
+ * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef _LIBPROC_H_
+#define _LIBPROC_H_
+
+#include <unistd.h>
+#include <stdint.h>
+#include <machine/reg.h>
+#include <proc_service.h>
+
+#if defined(sparc) || defined(sparcv9)
+/*
+ If _LP64 is defined ptrace.h should be taken from /usr/include/asm-sparc64
+ otherwise it should be from /usr/include/asm-sparc
+ These two files define pt_regs structure differently
+*/
+#ifdef _LP64
+#include "asm-sparc64/ptrace.h"
+#else
+#include "asm-sparc/ptrace.h"
+#endif
+
+#endif //sparc or sparcv9
+
+/************************************************************************************
+
+0. This is very minimal subset of Solaris libproc just enough for current application.
+Please note that the bulk of the functionality is from proc_service interface. This
+adds Pgrab__ and some missing stuff. We hide the difference b/w live process and core
+file by this interface.
+
+1. pthread_id is unique. We store this in OSThread::_pthread_id in JVM code.
+
+2. All threads see the same pid when they call getpid().
+We used to save the result of ::getpid() call in OSThread::_thread_id.
+Because gettid returns actual pid of thread (lwp id), this is
+unique again. We therefore use OSThread::_thread_id as unique identifier.
+
+3. There is a unique LWP id under both thread libraries. libthread_db maps pthread_id
+to its underlying lwp_id under both the thread libraries. thread_info.lwp_id stores
+lwp_id of the thread. The lwp id is nothing but the actual pid of clone'd processes. But
+unfortunately libthread_db does not work very well for core dumps. So, we get pthread_id
+only for processes. For core dumps, we don't use libthread_db at all (like gdb).
+
+4. ptrace operates on this LWP id under both the thread libraries. When we say 'pid' for
+ptrace call, we refer to lwp_id of the thread.
+
+5. for core file, we parse ELF files and read data from them. For processes we use
+combination of ptrace and /proc calls.
+
+*************************************************************************************/
+
+// This C bool type must be int for compatibility with BSD calls and
+// it would be a mistake to equivalence it to C++ bool on many platforms
+
+typedef int bool;
+#define true 1
+#define false 0
+
+struct ps_prochandle;
+
+// attach to a process
+struct ps_prochandle* Pgrab(pid_t pid);
+
+// attach to a core dump
+struct ps_prochandle* Pgrab_core(const char* execfile, const char* corefile);
+
+// release a process or core
+void Prelease(struct ps_prochandle* ph);
+
+// functions not directly available in Solaris libproc
+
+// initialize libproc (call this only once per app)
+// pass true to make library verbose
+bool init_libproc(bool verbose);
+
+// get number of threads
+int get_num_threads(struct ps_prochandle* ph);
+
+// get lwp_id of n'th thread
+lwpid_t get_lwp_id(struct ps_prochandle* ph, int index);
+
+// get regs for a given lwp
+bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lid, struct reg* regs);
+
+// get number of shared objects
+int get_num_libs(struct ps_prochandle* ph);
+
+// get name of n'th lib
+const char* get_lib_name(struct ps_prochandle* ph, int index);
+
+// get base of lib
+uintptr_t get_lib_base(struct ps_prochandle* ph, int index);
+
+// returns true if given library is found in lib list
+bool find_lib(struct ps_prochandle* ph, const char *lib_name);
+
+// symbol lookup
+uintptr_t lookup_symbol(struct ps_prochandle* ph, const char* object_name,
+ const char* sym_name);
+
+// address->nearest symbol lookup. return NULL for no symbol
+const char* symbol_for_pc(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* poffset);
+
+#endif //__LIBPROC_H_
diff --git a/hotspot/agent/src/os/bsd/libproc_impl.c b/hotspot/agent/src/os/bsd/libproc_impl.c
new file mode 100644
index 0000000..4f2d282
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/libproc_impl.c
@@ -0,0 +1,452 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <fcntl.h>
+#include <thread_db.h>
+#include "libproc_impl.h"
+
+static const char* alt_root = NULL;
+static int alt_root_len = -1;
+
+#define SA_ALTROOT "SA_ALTROOT"
+
+static void init_alt_root() {
+ if (alt_root_len == -1) {
+ alt_root = getenv(SA_ALTROOT);
+ if (alt_root) {
+ alt_root_len = strlen(alt_root);
+ } else {
+ alt_root_len = 0;
+ }
+ }
+}
+
+int pathmap_open(const char* name) {
+ int fd;
+ char alt_path[PATH_MAX + 1];
+
+ init_alt_root();
+ fd = open(name, O_RDONLY);
+ if (fd >= 0) {
+ return fd;
+ }
+
+ if (alt_root_len > 0) {
+ strcpy(alt_path, alt_root);
+ strcat(alt_path, name);
+ fd = open(alt_path, O_RDONLY);
+ if (fd >= 0) {
+ print_debug("path %s substituted for %s\n", alt_path, name);
+ return fd;
+ }
+
+ if (strrchr(name, '/')) {
+ strcpy(alt_path, alt_root);
+ strcat(alt_path, strrchr(name, '/'));
+ fd = open(alt_path, O_RDONLY);
+ if (fd >= 0) {
+ print_debug("path %s substituted for %s\n", alt_path, name);
+ return fd;
+ }
+ }
+ }
+
+ return -1;
+}
+
+static bool _libsaproc_debug;
+
+void print_debug(const char* format,...) {
+ if (_libsaproc_debug) {
+ va_list alist;
+
+ va_start(alist, format);
+ fputs("libsaproc DEBUG: ", stderr);
+ vfprintf(stderr, format, alist);
+ va_end(alist);
+ }
+}
+
+bool is_debug() {
+ return _libsaproc_debug;
+}
+
+// initialize libproc
+bool init_libproc(bool debug) {
+ // init debug mode
+ _libsaproc_debug = debug;
+
+ // initialize the thread_db library
+ if (td_init() != TD_OK) {
+ print_debug("libthread_db's td_init failed\n");
+ return false;
+ }
+
+ return true;
+}
+
+static void destroy_lib_info(struct ps_prochandle* ph) {
+ lib_info* lib = ph->libs;
+ while (lib) {
+ lib_info *next = lib->next;
+ if (lib->symtab) {
+ destroy_symtab(lib->symtab);
+ }
+ free(lib);
+ lib = next;
+ }
+}
+
+static void destroy_thread_info(struct ps_prochandle* ph) {
+ thread_info* thr = ph->threads;
+ while (thr) {
+ thread_info *next = thr->next;
+ free(thr);
+ thr = next;
+ }
+}
+
+// ps_prochandle cleanup
+
+// ps_prochandle cleanup
+void Prelease(struct ps_prochandle* ph) {
+ // do the "derived class" clean-up first
+ ph->ops->release(ph);
+ destroy_lib_info(ph);
+ destroy_thread_info(ph);
+ free(ph);
+}
+
+lib_info* add_lib_info(struct ps_prochandle* ph, const char* libname, uintptr_t base) {
+ return add_lib_info_fd(ph, libname, -1, base);
+}
+
+lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd, uintptr_t base) {
+ lib_info* newlib;
+
+ if ( (newlib = (lib_info*) calloc(1, sizeof(struct lib_info))) == NULL) {
+ print_debug("can't allocate memory for lib_info\n");
+ return NULL;
+ }
+
+ strncpy(newlib->name, libname, sizeof(newlib->name));
+ newlib->base = base;
+
+ if (fd == -1) {
+ if ( (newlib->fd = pathmap_open(newlib->name)) < 0) {
+ print_debug("can't open shared object %s\n", newlib->name);
+ free(newlib);
+ return NULL;
+ }
+ } else {
+ newlib->fd = fd;
+ }
+
+ // check whether we have got an ELF file. /proc/<pid>/map
+ // gives out all file mappings and not just shared objects
+ if (is_elf_file(newlib->fd) == false) {
+ close(newlib->fd);
+ free(newlib);
+ return NULL;
+ }
+
+ newlib->symtab = build_symtab(newlib->fd);
+ if (newlib->symtab == NULL) {
+ print_debug("symbol table build failed for %s\n", newlib->name);
+ }
+ else {
+ print_debug("built symbol table for %s\n", newlib->name);
+ }
+
+ // even if symbol table building fails, we add the lib_info.
+ // This is because we may need to read from the ELF file for core file
+ // address read functionality. lookup_symbol checks for NULL symtab.
+ if (ph->libs) {
+ ph->lib_tail->next = newlib;
+ ph->lib_tail = newlib;
+ } else {
+ ph->libs = ph->lib_tail = newlib;
+ }
+ ph->num_libs++;
+
+ return newlib;
+}
+
+// lookup for a specific symbol
+uintptr_t lookup_symbol(struct ps_prochandle* ph, const char* object_name,
+ const char* sym_name) {
+ // ignore object_name. search in all libraries
+ // FIXME: what should we do with object_name?? The library names are obtained
+ // by parsing /proc/<pid>/maps, which may not be the same as object_name.
+ // What we need is a utility to map object_name to real file name, something
+ // dlopen() does by looking at LD_LIBRARY_PATH and /etc/ld.so.cache. For
+ // now, we just ignore object_name and do a global search for the symbol.
+
+ lib_info* lib = ph->libs;
+ while (lib) {
+ if (lib->symtab) {
+ uintptr_t res = search_symbol(lib->symtab, lib->base, sym_name, NULL);
+ if (res) return res;
+ }
+ lib = lib->next;
+ }
+
+ print_debug("lookup failed for symbol '%s' in obj '%s'\n",
+ sym_name, object_name);
+ return (uintptr_t) NULL;
+}
+
+
+const char* symbol_for_pc(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* poffset) {
+ const char* res = NULL;
+ lib_info* lib = ph->libs;
+ while (lib) {
+ if (lib->symtab && addr >= lib->base) {
+ res = nearest_symbol(lib->symtab, addr - lib->base, poffset);
+ if (res) return res;
+ }
+ lib = lib->next;
+ }
+ return NULL;
+}
+
+// add a thread to ps_prochandle
+thread_info* add_thread_info(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id) {
+ thread_info* newthr;
+ if ( (newthr = (thread_info*) calloc(1, sizeof(thread_info))) == NULL) {
+ print_debug("can't allocate memory for thread_info\n");
+ return NULL;
+ }
+
+ // initialize thread info
+ newthr->pthread_id = pthread_id;
+ newthr->lwp_id = lwp_id;
+
+ // add new thread to the list
+ newthr->next = ph->threads;
+ ph->threads = newthr;
+ ph->num_threads++;
+ return newthr;
+}
+
+
+// struct used for client data from thread_db callback
+struct thread_db_client_data {
+ struct ps_prochandle* ph;
+ thread_info_callback callback;
+};
+
+// callback function for libthread_db
+static int thread_db_callback(const td_thrhandle_t *th_p, void *data) {
+ struct thread_db_client_data* ptr = (struct thread_db_client_data*) data;
+ td_thrinfo_t ti;
+ td_err_e err;
+
+ memset(&ti, 0, sizeof(ti));
+ err = td_thr_get_info(th_p, &ti);
+ if (err != TD_OK) {
+ print_debug("libthread_db : td_thr_get_info failed, can't get thread info\n");
+ return err;
+ }
+
+ print_debug("thread_db : pthread %d (lwp %d)\n", ti.ti_tid, ti.ti_lid);
+
+ if (ptr->callback(ptr->ph, (pthread_t)ti.ti_tid, ti.ti_lid) != true)
+ return TD_ERR;
+
+ return TD_OK;
+}
+
+// read thread_info using libthread_db
+bool read_thread_info(struct ps_prochandle* ph, thread_info_callback cb) {
+ struct thread_db_client_data mydata;
+ td_thragent_t* thread_agent = NULL;
+ if (td_ta_new(ph, &thread_agent) != TD_OK) {
+ print_debug("can't create libthread_db agent\n");
+ return false;
+ }
+
+ mydata.ph = ph;
+ mydata.callback = cb;
+
+ // we use libthread_db iterator to iterate thru list of threads.
+ if (td_ta_thr_iter(thread_agent, thread_db_callback, &mydata,
+ TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY,
+ TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS) != TD_OK) {
+ td_ta_delete(thread_agent);
+ return false;
+ }
+
+ // delete thread agent
+ td_ta_delete(thread_agent);
+ return true;
+}
+
+
+// get number of threads
+int get_num_threads(struct ps_prochandle* ph) {
+ return ph->num_threads;
+}
+
+// get lwp_id of n'th thread
+lwpid_t get_lwp_id(struct ps_prochandle* ph, int index) {
+ int count = 0;
+ thread_info* thr = ph->threads;
+ while (thr) {
+ if (count == index) {
+ return thr->lwp_id;
+ }
+ count++;
+ thr = thr->next;
+ }
+ return -1;
+}
+
+// get regs for a given lwp
+bool get_lwp_regs(struct ps_prochandle* ph, lwpid_t lwp_id, struct reg* regs) {
+ return ph->ops->get_lwp_regs(ph, lwp_id, regs);
+}
+
+// get number of shared objects
+int get_num_libs(struct ps_prochandle* ph) {
+ return ph->num_libs;
+}
+
+// get name of n'th solib
+const char* get_lib_name(struct ps_prochandle* ph, int index) {
+ int count = 0;
+ lib_info* lib = ph->libs;
+ while (lib) {
+ if (count == index) {
+ return lib->name;
+ }
+ count++;
+ lib = lib->next;
+ }
+ return NULL;
+}
+
+// get base address of a lib
+uintptr_t get_lib_base(struct ps_prochandle* ph, int index) {
+ int count = 0;
+ lib_info* lib = ph->libs;
+ while (lib) {
+ if (count == index) {
+ return lib->base;
+ }
+ count++;
+ lib = lib->next;
+ }
+ return (uintptr_t)NULL;
+}
+
+bool find_lib(struct ps_prochandle* ph, const char *lib_name) {
+ lib_info *p = ph->libs;
+ while (p) {
+ if (strcmp(p->name, lib_name) == 0) {
+ return true;
+ }
+ p = p->next;
+ }
+ return false;
+}
+
+//--------------------------------------------------------------------------
+// proc service functions
+
+// ps_pglobal_lookup() looks up the symbol sym_name in the symbol table
+// of the load object object_name in the target process identified by ph.
+// It returns the symbol's value as an address in the target process in
+// *sym_addr.
+
+ps_err_e ps_pglobal_lookup(struct ps_prochandle *ph, const char *object_name,
+ const char *sym_name, psaddr_t *sym_addr) {
+ *sym_addr = (psaddr_t) lookup_symbol(ph, object_name, sym_name);
+ return (*sym_addr ? PS_OK : PS_NOSYM);
+}
+
+// read "size" bytes info "buf" from address "addr"
+ps_err_e ps_pread(struct ps_prochandle *ph, psaddr_t addr,
+ void *buf, size_t size) {
+ return ph->ops->p_pread(ph, (uintptr_t) addr, buf, size)? PS_OK: PS_ERR;
+}
+
+// write "size" bytes of data to debuggee at address "addr"
+ps_err_e ps_pwrite(struct ps_prochandle *ph, psaddr_t addr,
+ const void *buf, size_t size) {
+ return ph->ops->p_pwrite(ph, (uintptr_t)addr, buf, size)? PS_OK: PS_ERR;
+}
+
+// fill in ptrace_lwpinfo for lid
+ps_err_e ps_linfo(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo) {
+ return ph->ops->get_lwp_info(ph, lwp_id, linfo)? PS_OK: PS_ERR;
+}
+
+// needed for when libthread_db is compiled with TD_DEBUG defined
+void
+ps_plog (const char *format, ...)
+{
+ va_list alist;
+
+ va_start(alist, format);
+ vfprintf(stderr, format, alist);
+ va_end(alist);
+}
+
+// ------------------------------------------------------------------------
+// Functions below this point are not yet implemented. They are here only
+// to make the linker happy.
+
+ps_err_e ps_lsetfpregs(struct ps_prochandle *ph, lwpid_t lid, const prfpregset_t *fpregs) {
+ print_debug("ps_lsetfpregs not implemented\n");
+ return PS_OK;
+}
+
+ps_err_e ps_lsetregs(struct ps_prochandle *ph, lwpid_t lid, const prgregset_t gregset) {
+ print_debug("ps_lsetregs not implemented\n");
+ return PS_OK;
+}
+
+ps_err_e ps_lgetfpregs(struct ps_prochandle *ph, lwpid_t lid, prfpregset_t *fpregs) {
+ print_debug("ps_lgetfpregs not implemented\n");
+ return PS_OK;
+}
+
+ps_err_e ps_lgetregs(struct ps_prochandle *ph, lwpid_t lid, prgregset_t gregset) {
+ print_debug("ps_lgetfpregs not implemented\n");
+ return PS_OK;
+}
+
+ps_err_e ps_lstop(struct ps_prochandle *ph, lwpid_t lid) {
+ print_debug("ps_lstop not implemented\n");
+ return PS_OK;
+}
+
+ps_err_e ps_pcontinue(struct ps_prochandle *ph) {
+ print_debug("ps_pcontinue not implemented\n");
+ return PS_OK;
+}
diff --git a/hotspot/agent/src/os/bsd/libproc_impl.h b/hotspot/agent/src/os/bsd/libproc_impl.h
new file mode 100644
index 0000000..8b9d233
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/libproc_impl.h
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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 _LIBPROC_IMPL_H_
+#define _LIBPROC_IMPL_H_
+
+#include <unistd.h>
+#include <limits.h>
+#include "libproc.h"
+#include "symtab.h"
+
+// data structures in this file mimic those of Solaris 8.0 - libproc's Pcontrol.h
+
+#define BUF_SIZE (PATH_MAX + NAME_MAX + 1)
+
+// list of shared objects
+typedef struct lib_info {
+ char name[BUF_SIZE];
+ uintptr_t base;
+ struct symtab* symtab;
+ int fd; // file descriptor for lib
+ struct lib_info* next;
+} lib_info;
+
+// list of threads
+typedef struct thread_info {
+ lwpid_t lwp_id;
+ pthread_t pthread_id; // not used cores, always -1
+ struct reg regs; // not for process, core uses for caching regset
+ struct thread_info* next;
+} thread_info;
+
+// list of virtual memory maps
+typedef struct map_info {
+ int fd; // file descriptor
+ off_t offset; // file offset of this mapping
+ uintptr_t vaddr; // starting virtual address
+ size_t memsz; // size of the mapping
+ struct map_info* next;
+} map_info;
+
+// vtable for ps_prochandle
+typedef struct ps_prochandle_ops {
+ // "derived class" clean-up
+ void (*release)(struct ps_prochandle* ph);
+ // read from debuggee
+ bool (*p_pread)(struct ps_prochandle *ph,
+ uintptr_t addr, char *buf, size_t size);
+ // write into debuggee
+ bool (*p_pwrite)(struct ps_prochandle *ph,
+ uintptr_t addr, const char *buf , size_t size);
+ // get integer regset of a thread
+ bool (*get_lwp_regs)(struct ps_prochandle* ph, lwpid_t lwp_id, struct reg* regs);
+ // get info on thread
+ bool (*get_lwp_info)(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo);
+} ps_prochandle_ops;
+
+// the ps_prochandle
+
+struct core_data {
+ int core_fd; // file descriptor of core file
+ int exec_fd; // file descriptor of exec file
+ int interp_fd; // file descriptor of interpreter (ld-elf.so.1)
+ // part of the class sharing workaround
+ int classes_jsa_fd; // file descriptor of class share archive
+ uintptr_t dynamic_addr; // address of dynamic section of a.out
+ uintptr_t ld_base_addr; // base address of ld.so
+ size_t num_maps; // number of maps.
+ map_info* maps; // maps in a linked list
+ // part of the class sharing workaround
+ map_info* class_share_maps;// class share maps in a linked list
+ map_info** map_array; // sorted (by vaddr) array of map_info pointers
+};
+
+struct ps_prochandle {
+ ps_prochandle_ops* ops; // vtable ptr
+ pid_t pid;
+ int num_libs;
+ lib_info* libs; // head of lib list
+ lib_info* lib_tail; // tail of lib list - to append at the end
+ int num_threads;
+ thread_info* threads; // head of thread list
+ struct core_data* core; // data only used for core dumps, NULL for process
+};
+
+int pathmap_open(const char* name);
+
+void print_debug(const char* format,...);
+bool is_debug();
+
+typedef bool (*thread_info_callback)(struct ps_prochandle* ph, pthread_t pid, lwpid_t lwpid);
+
+// reads thread info using libthread_db and calls above callback for each thread
+bool read_thread_info(struct ps_prochandle* ph, thread_info_callback cb);
+
+// adds a new shared object to lib list, returns NULL on failure
+lib_info* add_lib_info(struct ps_prochandle* ph, const char* libname, uintptr_t base);
+
+// adds a new shared object to lib list, supply open lib file descriptor as well
+lib_info* add_lib_info_fd(struct ps_prochandle* ph, const char* libname, int fd,
+ uintptr_t base);
+
+// adds a new thread to threads list, returns NULL on failure
+thread_info* add_thread_info(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id);
+
+// a test for ELF signature without using libelf
+bool is_elf_file(int fd);
+
+#endif //_LIBPROC_IMPL_H_
diff --git a/hotspot/agent/src/os/bsd/mapfile b/hotspot/agent/src/os/bsd/mapfile
new file mode 100644
index 0000000..36b4334
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/mapfile
@@ -0,0 +1,66 @@
+#
+
+#
+# Copyright (c) 2003, 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.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+ global:
+
+ # native methods of BsdDebuggerLocal class
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_init0;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getAddressSize;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__I;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_attach0__Ljava_lang_String_2Ljava_lang_String_2;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_detach0;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByName0;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_lookupByAddress0;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_readBytesFromProcess0;
+ Java_sun_jvm_hotspot_debugger_bsd_BsdDebuggerLocal_getThreadIntegerRegisterSet0;
+
+ # proc_service.h functions - to be used by libthread_db
+ ps_getpid;
+ ps_pglobal_lookup;
+ ps_pread;
+ ps_pwrite;
+ ps_lsetfpregs;
+ ps_lsetregs;
+ ps_lgetfpregs;
+ ps_lgetregs;
+ ps_lcontinue;
+ ps_lgetxmmregs;
+ ps_lsetxmmregs;
+ ps_lstop;
+ ps_linfo;
+
+ # used by attach test program
+ init_libproc;
+ Pgrab;
+ Pgrab_core;
+ Prelease;
+
+ local:
+ *;
+};
diff --git a/hotspot/agent/src/os/bsd/ps_core.c b/hotspot/agent/src/os/bsd/ps_core.c
new file mode 100644
index 0000000..4e2049b
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/ps_core.c
@@ -0,0 +1,1023 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+
+#include <jni.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stddef.h>
+#include <elf.h>
+#include <link.h>
+#include "libproc_impl.h"
+#include "salibelf.h"
+
+// This file has the libproc implementation to read core files.
+// For live processes, refer to ps_proc.c. Portions of this is adapted
+// /modelled after Solaris libproc.so (in particular Pcore.c)
+
+//----------------------------------------------------------------------
+// ps_prochandle cleanup helper functions
+
+// close all file descriptors
+static void close_elf_files(struct ps_prochandle* ph) {
+ lib_info* lib = NULL;
+
+ // close core file descriptor
+ if (ph->core->core_fd >= 0)
+ close(ph->core->core_fd);
+
+ // close exec file descriptor
+ if (ph->core->exec_fd >= 0)
+ close(ph->core->exec_fd);
+
+ // close interp file descriptor
+ if (ph->core->interp_fd >= 0)
+ close(ph->core->interp_fd);
+
+ // close class share archive file
+ if (ph->core->classes_jsa_fd >= 0)
+ close(ph->core->classes_jsa_fd);
+
+ // close all library file descriptors
+ lib = ph->libs;
+ while (lib) {
+ int fd = lib->fd;
+ if (fd >= 0 && fd != ph->core->exec_fd) close(fd);
+ lib = lib->next;
+ }
+}
+
+// clean all map_info stuff
+static void destroy_map_info(struct ps_prochandle* ph) {
+ map_info* map = ph->core->maps;
+ while (map) {
+ map_info* next = map->next;
+ free(map);
+ map = next;
+ }
+
+ if (ph->core->map_array) {
+ free(ph->core->map_array);
+ }
+
+ // Part of the class sharing workaround
+ map = ph->core->class_share_maps;
+ while (map) {
+ map_info* next = map->next;
+ free(map);
+ map = next;
+ }
+}
+
+// ps_prochandle operations
+static void core_release(struct ps_prochandle* ph) {
+ if (ph->core) {
+ close_elf_files(ph);
+ destroy_map_info(ph);
+ free(ph->core);
+ }
+}
+
+static map_info* allocate_init_map(int fd, off_t offset, uintptr_t vaddr, size_t memsz) {
+ map_info* map;
+ if ( (map = (map_info*) calloc(1, sizeof(map_info))) == NULL) {
+ print_debug("can't allocate memory for map_info\n");
+ return NULL;
+ }
+
+ // initialize map
+ map->fd = fd;
+ map->offset = offset;
+ map->vaddr = vaddr;
+ map->memsz = memsz;
+ return map;
+}
+
+// add map info with given fd, offset, vaddr and memsz
+static map_info* add_map_info(struct ps_prochandle* ph, int fd, off_t offset,
+ uintptr_t vaddr, size_t memsz) {
+ map_info* map;
+ if ((map = allocate_init_map(fd, offset, vaddr, memsz)) == NULL) {
+ return NULL;
+ }
+
+ // add this to map list
+ map->next = ph->core->maps;
+ ph->core->maps = map;
+ ph->core->num_maps++;
+
+ return map;
+}
+
+// Part of the class sharing workaround
+static map_info* add_class_share_map_info(struct ps_prochandle* ph, off_t offset,
+ uintptr_t vaddr, size_t memsz) {
+ map_info* map;
+ if ((map = allocate_init_map(ph->core->classes_jsa_fd,
+ offset, vaddr, memsz)) == NULL) {
+ return NULL;
+ }
+
+ map->next = ph->core->class_share_maps;
+ ph->core->class_share_maps = map;
+ return map;
+}
+
+// Return the map_info for the given virtual address. We keep a sorted
+// array of pointers in ph->map_array, so we can binary search.
+static map_info* core_lookup(struct ps_prochandle *ph, uintptr_t addr)
+{
+ int mid, lo = 0, hi = ph->core->num_maps - 1;
+ map_info *mp;
+
+ while (hi - lo > 1) {
+ mid = (lo + hi) / 2;
+ if (addr >= ph->core->map_array[mid]->vaddr)
+ lo = mid;
+ else
+ hi = mid;
+ }
+
+ if (addr < ph->core->map_array[hi]->vaddr)
+ mp = ph->core->map_array[lo];
+ else
+ mp = ph->core->map_array[hi];
+
+ if (addr >= mp->vaddr && addr < mp->vaddr + mp->memsz)
+ return (mp);
+
+
+ // Part of the class sharing workaround
+ // Unfortunately, we have no way of detecting -Xshare state.
+ // Check out the share maps atlast, if we don't find anywhere.
+ // This is done this way so to avoid reading share pages
+ // ahead of other normal maps. For eg. with -Xshare:off we don't
+ // want to prefer class sharing data to data from core.
+ mp = ph->core->class_share_maps;
+ if (mp) {
+ print_debug("can't locate map_info at 0x%lx, trying class share maps\n",
+ addr);
+ }
+ while (mp) {
+ if (addr >= mp->vaddr && addr < mp->vaddr + mp->memsz) {
+ print_debug("located map_info at 0x%lx from class share maps\n",
+ addr);
+ return (mp);
+ }
+ mp = mp->next;
+ }
+
+ print_debug("can't locate map_info at 0x%lx\n", addr);
+ return (NULL);
+}
+
+//---------------------------------------------------------------
+// Part of the class sharing workaround:
+//
+// With class sharing, pages are mapped from classes[_g].jsa file.
+// The read-only class sharing pages are mapped as MAP_SHARED,
+// PROT_READ pages. These pages are not dumped into core dump.
+// With this workaround, these pages are read from classes[_g].jsa.
+
+// FIXME: !HACK ALERT!
+// The format of sharing achive file header is needed to read shared heap
+// file mappings. For now, I am hard coding portion of FileMapHeader here.
+// Refer to filemap.hpp.
+
+// FileMapHeader describes the shared space data in the file to be
+// mapped. This structure gets written to a file. It is not a class,
+// so that the compilers don't add any compiler-private data to it.
+
+// Refer to CompactingPermGenGen::n_regions in compactingPermGenGen.hpp
+#define NUM_SHARED_MAPS 4
+
+// Refer to FileMapInfo::_current_version in filemap.hpp
+#define CURRENT_ARCHIVE_VERSION 1
+
+struct FileMapHeader {
+ int _magic; // identify file type.
+ int _version; // (from enum, above.)
+ size_t _alignment; // how shared archive should be aligned
+
+ struct space_info {
+ int _file_offset; // sizeof(this) rounded to vm page size
+ char* _base; // copy-on-write base address
+ size_t _capacity; // for validity checking
+ size_t _used; // for setting space top on read
+
+ // 4991491 NOTICE These are C++ bool's in filemap.hpp and must match up with
+ // the C type matching the C++ bool type on any given platform. For
+ // Hotspot on BSD we assume the corresponding C type is char but
+ // licensees on BSD versions may need to adjust the type of these fields.
+ char _read_only; // read only space?
+ char _allow_exec; // executable code in space?
+
+ } _space[NUM_SHARED_MAPS]; // was _space[CompactingPermGenGen::n_regions];
+
+ // Ignore the rest of the FileMapHeader. We don't need those fields here.
+};
+
+static bool read_jboolean(struct ps_prochandle* ph, uintptr_t addr, jboolean* pvalue) {
+ jboolean i;
+ if (ps_pread(ph, (psaddr_t) addr, &i, sizeof(i)) == PS_OK) {
+ *pvalue = i;
+ return true;
+ } else {
+ return false;
+ }
+}
+
+static bool read_pointer(struct ps_prochandle* ph, uintptr_t addr, uintptr_t* pvalue) {
+ uintptr_t uip;
+ if (ps_pread(ph, (psaddr_t) addr, &uip, sizeof(uip)) == PS_OK) {
+ *pvalue = uip;
+ return true;
+ } else {
+ return false;
+ }
+}
+
+// used to read strings from debuggee
+static bool read_string(struct ps_prochandle* ph, uintptr_t addr, char* buf, size_t size) {
+ size_t i = 0;
+ char c = ' ';
+
+ while (c != '\0') {
+ if (ps_pread(ph, (psaddr_t) addr, &c, sizeof(char)) != PS_OK)
+ return false;
+ if (i < size - 1)
+ buf[i] = c;
+ else // smaller buffer
+ return false;
+ i++; addr++;
+ }
+
+ buf[i] = '\0';
+ return true;
+}
+
+#define USE_SHARED_SPACES_SYM "UseSharedSpaces"
+// mangled name of Arguments::SharedArchivePath
+#define SHARED_ARCHIVE_PATH_SYM "_ZN9Arguments17SharedArchivePathE"
+
+static bool init_classsharing_workaround(struct ps_prochandle* ph) {
+ lib_info* lib = ph->libs;
+ while (lib != NULL) {
+ // we are iterating over shared objects from the core dump. look for
+ // libjvm[_g].so.
+ const char *jvm_name = 0;
+ if ((jvm_name = strstr(lib->name, "/libjvm.so")) != 0 ||
+ (jvm_name = strstr(lib->name, "/libjvm_g.so")) != 0) {
+ char classes_jsa[PATH_MAX];
+ struct FileMapHeader header;
+ size_t n = 0;
+ int fd = -1, m = 0;
+ uintptr_t base = 0, useSharedSpacesAddr = 0;
+ uintptr_t sharedArchivePathAddrAddr = 0, sharedArchivePathAddr = 0;
+ jboolean useSharedSpaces = 0;
+
+ memset(classes_jsa, 0, sizeof(classes_jsa));
+ jvm_name = lib->name;
+ useSharedSpacesAddr = lookup_symbol(ph, jvm_name, USE_SHARED_SPACES_SYM);
+ if (useSharedSpacesAddr == 0) {
+ print_debug("can't lookup 'UseSharedSpaces' flag\n");
+ return false;
+ }
+
+ // Hotspot vm types are not exported to build this library. So
+ // using equivalent type jboolean to read the value of
+ // UseSharedSpaces which is same as hotspot type "bool".
+ if (read_jboolean(ph, useSharedSpacesAddr, &useSharedSpaces) != true) {
+ print_debug("can't read the value of 'UseSharedSpaces' flag\n");
+ return false;
+ }
+
+ if ((int)useSharedSpaces == 0) {
+ print_debug("UseSharedSpaces is false, assuming -Xshare:off!\n");
+ return true;
+ }
+
+ sharedArchivePathAddrAddr = lookup_symbol(ph, jvm_name, SHARED_ARCHIVE_PATH_SYM);
+ if (sharedArchivePathAddrAddr == 0) {
+ print_debug("can't lookup shared archive path symbol\n");
+ return false;
+ }
+
+ if (read_pointer(ph, sharedArchivePathAddrAddr, &sharedArchivePathAddr) != true) {
+ print_debug("can't read shared archive path pointer\n");
+ return false;
+ }
+
+ if (read_string(ph, sharedArchivePathAddr, classes_jsa, sizeof(classes_jsa)) != true) {
+ print_debug("can't read shared archive path value\n");
+ return false;
+ }
+
+ print_debug("looking for %s\n", classes_jsa);
+ // open the class sharing archive file
+ fd = pathmap_open(classes_jsa);
+ if (fd < 0) {
+ print_debug("can't open %s!\n", classes_jsa);
+ ph->core->classes_jsa_fd = -1;
+ return false;
+ } else {
+ print_debug("opened %s\n", classes_jsa);
+ }
+
+ // read FileMapHeader from the file
+ memset(&header, 0, sizeof(struct FileMapHeader));
+ if ((n = read(fd, &header, sizeof(struct FileMapHeader)))
+ != sizeof(struct FileMapHeader)) {
+ print_debug("can't read shared archive file map header from %s\n", classes_jsa);
+ close(fd);
+ return false;
+ }
+
+ // check file magic
+ if (header._magic != 0xf00baba2) {
+ print_debug("%s has bad shared archive file magic number 0x%x, expecing 0xf00baba2\n",
+ classes_jsa, header._magic);
+ close(fd);
+ return false;
+ }
+
+ // check version
+ if (header._version != CURRENT_ARCHIVE_VERSION) {
+ print_debug("%s has wrong shared archive file version %d, expecting %d\n",
+ classes_jsa, header._version, CURRENT_ARCHIVE_VERSION);
+ close(fd);
+ return false;
+ }
+
+ ph->core->classes_jsa_fd = fd;
+ // add read-only maps from classes[_g].jsa to the list of maps
+ for (m = 0; m < NUM_SHARED_MAPS; m++) {
+ if (header._space[m]._read_only) {
+ base = (uintptr_t) header._space[m]._base;
+ // no need to worry about the fractional pages at-the-end.
+ // possible fractional pages are handled by core_read_data.
+ add_class_share_map_info(ph, (off_t) header._space[m]._file_offset,
+ base, (size_t) header._space[m]._used);
+ print_debug("added a share archive map at 0x%lx\n", base);
+ }
+ }
+ return true;
+ }
+ lib = lib->next;
+ }
+ return true;
+}
+
+
+//---------------------------------------------------------------------------
+// functions to handle map_info
+
+// Order mappings based on virtual address. We use this function as the
+// callback for sorting the array of map_info pointers.
+static int core_cmp_mapping(const void *lhsp, const void *rhsp)
+{
+ const map_info *lhs = *((const map_info **)lhsp);
+ const map_info *rhs = *((const map_info **)rhsp);
+
+ if (lhs->vaddr == rhs->vaddr)
+ return (0);
+
+ return (lhs->vaddr < rhs->vaddr ? -1 : 1);
+}
+
+// we sort map_info by starting virtual address so that we can do
+// binary search to read from an address.
+static bool sort_map_array(struct ps_prochandle* ph) {
+ size_t num_maps = ph->core->num_maps;
+ map_info* map = ph->core->maps;
+ int i = 0;
+
+ // allocate map_array
+ map_info** array;
+ if ( (array = (map_info**) malloc(sizeof(map_info*) * num_maps)) == NULL) {
+ print_debug("can't allocate memory for map array\n");
+ return false;
+ }
+
+ // add maps to array
+ while (map) {
+ array[i] = map;
+ i++;
+ map = map->next;
+ }
+
+ // sort is called twice. If this is second time, clear map array
+ if (ph->core->map_array) free(ph->core->map_array);
+ ph->core->map_array = array;
+ // sort the map_info array by base virtual address.
+ qsort(ph->core->map_array, ph->core->num_maps, sizeof (map_info*),
+ core_cmp_mapping);
+
+ // print map
+ if (is_debug()) {
+ int j = 0;
+ print_debug("---- sorted virtual address map ----\n");
+ for (j = 0; j < ph->core->num_maps; j++) {
+ print_debug("base = 0x%lx\tsize = %d\n", ph->core->map_array[j]->vaddr,
+ ph->core->map_array[j]->memsz);
+ }
+ }
+
+ return true;
+}
+
+#ifndef MIN
+#define MIN(x, y) (((x) < (y))? (x): (y))
+#endif
+
+static bool core_read_data(struct ps_prochandle* ph, uintptr_t addr, char *buf, size_t size) {
+ ssize_t resid = size;
+ int page_size=sysconf(_SC_PAGE_SIZE);
+ while (resid != 0) {
+ map_info *mp = core_lookup(ph, addr);
+ uintptr_t mapoff;
+ ssize_t len, rem;
+ off_t off;
+ int fd;
+
+ if (mp == NULL)
+ break; /* No mapping for this address */
+
+ fd = mp->fd;
+ mapoff = addr - mp->vaddr;
+ len = MIN(resid, mp->memsz - mapoff);
+ off = mp->offset + mapoff;
+
+ if ((len = pread(fd, buf, len, off)) <= 0)
+ break;
+
+ resid -= len;
+ addr += len;
+ buf = (char *)buf + len;
+
+ // mappings always start at page boundary. But, may end in fractional
+ // page. fill zeros for possible fractional page at the end of a mapping.
+ rem = mp->memsz % page_size;
+ if (rem > 0) {
+ rem = page_size - rem;
+ len = MIN(resid, rem);
+ resid -= len;
+ addr += len;
+ // we are not assuming 'buf' to be zero initialized.
+ memset(buf, 0, len);
+ buf += len;
+ }
+ }
+
+ if (resid) {
+ print_debug("core read failed for %d byte(s) @ 0x%lx (%d more bytes)\n",
+ size, addr, resid);
+ return false;
+ } else {
+ return true;
+ }
+}
+
+// null implementation for write
+static bool core_write_data(struct ps_prochandle* ph,
+ uintptr_t addr, const char *buf , size_t size) {
+ return false;
+}
+
+static bool core_get_lwp_regs(struct ps_prochandle* ph, lwpid_t lwp_id,
+ struct reg* regs) {
+ // for core we have cached the lwp regs from NOTE section
+ thread_info* thr = ph->threads;
+ while (thr) {
+ if (thr->lwp_id == lwp_id) {
+ memcpy(regs, &thr->regs, sizeof(struct reg));
+ return true;
+ }
+ thr = thr->next;
+ }
+ return false;
+}
+
+static bool core_get_lwp_info(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo) {
+ print_debug("core_get_lwp_info not implemented\n");
+ return false;
+}
+
+static ps_prochandle_ops core_ops = {
+ .release= core_release,
+ .p_pread= core_read_data,
+ .p_pwrite= core_write_data,
+ .get_lwp_regs= core_get_lwp_regs,
+ .get_lwp_info= core_get_lwp_info
+};
+
+// read regs and create thread from NT_PRSTATUS entries from core file
+static bool core_handle_prstatus(struct ps_prochandle* ph, const char* buf, size_t nbytes) {
+ // we have to read prstatus_t from buf
+ // assert(nbytes == sizeof(prstaus_t), "size mismatch on prstatus_t");
+ prstatus_t* prstat = (prstatus_t*) buf;
+ thread_info* newthr;
+ print_debug("got integer regset for lwp %d\n", prstat->pr_pid);
+ // we set pthread_t to -1 for core dump
+ if((newthr = add_thread_info(ph, (pthread_t) -1, prstat->pr_pid)) == NULL)
+ return false;
+
+ // copy regs
+ memcpy(&newthr->regs, &prstat->pr_reg, sizeof(struct reg));
+
+ if (is_debug()) {
+ print_debug("integer regset\n");
+#ifdef i386
+ // print the regset
+ print_debug("\teax = 0x%x\n", newthr->regs.r_eax);
+ print_debug("\tebx = 0x%x\n", newthr->regs.r_ebx);
+ print_debug("\tecx = 0x%x\n", newthr->regs.r_ecx);
+ print_debug("\tedx = 0x%x\n", newthr->regs.r_edx);
+ print_debug("\tesp = 0x%x\n", newthr->regs.r_esp);
+ print_debug("\tebp = 0x%x\n", newthr->regs.r_ebp);
+ print_debug("\tesi = 0x%x\n", newthr->regs.r_esi);
+ print_debug("\tedi = 0x%x\n", newthr->regs.r_edi);
+ print_debug("\teip = 0x%x\n", newthr->regs.r_eip);
+#endif
+
+#if defined(amd64) || defined(x86_64)
+ // print the regset
+ print_debug("\tr15 = 0x%lx\n", newthr->regs.r_r15);
+ print_debug("\tr14 = 0x%lx\n", newthr->regs.r_r14);
+ print_debug("\tr13 = 0x%lx\n", newthr->regs.r_r13);
+ print_debug("\tr12 = 0x%lx\n", newthr->regs.r_r12);
+ print_debug("\trbp = 0x%lx\n", newthr->regs.r_rbp);
+ print_debug("\trbx = 0x%lx\n", newthr->regs.r_rbx);
+ print_debug("\tr11 = 0x%lx\n", newthr->regs.r_r11);
+ print_debug("\tr10 = 0x%lx\n", newthr->regs.r_r10);
+ print_debug("\tr9 = 0x%lx\n", newthr->regs.r_r9);
+ print_debug("\tr8 = 0x%lx\n", newthr->regs.r_r8);
+ print_debug("\trax = 0x%lx\n", newthr->regs.r_rax);
+ print_debug("\trcx = 0x%lx\n", newthr->regs.r_rcx);
+ print_debug("\trdx = 0x%lx\n", newthr->regs.r_rdx);
+ print_debug("\trsi = 0x%lx\n", newthr->regs.r_rsi);
+ print_debug("\trdi = 0x%lx\n", newthr->regs.r_rdi);
+ //print_debug("\torig_rax = 0x%lx\n", newthr->regs.orig_rax);
+ print_debug("\trip = 0x%lx\n", newthr->regs.r_rip);
+ print_debug("\tcs = 0x%lx\n", newthr->regs.r_cs);
+ //print_debug("\teflags = 0x%lx\n", newthr->regs.eflags);
+ print_debug("\trsp = 0x%lx\n", newthr->regs.r_rsp);
+ print_debug("\tss = 0x%lx\n", newthr->regs.r_ss);
+ //print_debug("\tfs_base = 0x%lx\n", newthr->regs.fs_base);
+ //print_debug("\tgs_base = 0x%lx\n", newthr->regs.gs_base);
+ //print_debug("\tds = 0x%lx\n", newthr->regs.ds);
+ //print_debug("\tes = 0x%lx\n", newthr->regs.es);
+ //print_debug("\tfs = 0x%lx\n", newthr->regs.fs);
+ //print_debug("\tgs = 0x%lx\n", newthr->regs.gs);
+#endif
+ }
+
+ return true;
+}
+
+#define ROUNDUP(x, y) ((((x)+((y)-1))/(y))*(y))
+
+// read NT_PRSTATUS entries from core NOTE segment
+static bool core_handle_note(struct ps_prochandle* ph, ELF_PHDR* note_phdr) {
+ char* buf = NULL;
+ char* p = NULL;
+ size_t size = note_phdr->p_filesz;
+
+ // we are interested in just prstatus entries. we will ignore the rest.
+ // Advance the seek pointer to the start of the PT_NOTE data
+ if (lseek(ph->core->core_fd, note_phdr->p_offset, SEEK_SET) == (off_t)-1) {
+ print_debug("failed to lseek to PT_NOTE data\n");
+ return false;
+ }
+
+ // Now process the PT_NOTE structures. Each one is preceded by
+ // an Elf{32/64}_Nhdr structure describing its type and size.
+ if ( (buf = (char*) malloc(size)) == NULL) {
+ print_debug("can't allocate memory for reading core notes\n");
+ goto err;
+ }
+
+ // read notes into buffer
+ if (read(ph->core->core_fd, buf, size) != size) {
+ print_debug("failed to read notes, core file must have been truncated\n");
+ goto err;
+ }
+
+ p = buf;
+ while (p < buf + size) {
+ ELF_NHDR* notep = (ELF_NHDR*) p;
+ char* descdata = p + sizeof(ELF_NHDR) + ROUNDUP(notep->n_namesz, 4);
+ print_debug("Note header with n_type = %d and n_descsz = %u\n",
+ notep->n_type, notep->n_descsz);
+
+ if (notep->n_type == NT_PRSTATUS) {
+ if (core_handle_prstatus(ph, descdata, notep->n_descsz) != true)
+ return false;
+ }
+ p = descdata + ROUNDUP(notep->n_descsz, 4);
+ }
+
+ free(buf);
+ return true;
+
+err:
+ if (buf) free(buf);
+ return false;
+}
+
+// read all segments from core file
+static bool read_core_segments(struct ps_prochandle* ph, ELF_EHDR* core_ehdr) {
+ int i = 0;
+ ELF_PHDR* phbuf = NULL;
+ ELF_PHDR* core_php = NULL;
+
+ if ((phbuf = read_program_header_table(ph->core->core_fd, core_ehdr)) == NULL)
+ return false;
+
+ /*
+ * Now iterate through the program headers in the core file.
+ * We're interested in two types of Phdrs: PT_NOTE (which
+ * contains a set of saved /proc structures), and PT_LOAD (which
+ * represents a memory mapping from the process's address space).
+ *
+ * Difference b/w Solaris PT_NOTE and BSD PT_NOTE:
+ *
+ * In Solaris there are two PT_NOTE segments the first PT_NOTE (if present)
+ * contains /proc structs in the pre-2.6 unstructured /proc format. the last
+ * PT_NOTE has data in new /proc format.
+ *
+ * In Solaris, there is only one pstatus (process status). pstatus contains
+ * integer register set among other stuff. For each LWP, we have one lwpstatus
+ * entry that has integer regset for that LWP.
+ *
+ * Linux threads are actually 'clone'd processes. To support core analysis
+ * of "multithreaded" process, Linux creates more than one pstatus (called
+ * "prstatus") entry in PT_NOTE. Each prstatus entry has integer regset for one
+ * "thread". Please refer to Linux kernel src file 'fs/binfmt_elf.c', in particular
+ * function "elf_core_dump".
+ */
+
+ for (core_php = phbuf, i = 0; i < core_ehdr->e_phnum; i++) {
+ switch (core_php->p_type) {
+ case PT_NOTE:
+ if (core_handle_note(ph, core_php) != true) goto err;
+ break;
+
+ case PT_LOAD: {
+ if (core_php->p_filesz != 0) {
+ if (add_map_info(ph, ph->core->core_fd, core_php->p_offset,
+ core_php->p_vaddr, core_php->p_filesz) == NULL) goto err;
+ }
+ break;
+ }
+ }
+
+ core_php++;
+ }
+
+ free(phbuf);
+ return true;
+err:
+ free(phbuf);
+ return false;
+}
+
+// read segments of a shared object
+static bool read_lib_segments(struct ps_prochandle* ph, int lib_fd, ELF_EHDR* lib_ehdr, uintptr_t lib_base) {
+ int i = 0;
+ ELF_PHDR* phbuf;
+ ELF_PHDR* lib_php = NULL;
+
+ if ((phbuf = read_program_header_table(lib_fd, lib_ehdr)) == NULL)
+ return false;
+
+ // we want to process only PT_LOAD segments that are not writable.
+ // i.e., text segments. The read/write/exec (data) segments would
+ // have been already added from core file segments.
+ for (lib_php = phbuf, i = 0; i < lib_ehdr->e_phnum; i++) {
+ if ((lib_php->p_type == PT_LOAD) && !(lib_php->p_flags & PF_W) && (lib_php->p_filesz != 0)) {
+ if (add_map_info(ph, lib_fd, lib_php->p_offset, lib_php->p_vaddr + lib_base, lib_php->p_filesz) == NULL)
+ goto err;
+ }
+ lib_php++;
+ }
+
+ free(phbuf);
+ return true;
+err:
+ free(phbuf);
+ return false;
+}
+
+// process segments from interpreter (ld-elf.so.1)
+static bool read_interp_segments(struct ps_prochandle* ph) {
+ ELF_EHDR interp_ehdr;
+
+ if (read_elf_header(ph->core->interp_fd, &interp_ehdr) != true) {
+ print_debug("interpreter is not a valid ELF file\n");
+ return false;
+ }
+
+ if (read_lib_segments(ph, ph->core->interp_fd, &interp_ehdr, ph->core->ld_base_addr) != true) {
+ print_debug("can't read segments of interpreter\n");
+ return false;
+ }
+
+ return true;
+}
+
+// process segments of a a.out
+static bool read_exec_segments(struct ps_prochandle* ph, ELF_EHDR* exec_ehdr) {
+ int i = 0;
+ ELF_PHDR* phbuf = NULL;
+ ELF_PHDR* exec_php = NULL;
+
+ if ((phbuf = read_program_header_table(ph->core->exec_fd, exec_ehdr)) == NULL)
+ return false;
+
+ for (exec_php = phbuf, i = 0; i < exec_ehdr->e_phnum; i++) {
+ switch (exec_php->p_type) {
+
+ // add mappings for PT_LOAD segments
+ case PT_LOAD: {
+ // add only non-writable segments of non-zero filesz
+ if (!(exec_php->p_flags & PF_W) && exec_php->p_filesz != 0) {
+ if (add_map_info(ph, ph->core->exec_fd, exec_php->p_offset, exec_php->p_vaddr, exec_php->p_filesz) == NULL) goto err;
+ }
+ break;
+ }
+
+ // read the interpreter and it's segments
+ case PT_INTERP: {
+ char interp_name[BUF_SIZE];
+
+ pread(ph->core->exec_fd, interp_name, MIN(exec_php->p_filesz, BUF_SIZE), exec_php->p_offset);
+ print_debug("ELF interpreter %s\n", interp_name);
+ // read interpreter segments as well
+ if ((ph->core->interp_fd = pathmap_open(interp_name)) < 0) {
+ print_debug("can't open runtime loader\n");
+ goto err;
+ }
+ break;
+ }
+
+ // from PT_DYNAMIC we want to read address of first link_map addr
+ case PT_DYNAMIC: {
+ ph->core->dynamic_addr = exec_php->p_vaddr;
+ print_debug("address of _DYNAMIC is 0x%lx\n", ph->core->dynamic_addr);
+ break;
+ }
+
+ } // switch
+ exec_php++;
+ } // for
+
+ free(phbuf);
+ return true;
+err:
+ free(phbuf);
+ return false;
+}
+
+
+#define FIRST_LINK_MAP_OFFSET offsetof(struct r_debug, r_map)
+#define LD_BASE_OFFSET offsetof(struct r_debug, r_ldbase)
+#define LINK_MAP_ADDR_OFFSET offsetof(struct link_map, l_addr)
+#define LINK_MAP_NAME_OFFSET offsetof(struct link_map, l_name)
+#define LINK_MAP_NEXT_OFFSET offsetof(struct link_map, l_next)
+
+// read shared library info from runtime linker's data structures.
+// This work is done by librtlb_db in Solaris
+static bool read_shared_lib_info(struct ps_prochandle* ph) {
+ uintptr_t addr = ph->core->dynamic_addr;
+ uintptr_t debug_base;
+ uintptr_t first_link_map_addr;
+ uintptr_t ld_base_addr;
+ uintptr_t link_map_addr;
+ uintptr_t lib_base_diff;
+ uintptr_t lib_base;
+ uintptr_t lib_name_addr;
+ char lib_name[BUF_SIZE];
+ ELF_DYN dyn;
+ ELF_EHDR elf_ehdr;
+ int lib_fd;
+
+ // _DYNAMIC has information of the form
+ // [tag] [data] [tag] [data] .....
+ // Both tag and data are pointer sized.
+ // We look for dynamic info with DT_DEBUG. This has shared object info.
+ // refer to struct r_debug in link.h
+
+ dyn.d_tag = DT_NULL;
+ while (dyn.d_tag != DT_DEBUG) {
+ if (ps_pread(ph, (psaddr_t) addr, &dyn, sizeof(ELF_DYN)) != PS_OK) {
+ print_debug("can't read debug info from _DYNAMIC\n");
+ return false;
+ }
+ addr += sizeof(ELF_DYN);
+ }
+
+ // we have got Dyn entry with DT_DEBUG
+ debug_base = dyn.d_un.d_ptr;
+ // at debug_base we have struct r_debug. This has first link map in r_map field
+ if (ps_pread(ph, (psaddr_t) debug_base + FIRST_LINK_MAP_OFFSET,
+ &first_link_map_addr, sizeof(uintptr_t)) != PS_OK) {
+ print_debug("can't read first link map address\n");
+ return false;
+ }
+
+ // read ld_base address from struct r_debug
+ // XXX: There is no r_ldbase member on BSD
+/*
+ if (ps_pread(ph, (psaddr_t) debug_base + LD_BASE_OFFSET, &ld_base_addr,
+ sizeof(uintptr_t)) != PS_OK) {
+ print_debug("can't read ld base address\n");
+ return false;
+ }
+ ph->core->ld_base_addr = ld_base_addr;
+*/
+ ph->core->ld_base_addr = 0;
+
+ print_debug("interpreter base address is 0x%lx\n", ld_base_addr);
+
+ // now read segments from interp (i.e ld-elf.so.1)
+ if (read_interp_segments(ph) != true)
+ return false;
+
+ // after adding interpreter (ld.so) mappings sort again
+ if (sort_map_array(ph) != true)
+ return false;
+
+ print_debug("first link map is at 0x%lx\n", first_link_map_addr);
+
+ link_map_addr = first_link_map_addr;
+ while (link_map_addr != 0) {
+ // read library base address of the .so. Note that even though <sys/link.h> calls
+ // link_map->l_addr as "base address", this is * not * really base virtual
+ // address of the shared object. This is actually the difference b/w the virtual
+ // address mentioned in shared object and the actual virtual base where runtime
+ // linker loaded it. We use "base diff" in read_lib_segments call below.
+
+ if (ps_pread(ph, (psaddr_t) link_map_addr + LINK_MAP_ADDR_OFFSET,
+ &lib_base_diff, sizeof(uintptr_t)) != PS_OK) {
+ print_debug("can't read shared object base address diff\n");
+ return false;
+ }
+
+ // read address of the name
+ if (ps_pread(ph, (psaddr_t) link_map_addr + LINK_MAP_NAME_OFFSET,
+ &lib_name_addr, sizeof(uintptr_t)) != PS_OK) {
+ print_debug("can't read address of shared object name\n");
+ return false;
+ }
+
+ // read name of the shared object
+ if (read_string(ph, (uintptr_t) lib_name_addr, lib_name, sizeof(lib_name)) != true) {
+ print_debug("can't read shared object name\n");
+ return false;
+ }
+
+ if (lib_name[0] != '\0') {
+ // ignore empty lib names
+ lib_fd = pathmap_open(lib_name);
+
+ if (lib_fd < 0) {
+ print_debug("can't open shared object %s\n", lib_name);
+ // continue with other libraries...
+ } else {
+ if (read_elf_header(lib_fd, &elf_ehdr)) {
+ lib_base = lib_base_diff + find_base_address(lib_fd, &elf_ehdr);
+ print_debug("reading library %s @ 0x%lx [ 0x%lx ]\n",
+ lib_name, lib_base, lib_base_diff);
+ // while adding library mappings we need to use "base difference".
+ if (! read_lib_segments(ph, lib_fd, &elf_ehdr, lib_base_diff)) {
+ print_debug("can't read shared object's segments\n");
+ close(lib_fd);
+ return false;
+ }
+ add_lib_info_fd(ph, lib_name, lib_fd, lib_base);
+ // Map info is added for the library (lib_name) so
+ // we need to re-sort it before calling the p_pdread.
+ if (sort_map_array(ph) != true)
+ return false;
+ } else {
+ print_debug("can't read ELF header for shared object %s\n", lib_name);
+ close(lib_fd);
+ // continue with other libraries...
+ }
+ }
+ }
+
+ // read next link_map address
+ if (ps_pread(ph, (psaddr_t) link_map_addr + LINK_MAP_NEXT_OFFSET,
+ &link_map_addr, sizeof(uintptr_t)) != PS_OK) {
+ print_debug("can't read next link in link_map\n");
+ return false;
+ }
+ }
+
+ return true;
+}
+
+// the one and only one exposed stuff from this file
+struct ps_prochandle* Pgrab_core(const char* exec_file, const char* core_file) {
+ ELF_EHDR core_ehdr;
+ ELF_EHDR exec_ehdr;
+
+ struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
+ if (ph == NULL) {
+ print_debug("can't allocate ps_prochandle\n");
+ return NULL;
+ }
+
+ if ((ph->core = (struct core_data*) calloc(1, sizeof(struct core_data))) == NULL) {
+ free(ph);
+ print_debug("can't allocate ps_prochandle\n");
+ return NULL;
+ }
+
+ // initialize ph
+ ph->ops = &core_ops;
+ ph->core->core_fd = -1;
+ ph->core->exec_fd = -1;
+ ph->core->interp_fd = -1;
+
+ // open the core file
+ if ((ph->core->core_fd = open(core_file, O_RDONLY)) < 0) {
+ print_debug("can't open core file\n");
+ goto err;
+ }
+
+ // read core file ELF header
+ if (read_elf_header(ph->core->core_fd, &core_ehdr) != true || core_ehdr.e_type != ET_CORE) {
+ print_debug("core file is not a valid ELF ET_CORE file\n");
+ goto err;
+ }
+
+ if ((ph->core->exec_fd = open(exec_file, O_RDONLY)) < 0) {
+ print_debug("can't open executable file\n");
+ goto err;
+ }
+
+ if (read_elf_header(ph->core->exec_fd, &exec_ehdr) != true || exec_ehdr.e_type != ET_EXEC) {
+ print_debug("executable file is not a valid ELF ET_EXEC file\n");
+ goto err;
+ }
+
+ // process core file segments
+ if (read_core_segments(ph, &core_ehdr) != true)
+ goto err;
+
+ // process exec file segments
+ if (read_exec_segments(ph, &exec_ehdr) != true)
+ goto err;
+
+ // exec file is also treated like a shared object for symbol search
+ if (add_lib_info_fd(ph, exec_file, ph->core->exec_fd,
+ (uintptr_t)0 + find_base_address(ph->core->exec_fd, &exec_ehdr)) == NULL)
+ goto err;
+
+ // allocate and sort maps into map_array, we need to do this
+ // here because read_shared_lib_info needs to read from debuggee
+ // address space
+ if (sort_map_array(ph) != true)
+ goto err;
+
+ if (read_shared_lib_info(ph) != true)
+ goto err;
+
+ // sort again because we have added more mappings from shared objects
+ if (sort_map_array(ph) != true)
+ goto err;
+
+ if (init_classsharing_workaround(ph) != true)
+ goto err;
+
+ return ph;
+
+err:
+ Prelease(ph);
+ return NULL;
+}
diff --git a/hotspot/agent/src/os/bsd/ps_proc.c b/hotspot/agent/src/os/bsd/ps_proc.c
new file mode 100644
index 0000000..f8957c0
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/ps_proc.c
@@ -0,0 +1,444 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/ptrace.h>
+#include <sys/param.h>
+#include <sys/user.h>
+#include <elf.h>
+#include <sys/elf_common.h>
+#include <sys/link_elf.h>
+#include <libutil.h>
+#include "libproc_impl.h"
+#include "elfmacros.h"
+
+// This file has the libproc implementation specific to live process
+// For core files, refer to ps_core.c
+
+static inline uintptr_t align(uintptr_t ptr, size_t size) {
+ return (ptr & ~(size - 1));
+}
+
+// ---------------------------------------------
+// ptrace functions
+// ---------------------------------------------
+
+// read "size" bytes of data from "addr" within the target process.
+// unlike the standard ptrace() function, process_read_data() can handle
+// unaligned address - alignment check, if required, should be done
+// before calling process_read_data.
+
+static bool process_read_data(struct ps_prochandle* ph, uintptr_t addr, char *buf, size_t size) {
+ int rslt;
+ size_t i, words;
+ uintptr_t end_addr = addr + size;
+ uintptr_t aligned_addr = align(addr, sizeof(int));
+
+ if (aligned_addr != addr) {
+ char *ptr = (char *)&rslt;
+ errno = 0;
+ rslt = ptrace(PT_READ_D, ph->pid, (caddr_t) aligned_addr, 0);
+ if (errno) {
+ print_debug("ptrace(PT_READ_D, ..) failed for %d bytes @ %lx\n", size, addr);
+ return false;
+ }
+ for (; aligned_addr != addr; aligned_addr++, ptr++);
+ for (; ((intptr_t)aligned_addr % sizeof(int)) && aligned_addr < end_addr;
+ aligned_addr++)
+ *(buf++) = *(ptr++);
+ }
+
+ words = (end_addr - aligned_addr) / sizeof(int);
+
+ // assert((intptr_t)aligned_addr % sizeof(int) == 0);
+ for (i = 0; i < words; i++) {
+ errno = 0;
+ rslt = ptrace(PT_READ_D, ph->pid, (caddr_t) aligned_addr, 0);
+ if (errno) {
+ print_debug("ptrace(PT_READ_D, ..) failed for %d bytes @ %lx\n", size, addr);
+ return false;
+ }
+ *(int *)buf = rslt;
+ buf += sizeof(int);
+ aligned_addr += sizeof(int);
+ }
+
+ if (aligned_addr != end_addr) {
+ char *ptr = (char *)&rslt;
+ errno = 0;
+ rslt = ptrace(PT_READ_D, ph->pid, (caddr_t) aligned_addr, 0);
+ if (errno) {
+ print_debug("ptrace(PT_READ_D, ..) failed for %d bytes @ %lx\n", size, addr);
+ return false;
+ }
+ for (; aligned_addr != end_addr; aligned_addr++)
+ *(buf++) = *(ptr++);
+ }
+ return true;
+}
+
+// null implementation for write
+static bool process_write_data(struct ps_prochandle* ph,
+ uintptr_t addr, const char *buf , size_t size) {
+ return false;
+}
+
+// "user" should be a pointer to a reg
+static bool process_get_lwp_regs(struct ps_prochandle* ph, pid_t pid, struct reg *user) {
+ // we have already attached to all thread 'pid's, just use ptrace call
+ // to get regset now. Note that we don't cache regset upfront for processes.
+ if (ptrace(PT_GETREGS, pid, (caddr_t) user, 0) < 0) {
+ print_debug("ptrace(PTRACE_GETREGS, ...) failed for lwp %d\n", pid);
+ return false;
+ }
+ return true;
+}
+
+// fill in ptrace_lwpinfo for lid
+static bool process_get_lwp_info(struct ps_prochandle *ph, lwpid_t lwp_id, void *linfo) {
+ errno = 0;
+ ptrace(PT_LWPINFO, lwp_id, linfo, sizeof(struct ptrace_lwpinfo));
+
+ return (errno == 0)? true: false;
+}
+
+// attach to a process/thread specified by "pid"
+static bool ptrace_attach(pid_t pid) {
+ if (ptrace(PT_ATTACH, pid, NULL, 0) < 0) {
+ print_debug("ptrace(PTRACE_ATTACH, ..) failed for %d\n", pid);
+ return false;
+ } else {
+ int ret;
+ int status;
+ do {
+ // Wait for debuggee to stop.
+ ret = waitpid(pid, &status, 0);
+ if (ret >= 0) {
+ if (WIFSTOPPED(status)) {
+ // Debuggee stopped.
+ return true;
+ } else {
+ print_debug("waitpid(): Child process exited/terminated (status = 0x%x)\n", status);
+ return false;
+ }
+ } else {
+ switch (errno) {
+ case EINTR:
+ continue;
+ break;
+ case ECHILD:
+ print_debug("waitpid() failed. Child process pid (%d) does not exist \n", pid);
+ break;
+ case EINVAL:
+ print_debug("waitpid() failed. Invalid options argument.\n");
+ break;
+ default:
+ print_debug("waitpid() failed. Unexpected error %d\n",errno);
+ }
+ return false;
+ }
+ } while(true);
+ }
+}
+
+// -------------------------------------------------------
+// functions for obtaining library information
+// -------------------------------------------------------
+
+// callback for read_thread_info
+static bool add_new_thread(struct ps_prochandle* ph, pthread_t pthread_id, lwpid_t lwp_id) {
+ return add_thread_info(ph, pthread_id, lwp_id) != NULL;
+}
+
+#if defined(__FreeBSD__) && __FreeBSD_version < 701000
+/*
+ * TEXT_START_ADDR from binutils/ld/emulparams/<arch_spec>.sh
+ * Not the most robust but good enough.
+ */
+
+#if defined(amd64) || defined(x86_64)
+#define TEXT_START_ADDR 0x400000
+#elif defined(i386)
+#define TEXT_START_ADDR 0x8048000
+#else
+#error TEXT_START_ADDR not defined
+#endif
+
+#define BUF_SIZE (PATH_MAX + NAME_MAX + 1)
+
+uintptr_t linkmap_addr(struct ps_prochandle *ph) {
+ uintptr_t ehdr_addr, phdr_addr, dyn_addr, dmap_addr, lmap_addr;
+ ELF_EHDR ehdr;
+ ELF_PHDR *phdrs, *phdr;
+ ELF_DYN *dyns, *dyn;
+ struct r_debug dmap;
+ unsigned long hdrs_size;
+ unsigned int i;
+
+ /* read ELF_EHDR at TEXT_START_ADDR and validate */
+
+ ehdr_addr = (uintptr_t)TEXT_START_ADDR;
+
+ if (process_read_data(ph, ehdr_addr, (char *)&ehdr, sizeof(ehdr)) != true) {
+ print_debug("process_read_data failed for ehdr_addr %p\n", ehdr_addr);
+ return (0);
+ }
+
+ if (!IS_ELF(ehdr) ||
+ ehdr.e_ident[EI_CLASS] != ELF_TARG_CLASS ||
+ ehdr.e_ident[EI_DATA] != ELF_TARG_DATA ||
+ ehdr.e_ident[EI_VERSION] != EV_CURRENT ||
+ ehdr.e_phentsize != sizeof(ELF_PHDR) ||
+ ehdr.e_version != ELF_TARG_VER ||
+ ehdr.e_machine != ELF_TARG_MACH) {
+ print_debug("not an ELF_EHDR at %p\n", ehdr_addr);
+ return (0);
+ }
+
+ /* allocate space for all ELF_PHDR's and read */
+
+ phdr_addr = ehdr_addr + ehdr.e_phoff;
+ hdrs_size = ehdr.e_phnum * sizeof(ELF_PHDR);
+
+ if ((phdrs = malloc(hdrs_size)) == NULL)
+ return (0);
+
+ if (process_read_data(ph, phdr_addr, (char *)phdrs, hdrs_size) != true) {
+ print_debug("process_read_data failed for phdr_addr %p\n", phdr_addr);
+ return (0);
+ }
+
+ /* find PT_DYNAMIC section */
+
+ for (i = 0, phdr = phdrs; i < ehdr.e_phnum; i++, phdr++) {
+ if (phdr->p_type == PT_DYNAMIC)
+ break;
+ }
+
+ if (i >= ehdr.e_phnum) {
+ print_debug("PT_DYNAMIC section not found!\n");
+ free(phdrs);
+ return (0);
+ }
+
+ /* allocate space and read in ELF_DYN headers */
+
+ dyn_addr = phdr->p_vaddr;
+ hdrs_size = phdr->p_memsz;
+ free(phdrs);
+
+ if ((dyns = malloc(hdrs_size)) == NULL)
+ return (0);
+
+ if (process_read_data(ph, dyn_addr, (char *)dyns, hdrs_size) != true) {
+ print_debug("process_read_data failed for dyn_addr %p\n", dyn_addr);
+ free(dyns);
+ return (0);
+ }
+
+ /* find DT_DEBUG */
+
+ dyn = dyns;
+ while (dyn->d_tag != DT_DEBUG && dyn->d_tag != DT_NULL) {
+ dyn++;
+ }
+
+ if (dyn->d_tag != DT_DEBUG) {
+ print_debug("failed to find DT_DEBUG\n");
+ free(dyns);
+ return (0);
+ }
+
+ /* read struct r_debug into dmap */
+
+ dmap_addr = (uintptr_t)dyn->d_un.d_ptr;
+ free(dyns);
+
+ if (process_read_data(ph, dmap_addr, (char *)&dmap, sizeof(dmap)) != true) {
+ print_debug("process_read_data failed for dmap_addr %p\n", dmap_addr);
+ return (0);
+ }
+
+ lmap_addr = (uintptr_t)dmap.r_map;
+
+ return (lmap_addr);
+}
+#endif // __FreeBSD__ && __FreeBSD_version < 701000
+
+static bool read_lib_info(struct ps_prochandle* ph) {
+#if defined(__FreeBSD__) && __FreeBSD_version >= 701000
+ struct kinfo_vmentry *freep, *kve;
+ int i, cnt;
+
+ freep = kinfo_getvmmap(ph->pid, &cnt);
+ if (freep == NULL) {
+ print_debug("can't get vm map for pid\n", ph->pid);
+ return false;
+ }
+
+ for (i = 0; i < cnt; i++) {
+ kve = &freep[i];
+ if ((kve->kve_flags & KVME_FLAG_COW) &&
+ kve->kve_path != NULL &&
+ strlen(kve->kve_path) > 0) {
+
+ if (find_lib(ph, kve->kve_path) == false) {
+ lib_info* lib;
+ if ((lib = add_lib_info(ph, kve->kve_path,
+ (uintptr_t) kve->kve_start)) == NULL)
+ continue; // ignore, add_lib_info prints error
+
+ // we don't need to keep the library open, symtab is already
+ // built. Only for core dump we need to keep the fd open.
+ close(lib->fd);
+ lib->fd = -1;
+ }
+ }
+ }
+
+ free(freep);
+
+ return true;
+#else
+ char *l_name;
+ struct link_map *lmap;
+ uintptr_t lmap_addr;
+
+ if ((l_name = malloc(BUF_SIZE)) == NULL)
+ return false;
+
+ if ((lmap = malloc(sizeof(*lmap))) == NULL) {
+ free(l_name);
+ return false;
+ }
+
+ lmap_addr = linkmap_addr(ph);
+
+ if (lmap_addr == 0) {
+ free(l_name);
+ free(lmap);
+ return false;
+ }
+
+ do {
+ if (process_read_data(ph, lmap_addr, (char *)lmap, sizeof(*lmap)) != true) {
+ print_debug("process_read_data failed for lmap_addr %p\n", lmap_addr);
+ free (l_name);
+ free (lmap);
+ return false;
+ }
+
+ if (process_read_data(ph, (uintptr_t)lmap->l_name, l_name,
+ BUF_SIZE) != true) {
+ print_debug("process_read_data failed for lmap->l_name %p\n",
+ lmap->l_name);
+ free (l_name);
+ free (lmap);
+ return false;
+ }
+
+ if (find_lib(ph, l_name) == false) {
+ lib_info* lib;
+ if ((lib = add_lib_info(ph, l_name,
+ (uintptr_t) lmap->l_addr)) == NULL)
+ continue; // ignore, add_lib_info prints error
+
+ // we don't need to keep the library open, symtab is already
+ // built. Only for core dump we need to keep the fd open.
+ close(lib->fd);
+ lib->fd = -1;
+ }
+ lmap_addr = (uintptr_t)lmap->l_next;
+ } while (lmap->l_next != NULL);
+
+ free (l_name);
+ free (lmap);
+
+ return true;
+#endif
+}
+
+// detach a given pid
+static bool ptrace_detach(pid_t pid) {
+ if (pid && ptrace(PT_DETACH, pid, (caddr_t)1, 0) < 0) {
+ print_debug("ptrace(PTRACE_DETACH, ..) failed for %d\n", pid);
+ return false;
+ } else {
+ return true;
+ }
+}
+
+static void process_cleanup(struct ps_prochandle* ph) {
+ ptrace_detach(ph->pid);
+}
+
+static ps_prochandle_ops process_ops = {
+ .release= process_cleanup,
+ .p_pread= process_read_data,
+ .p_pwrite= process_write_data,
+ .get_lwp_regs= process_get_lwp_regs,
+ .get_lwp_info= process_get_lwp_info
+};
+
+// attach to the process. One and only one exposed stuff
+struct ps_prochandle* Pgrab(pid_t pid) {
+ struct ps_prochandle* ph = NULL;
+ thread_info* thr = NULL;
+
+ if ( (ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle))) == NULL) {
+ print_debug("can't allocate memory for ps_prochandle\n");
+ return NULL;
+ }
+
+ if (ptrace_attach(pid) != true) {
+ free(ph);
+ return NULL;
+ }
+
+ // initialize ps_prochandle
+ ph->pid = pid;
+
+ // initialize vtable
+ ph->ops = &process_ops;
+
+ // read library info and symbol tables, must do this before attaching threads,
+ // as the symbols in the pthread library will be used to figure out
+ // the list of threads within the same process.
+ if (read_lib_info(ph) != true) {
+ ptrace_detach(pid);
+ free(ph);
+ return NULL;
+ }
+
+ // read thread info
+ read_thread_info(ph, add_new_thread);
+
+ return ph;
+}
diff --git a/hotspot/agent/src/os/bsd/salibelf.c b/hotspot/agent/src/os/bsd/salibelf.c
new file mode 100644
index 0000000..4c860a0
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/salibelf.c
@@ -0,0 +1,126 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 "salibelf.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+extern void print_debug(const char*,...);
+
+// ELF file parsing helpers. Note that we do *not* use libelf here.
+int read_elf_header(int fd, ELF_EHDR* ehdr) {
+ if (pread(fd, ehdr, sizeof (ELF_EHDR), 0) != sizeof (ELF_EHDR) ||
+ memcmp(&ehdr->e_ident[EI_MAG0], ELFMAG, SELFMAG) != 0 ||
+ ehdr->e_version != EV_CURRENT) {
+ return 0;
+ }
+ return 1;
+}
+
+bool is_elf_file(int fd) {
+ ELF_EHDR ehdr;
+ return read_elf_header(fd, &ehdr);
+}
+
+// read program header table of an ELF file
+ELF_PHDR* read_program_header_table(int fd, ELF_EHDR* hdr) {
+ ELF_PHDR* phbuf = 0;
+ // allocate memory for program header table
+ size_t nbytes = hdr->e_phnum * hdr->e_phentsize;
+
+ if ((phbuf = (ELF_PHDR*) malloc(nbytes)) == NULL) {
+ print_debug("can't allocate memory for reading program header table\n");
+ return NULL;
+ }
+
+ if (pread(fd, phbuf, nbytes, hdr->e_phoff) != nbytes) {
+ print_debug("ELF file is truncated! can't read program header table\n");
+ free(phbuf);
+ return NULL;
+ }
+
+ return phbuf;
+}
+
+// read section header table of an ELF file
+ELF_SHDR* read_section_header_table(int fd, ELF_EHDR* hdr) {
+ ELF_SHDR* shbuf = 0;
+ // allocate memory for section header table
+ size_t nbytes = hdr->e_shnum * hdr->e_shentsize;
+
+ if ((shbuf = (ELF_SHDR*) malloc(nbytes)) == NULL) {
+ print_debug("can't allocate memory for reading section header table\n");
+ return NULL;
+ }
+
+ if (pread(fd, shbuf, nbytes, hdr->e_shoff) != nbytes) {
+ print_debug("ELF file is truncated! can't read section header table\n");
+ free(shbuf);
+ return NULL;
+ }
+
+ return shbuf;
+}
+
+// read a particular section's data
+void* read_section_data(int fd, ELF_EHDR* ehdr, ELF_SHDR* shdr) {
+ void *buf = NULL;
+ if (shdr->sh_type == SHT_NOBITS || shdr->sh_size == 0) {
+ return buf;
+ }
+ if ((buf = calloc(shdr->sh_size, 1)) == NULL) {
+ print_debug("can't allocate memory for reading section data\n");
+ return NULL;
+ }
+ if (pread(fd, buf, shdr->sh_size, shdr->sh_offset) != shdr->sh_size) {
+ free(buf);
+ print_debug("section data read failed\n");
+ return NULL;
+ }
+ return buf;
+}
+
+uintptr_t find_base_address(int fd, ELF_EHDR* ehdr) {
+ uintptr_t baseaddr = (uintptr_t)-1;
+ int cnt;
+ ELF_PHDR *phbuf, *phdr;
+
+ // read program header table
+ if ((phbuf = read_program_header_table(fd, ehdr)) == NULL) {
+ goto quit;
+ }
+
+ // the base address of a shared object is the lowest vaddr of
+ // its loadable segments (PT_LOAD)
+ for (phdr = phbuf, cnt = 0; cnt < ehdr->e_phnum; cnt++, phdr++) {
+ if (phdr->p_type == PT_LOAD && phdr->p_vaddr < baseaddr) {
+ baseaddr = phdr->p_vaddr;
+ }
+ }
+
+quit:
+ if (phbuf) free(phbuf);
+ return baseaddr;
+}
diff --git a/hotspot/agent/src/os/linux/salibelf.h b/hotspot/agent/src/os/bsd/salibelf.h
similarity index 100%
copy from hotspot/agent/src/os/linux/salibelf.h
copy to hotspot/agent/src/os/bsd/salibelf.h
diff --git a/hotspot/agent/src/os/bsd/symtab.c b/hotspot/agent/src/os/bsd/symtab.c
new file mode 100644
index 0000000..0362cf0
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/symtab.c
@@ -0,0 +1,239 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+
+#include <unistd.h>
+#include <search.h>
+#include <stdlib.h>
+#include <string.h>
+#include <db.h>
+#include <fcntl.h>
+#include "symtab.h"
+#include "salibelf.h"
+
+
+// ----------------------------------------------------
+// functions for symbol lookups
+// ----------------------------------------------------
+
+struct elf_section {
+ ELF_SHDR *c_shdr;
+ void *c_data;
+};
+
+struct elf_symbol {
+ char *name;
+ uintptr_t offset;
+ uintptr_t size;
+};
+
+typedef struct symtab {
+ char *strs;
+ size_t num_symbols;
+ struct elf_symbol *symbols;
+ DB* hash_table;
+} symtab_t;
+
+// read symbol table from given fd.
+struct symtab* build_symtab(int fd) {
+ ELF_EHDR ehdr;
+ struct symtab* symtab = NULL;
+
+ // Reading of elf header
+ struct elf_section *scn_cache = NULL;
+ int cnt = 0;
+ ELF_SHDR* shbuf = NULL;
+ ELF_SHDR* cursct = NULL;
+ ELF_PHDR* phbuf = NULL;
+ int symtab_found = 0;
+ int dynsym_found = 0;
+ uint32_t symsection = SHT_SYMTAB;
+
+ uintptr_t baseaddr = (uintptr_t)-1;
+
+ lseek(fd, (off_t)0L, SEEK_SET);
+ if (! read_elf_header(fd, &ehdr)) {
+ // not an elf
+ return NULL;
+ }
+
+ // read ELF header
+ if ((shbuf = read_section_header_table(fd, &ehdr)) == NULL) {
+ goto quit;
+ }
+
+ baseaddr = find_base_address(fd, &ehdr);
+
+ scn_cache = calloc(ehdr.e_shnum, sizeof(*scn_cache));
+ if (scn_cache == NULL) {
+ goto quit;
+ }
+
+ for (cursct = shbuf, cnt = 0; cnt < ehdr.e_shnum; cnt++) {
+ scn_cache[cnt].c_shdr = cursct;
+ if (cursct->sh_type == SHT_SYMTAB ||
+ cursct->sh_type == SHT_STRTAB ||
+ cursct->sh_type == SHT_DYNSYM) {
+ if ( (scn_cache[cnt].c_data = read_section_data(fd, &ehdr, cursct)) == NULL) {
+ goto quit;
+ }
+ }
+
+ if (cursct->sh_type == SHT_SYMTAB)
+ symtab_found++;
+
+ if (cursct->sh_type == SHT_DYNSYM)
+ dynsym_found++;
+
+ cursct++;
+ }
+
+ if (!symtab_found && dynsym_found)
+ symsection = SHT_DYNSYM;
+
+ for (cnt = 1; cnt < ehdr.e_shnum; cnt++) {
+ ELF_SHDR *shdr = scn_cache[cnt].c_shdr;
+
+ if (shdr->sh_type == symsection) {
+ ELF_SYM *syms;
+ int j, n, rslt;
+ size_t size;
+
+ // FIXME: there could be multiple data buffers associated with the
+ // same ELF section. Here we can handle only one buffer. See man page
+ // for elf_getdata on Solaris.
+
+ // guarantee(symtab == NULL, "multiple symtab");
+ symtab = calloc(1, sizeof(*symtab));
+ if (symtab == NULL) {
+ goto quit;
+ }
+ // the symbol table
+ syms = (ELF_SYM *)scn_cache[cnt].c_data;
+
+ // number of symbols
+ n = shdr->sh_size / shdr->sh_entsize;
+
+ // create hash table, we use berkeley db to
+ // manipulate the hash table.
+ symtab->hash_table = dbopen(NULL, O_CREAT | O_RDWR, 0600, DB_HASH, NULL);
+ // guarantee(symtab->hash_table, "unexpected failure: dbopen");
+
+ // shdr->sh_link points to the section that contains the actual strings
+ // for symbol names. the st_name field in ELF_SYM is just the
+ // string table index. we make a copy of the string table so the
+ // strings will not be destroyed by elf_end.
+ size = scn_cache[shdr->sh_link].c_shdr->sh_size;
+ symtab->strs = malloc(size);
+ memcpy(symtab->strs, scn_cache[shdr->sh_link].c_data, size);
+
+ // allocate memory for storing symbol offset and size;
+ symtab->num_symbols = n;
+ symtab->symbols = calloc(n , sizeof(*symtab->symbols));
+
+ // copy symbols info our symtab and enter them info the hash table
+ for (j = 0; j < n; j++, syms++) {
+ DBT key, value;
+ char *sym_name = symtab->strs + syms->st_name;
+
+ // skip non-object and non-function symbols
+ int st_type = ELF_ST_TYPE(syms->st_info);
+ if ( st_type != STT_FUNC && st_type != STT_OBJECT)
+ continue;
+ // skip empty strings and undefined symbols
+ if (*sym_name == '\0' || syms->st_shndx == SHN_UNDEF) continue;
+
+ symtab->symbols[j].name = sym_name;
+ symtab->symbols[j].offset = syms->st_value - baseaddr;
+ symtab->symbols[j].size = syms->st_size;
+
+ key.data = sym_name;
+ key.size = strlen(sym_name) + 1;
+ value.data = &(symtab->symbols[j]);
+ value.size = sizeof(void *);
+ (*symtab->hash_table->put)(symtab->hash_table, &key, &value, 0);
+ }
+ }
+ }
+
+quit:
+ if (shbuf) free(shbuf);
+ if (phbuf) free(phbuf);
+ if (scn_cache) {
+ for (cnt = 0; cnt < ehdr.e_shnum; cnt++) {
+ if (scn_cache[cnt].c_data != NULL) {
+ free(scn_cache[cnt].c_data);
+ }
+ }
+ free(scn_cache);
+ }
+ return symtab;
+}
+
+void destroy_symtab(struct symtab* symtab) {
+ if (!symtab) return;
+ if (symtab->strs) free(symtab->strs);
+ if (symtab->symbols) free(symtab->symbols);
+ if (symtab->hash_table) {
+ symtab->hash_table->close(symtab->hash_table);
+ }
+ free(symtab);
+}
+
+uintptr_t search_symbol(struct symtab* symtab, uintptr_t base,
+ const char *sym_name, int *sym_size) {
+ DBT key, value;
+ int ret;
+
+ // library does not have symbol table
+ if (!symtab || !symtab->hash_table)
+ return 0;
+
+ key.data = (char*)(uintptr_t)sym_name;
+ key.size = strlen(sym_name) + 1;
+ ret = (*symtab->hash_table->get)(symtab->hash_table, &key, &value, 0);
+ if (ret == 0) {
+ struct elf_symbol *sym = value.data;
+ uintptr_t rslt = (uintptr_t) ((char*)base + sym->offset);
+ if (sym_size) *sym_size = sym->size;
+ return rslt;
+ }
+
+quit:
+ return 0;
+}
+
+const char* nearest_symbol(struct symtab* symtab, uintptr_t offset,
+ uintptr_t* poffset) {
+ int n = 0;
+ if (!symtab) return NULL;
+ for (; n < symtab->num_symbols; n++) {
+ struct elf_symbol* sym = &(symtab->symbols[n]);
+ if (sym->name != NULL &&
+ offset >= sym->offset && offset < sym->offset + sym->size) {
+ if (poffset) *poffset = (offset - sym->offset);
+ return sym->name;
+ }
+ }
+ return NULL;
+}
diff --git a/hotspot/agent/src/os/bsd/symtab.h b/hotspot/agent/src/os/bsd/symtab.h
new file mode 100644
index 0000000..9b7eef7
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/symtab.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2003, 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 _SYMTAB_H_
+#define _SYMTAB_H_
+
+#include <stdint.h>
+
+// interface to manage ELF symbol tables
+
+struct symtab;
+
+// build symbol table for a given ELF file descriptor
+struct symtab* build_symtab(int fd);
+
+// destroy the symbol table
+void destroy_symtab(struct symtab* symtab);
+
+// search for symbol in the given symbol table. Adds offset
+// to the base uintptr_t supplied. Returns NULL if not found.
+uintptr_t search_symbol(struct symtab* symtab, uintptr_t base,
+ const char *sym_name, int *sym_size);
+
+// look for nearest symbol for a given offset (not address - base
+// subtraction done by caller
+const char* nearest_symbol(struct symtab* symtab, uintptr_t offset,
+ uintptr_t* poffset);
+
+#endif /*_SYMTAB_H_*/
diff --git a/hotspot/agent/src/os/bsd/test.c b/hotspot/agent/src/os/bsd/test.c
new file mode 100644
index 0000000..3659542
--- /dev/null
+++ b/hotspot/agent/src/os/bsd/test.c
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please 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 <stdio.h>
+#include <stdlib.h>
+#include "libproc.h"
+
+int main(int argc, char** argv) {
+ struct ps_prochandle* ph;
+
+ init_libproc(true);
+ switch (argc) {
+ case 2: {
+ // process
+ ph = Pgrab(atoi(argv[1]));
+ break;
+ }
+
+ case 3: {
+ // core
+ ph = Pgrab_core(argv[1], argv[2]);
+ break;
+ }
+
+ default: {
+ fprintf(stderr, "usage %s <pid> or %s <exec file> <core file>\n", argv[0], argv[0]);
+ return 1;
+ }
+ }
+
+ if (ph) {
+ Prelease(ph);
+ return 0;
+ } else {
+ printf("can't connect to debuggee\n");
+ return 1;
+ }
+}
diff --git a/hotspot/agent/src/os/solaris/Makefile b/hotspot/agent/src/os/solaris/Makefile
index f1bb0b3..0e964bf 100644
--- a/hotspot/agent/src/os/solaris/Makefile
+++ b/hotspot/agent/src/os/solaris/Makefile
@@ -24,9 +24,7 @@
all:
- cd dbx; $(MAKE) all
cd proc; $(MAKE) all
clean:
- cd dbx; $(MAKE) clean
cd proc; $(MAKE) clean
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java
new file mode 100644
index 0000000..ed68875
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/BsdVtblAccess.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.types.basic.*;
+
+public class BsdVtblAccess extends BasicVtblAccess {
+ private String vt;
+
+ public BsdVtblAccess(SymbolLookup symbolLookup,
+ String[] dllNames) {
+ super(symbolLookup, dllNames);
+
+ if (symbolLookup.lookup("libjvm.so", "__vt_10JavaThread") != null ||
+ symbolLookup.lookup("libjvm_g.so", "__vt_10JavaThread") != null) {
+ // old C++ ABI
+ vt = "__vt_";
+ } else {
+ // new C++ ABI
+ vt = "_ZTV";
+ }
+ }
+
+ protected String vtblSymbolForType(Type type) {
+ return vt + type.getName().length() + type;
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java
index 1594818..5071235 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/CLHSDB.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -170,6 +170,7 @@ public class CLHSDB {
final String errMsg = formatMessage(e.getMessage(), 80);
System.err.println("Unable to connect to process ID " + pid + ":\n\n" + errMsg);
agent.detach();
+ e.printStackTrace();
return;
}
}
@@ -191,6 +192,7 @@ public class CLHSDB {
final String errMsg = formatMessage(e.getMessage(), 80);
System.err.println("Unable to open core file\n" + corePath + ":\n\n" + errMsg);
agent.detach();
+ e.printStackTrace();
return;
}
}
@@ -209,6 +211,7 @@ public class CLHSDB {
final String errMsg = formatMessage(e.getMessage(), 80);
System.err.println("Unable to connect to machine \"" + remoteMachineName + "\":\n\n" + errMsg);
agent.detach();
+ e.printStackTrace();
return;
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java
index 96cfe83..8c5f2a6 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/CommandProcessor.java
@@ -40,6 +40,8 @@ import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.opto.*;
+import sun.jvm.hotspot.ci.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.utilities.*;
import sun.jvm.hotspot.utilities.soql.*;
@@ -48,6 +50,8 @@ import sun.jvm.hotspot.ui.tree.*;
import sun.jvm.hotspot.tools.*;
import sun.jvm.hotspot.tools.ObjectHistogram;
import sun.jvm.hotspot.tools.StackTrace;
+import sun.jvm.hotspot.tools.jcore.ClassDump;
+import sun.jvm.hotspot.tools.jcore.ClassFilter;
public class CommandProcessor {
public abstract static class DebuggerInterface {
@@ -59,6 +63,27 @@ public class CommandProcessor {
public abstract void reattach();
}
+ public static class BootFilter implements ClassFilter {
+ public boolean canInclude(InstanceKlass kls) {
+ return kls.getClassLoader() == null;
+ }
+ }
+
+ public static class NonBootFilter implements ClassFilter {
+ private HashMap emitted = new HashMap();
+ public boolean canInclude(InstanceKlass kls) {
+ if (kls.getClassLoader() == null) return false;
+ if (emitted.get(kls.getName()) != null) {
+ // Since multiple class loaders are being shoved
+ // together duplicate classes are a possibilty. For
+ // now just ignore them.
+ return false;
+ }
+ emitted.put(kls.getName(), kls);
+ return true;
+ }
+ }
+
static class Tokens {
final String input;
int i;
@@ -258,9 +283,14 @@ public class CommandProcessor {
}
void dumpFields(Type type) {
+ dumpFields(type, true);
+ }
+
+ void dumpFields(Type type, boolean allowStatic) {
Iterator i = type.getFields();
while (i.hasNext()) {
Field f = (Field) i.next();
+ if (!allowStatic && f.isStatic()) continue;
out.print("field ");
quote(type.getName());
out.print(" ");
@@ -458,13 +488,18 @@ public class CommandProcessor {
});
}
},
- new Command("flags", "flags [ flag ]", false) {
+ new Command("flags", "flags [ flag | -nd ]", false) {
public void doit(Tokens t) {
int tokens = t.countTokens();
if (tokens != 0 && tokens != 1) {
usage();
} else {
String name = tokens > 0 ? t.nextToken() : null;
+ boolean nonDefault = false;
+ if (name != null && name.equals("-nd")) {
+ name = null;
+ nonDefault = true;
+ }
VM.Flag[] flags = VM.getVM().getCommandLineFlags();
if (flags == null) {
@@ -474,7 +509,12 @@ public class CommandProcessor {
for (int f = 0; f < flags.length; f++) {
VM.Flag flag = flags[f];
if (name == null || flag.getName().equals(name)) {
- out.println(flag.getName() + " = " + flag.getValue());
+
+ if (nonDefault && flag.getOrigin() == 0) {
+ // only print flags which aren't their defaults
+ continue;
+ }
+ out.println(flag.getName() + " = " + flag.getValue() + " " + flag.getOrigin());
printed = true;
}
}
@@ -586,6 +626,158 @@ public class CommandProcessor {
}
}
},
+ new Command("printmdo", "printmdo [ -a | expression ]", false) {
+ // Print every MDO in the heap or the one referenced by expression.
+ public void doit(Tokens t) {
+ if (t.countTokens() != 1) {
+ usage();
+ } else {
+ String s = t.nextToken();
+ if (s.equals("-a")) {
+ HeapVisitor iterator = new DefaultHeapVisitor() {
+ public boolean doObj(Oop obj) {
+ if (obj instanceof MethodData) {
+ Method m = ((MethodData)obj).getMethod();
+ out.println("MethodData " + obj.getHandle() + " for " +
+ "method " + m.getMethodHolder().getName().asString() + "." +
+ m.getName().asString() +
+ m.getSignature().asString() + "@" + m.getHandle());
+ ((MethodData)obj).printDataOn(out);
+ }
+ return false;
+ }
+ };
+ VM.getVM().getObjectHeap().iteratePerm(iterator);
+ } else {
+ Address a = VM.getVM().getDebugger().parseAddress(s);
+ OopHandle handle = a.addOffsetToAsOopHandle(0);
+ MethodData mdo = (MethodData)VM.getVM().getObjectHeap().newOop(handle);
+ mdo.printDataOn(out);
+ }
+ }
+ }
+ },
+ new Command("dumpideal", "dumpideal { -a | id }", false) {
+ // Do a full dump of the nodes reachabile from root in each compiler thread.
+ public void doit(Tokens t) {
+ if (t.countTokens() != 1) {
+ usage();
+ } else {
+ String name = t.nextToken();
+ boolean all = name.equals("-a");
+ Threads threads = VM.getVM().getThreads();
+ for (JavaThread thread = threads.first(); thread != null; thread = thread.next()) {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ thread.printThreadIDOn(new PrintStream(bos));
+ if (all || bos.toString().equals(name)) {
+ if (thread instanceof CompilerThread) {
+ CompilerThread ct = (CompilerThread)thread;
+ out.println(ct);
+ ciEnv env = ct.env();
+ if (env != null) {
+ Compile c = env.compilerData();
+ c.root().dump(9999, out);
+ } else {
+ out.println(" not compiling");
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ new Command("dumpcfg", "dumpcfg { -a | id }", false) {
+ // Dump the PhaseCFG for every compiler thread that has one live.
+ public void doit(Tokens t) {
+ if (t.countTokens() != 1) {
+ usage();
+ } else {
+ String name = t.nextToken();
+ boolean all = name.equals("-a");
+ Threads threads = VM.getVM().getThreads();
+ for (JavaThread thread = threads.first(); thread != null; thread = thread.next()) {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ thread.printThreadIDOn(new PrintStream(bos));
+ if (all || bos.toString().equals(name)) {
+ if (thread instanceof CompilerThread) {
+ CompilerThread ct = (CompilerThread)thread;
+ out.println(ct);
+ ciEnv env = ct.env();
+ if (env != null) {
+ Compile c = env.compilerData();
+ c.cfg().dump(out);
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ new Command("dumpilt", "dumpilt { -a | id }", false) {
+ // dumps the InlineTree of a C2 compile
+ public void doit(Tokens t) {
+ if (t.countTokens() != 1) {
+ usage();
+ } else {
+ String name = t.nextToken();
+ boolean all = name.equals("-a");
+ Threads threads = VM.getVM().getThreads();
+ for (JavaThread thread = threads.first(); thread != null; thread = thread.next()) {
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ thread.printThreadIDOn(new PrintStream(bos));
+ if (all || bos.toString().equals(name)) {
+ if (thread instanceof CompilerThread) {
+ CompilerThread ct = (CompilerThread)thread;
+ ciEnv env = ct.env();
+ if (env != null) {
+ Compile c = env.compilerData();
+ InlineTree ilt = c.ilt();
+ if (ilt != null) {
+ ilt.print(out);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ new Command("vmstructsdump", "vmstructsdump", false) {
+ public void doit(Tokens t) {
+ if (t.countTokens() != 0) {
+ usage();
+ return;
+ }
+
+ // Dump a copy of the type database in a form that can
+ // be read back.
+ Iterator i = agent.getTypeDataBase().getTypes();
+ // Make sure the types are emitted in an order than can be read back in
+ HashSet emitted = new HashSet();
+ Stack pending = new Stack();
+ while (i.hasNext()) {
+ Type n = (Type)i.next();
+ if (emitted.contains(n.getName())) {
+ continue;
+ }
+
+ while (n != null && !emitted.contains(n.getName())) {
+ pending.push(n);
+ n = n.getSuperclass();
+ }
+ while (!pending.empty()) {
+ n = (Type)pending.pop();
+ dumpType(n);
+ emitted.add(n.getName());
+ }
+ }
+ i = agent.getTypeDataBase().getTypes();
+ while (i.hasNext()) {
+ dumpFields((Type)i.next(), false);
+ }
+ }
+ },
+
new Command("inspect", "inspect expression", false) {
public void doit(Tokens t) {
if (t.countTokens() != 1) {
@@ -760,6 +952,50 @@ public class CommandProcessor {
}
}
},
+ new Command("intConstant", "intConstant [ name [ value ] ]", true) {
+ public void doit(Tokens t) {
+ if (t.countTokens() != 1 && t.countTokens() != 0 && t.countTokens() != 2) {
+ usage();
+ return;
+ }
+ HotSpotTypeDataBase db = (HotSpotTypeDataBase)agent.getTypeDataBase();
+ if (t.countTokens() == 1) {
+ out.println("intConstant " + name + " " + db.lookupIntConstant(name));
+ } else if (t.countTokens() == 0) {
+ Iterator i = db.getIntConstants();
+ while (i.hasNext()) {
+ String name = (String)i.next();
+ out.println("intConstant " + name + " " + db.lookupIntConstant(name));
+ }
+ } else if (t.countTokens() == 2) {
+ String name = t.nextToken();
+ Integer value = Integer.valueOf(t.nextToken());
+ db.addIntConstant(name, value);
+ }
+ }
+ },
+ new Command("longConstant", "longConstant [ name [ value ] ]", true) {
+ public void doit(Tokens t) {
+ if (t.countTokens() != 1 && t.countTokens() != 0 && t.countTokens() != 2) {
+ usage();
+ return;
+ }
+ HotSpotTypeDataBase db = (HotSpotTypeDataBase)agent.getTypeDataBase();
+ if (t.countTokens() == 1) {
+ out.println("longConstant " + name + " " + db.lookupLongConstant(name));
+ } else if (t.countTokens() == 0) {
+ Iterator i = db.getLongConstants();
+ while (i.hasNext()) {
+ String name = (String)i.next();
+ out.println("longConstant " + name + " " + db.lookupLongConstant(name));
+ }
+ } else if (t.countTokens() == 2) {
+ String name = t.nextToken();
+ Long value = Long.valueOf(t.nextToken());
+ db.addLongConstant(name, value);
+ }
+ }
+ },
new Command("field", "field [ type [ name fieldtype isStatic offset address ] ]", true) {
public void doit(Tokens t) {
if (t.countTokens() != 1 && t.countTokens() != 0 && t.countTokens() != 6) {
@@ -1311,13 +1547,13 @@ public class CommandProcessor {
return;
}
- executeCommand(ln);
+ executeCommand(ln, prompt);
}
}
static Pattern historyPattern = Pattern.compile("((!\\*)|(!\\$)|(!!-?)|(!-?[0-9][0-9]*)|(![a-zA-Z][^ ]*))");
- public void executeCommand(String ln) {
+ public void executeCommand(String ln, boolean putInHistory) {
if (ln.indexOf('!') != -1) {
int size = history.size();
if (size == 0) {
@@ -1406,7 +1642,7 @@ public class CommandProcessor {
Tokens t = new Tokens(ln);
if (t.hasMoreTokens()) {
boolean error = false;
- history.add(ln);
+ if (putInHistory) history.add(ln);
int len = t.countTokens();
if (len > 2) {
String r = t.at(len - 2);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java
index 3a5e91a..cb5d21b 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/DebugServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,7 +25,6 @@
package sun.jvm.hotspot;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.dbx.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.oops.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
index 5e7e4fb..d48c160 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HSDB.java
@@ -1740,7 +1740,7 @@ public class HSDB implements ObjectHistogramPanel.Listener, SAListener {
else if (f.isCompiledFrame()) { tty.print("compiled"); }
else if (f.isEntryFrame()) { tty.print("entry"); }
else if (f.isNativeFrame()) { tty.print("native"); }
- else if (f.isGlueFrame()) { tty.print("glue"); }
+ else if (f.isRuntimeFrame()) { tty.print("runtime"); }
else { tty.print("external"); }
tty.print(" frame with PC = " + f.getPC() + ", SP = " + f.getSP() + ", FP = " + f.getFP());
if (f.isSignalHandlerFrameDbg()) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java
index fddbe3a..233bc17 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -28,10 +28,9 @@ import java.io.PrintStream;
import java.net.*;
import java.rmi.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.dbx.*;
+import sun.jvm.hotspot.debugger.bsd.*;
import sun.jvm.hotspot.debugger.proc.*;
import sun.jvm.hotspot.debugger.remote.*;
-import sun.jvm.hotspot.debugger.win32.*;
import sun.jvm.hotspot.debugger.windbg.*;
import sun.jvm.hotspot.debugger.linux.*;
import sun.jvm.hotspot.memory.*;
@@ -337,6 +336,8 @@ public class HotSpotAgent {
setupDebuggerWin32();
} else if (os.equals("linux")) {
setupDebuggerLinux();
+ } else if (os.equals("bsd")) {
+ setupDebuggerBsd();
} else {
// Add support for more operating systems here
throw new DebuggerException("Operating system " + os + " not yet supported");
@@ -392,6 +393,10 @@ public class HotSpotAgent {
db = new HotSpotTypeDataBase(machDesc,
new LinuxVtblAccess(debugger, jvmLibNames),
debugger, jvmLibNames);
+ } else if (os.equals("bsd")) {
+ db = new HotSpotTypeDataBase(machDesc,
+ new BsdVtblAccess(debugger, jvmLibNames),
+ debugger, jvmLibNames);
} else {
throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess yet)");
}
@@ -436,113 +441,35 @@ public class HotSpotAgent {
private void setupDebuggerSolaris() {
setupJVMLibNamesSolaris();
- if(System.getProperty("sun.jvm.hotspot.debugger.useProcDebugger") != null) {
- ProcDebuggerLocal dbg = new ProcDebuggerLocal(null, true);
- debugger = dbg;
- attachDebugger();
-
- // Set up CPU-dependent stuff
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("sparc")) {
- int addressSize = dbg.getRemoteProcessAddressSize();
- if (addressSize == -1) {
- throw new DebuggerException("Error occurred while trying to determine the remote process's " +
- "address size");
- }
-
- if (addressSize == 32) {
- machDesc = new MachineDescriptionSPARC32Bit();
- } else if (addressSize == 64) {
- machDesc = new MachineDescriptionSPARC64Bit();
- } else {
- throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
- }
- } else if (cpu.equals("amd64")) {
- machDesc = new MachineDescriptionAMD64();
- } else {
- throw new DebuggerException("Solaris only supported on sparc/sparcv9/x86/amd64");
- }
-
- dbg.setMachineDescription(machDesc);
- return;
+ ProcDebuggerLocal dbg = new ProcDebuggerLocal(null, true);
+ debugger = dbg;
+ attachDebugger();
- } else {
- String dbxPathName;
- String dbxPathPrefix;
- String dbxSvcAgentDSOPathName;
- String dbxSvcAgentDSOPathPrefix;
- String[] dbxSvcAgentDSOPathNames = null;
-
- // use path names/prefixes specified on command
- dbxPathName = System.getProperty("dbxPathName");
- if (dbxPathName == null) {
- dbxPathPrefix = System.getProperty("dbxPathPrefix");
- if (dbxPathPrefix == null) {
- dbxPathPrefix = defaultDbxPathPrefix;
- }
- dbxPathName = dbxPathPrefix + fileSep + os + fileSep + cpu + fileSep + "bin" + fileSep + "dbx";
+ // Set up CPU-dependent stuff
+ if (cpu.equals("x86")) {
+ machDesc = new MachineDescriptionIntelX86();
+ } else if (cpu.equals("sparc")) {
+ int addressSize = dbg.getRemoteProcessAddressSize();
+ if (addressSize == -1) {
+ throw new DebuggerException("Error occurred while trying to determine the remote process's " +
+ "address size");
}
- dbxSvcAgentDSOPathName = System.getProperty("dbxSvcAgentDSOPathName");
- if (dbxSvcAgentDSOPathName != null) {
- dbxSvcAgentDSOPathNames = new String[] { dbxSvcAgentDSOPathName } ;
+ if (addressSize == 32) {
+ machDesc = new MachineDescriptionSPARC32Bit();
+ } else if (addressSize == 64) {
+ machDesc = new MachineDescriptionSPARC64Bit();
} else {
- dbxSvcAgentDSOPathPrefix = System.getProperty("dbxSvcAgentDSOPathPrefix");
- if (dbxSvcAgentDSOPathPrefix == null) {
- dbxSvcAgentDSOPathPrefix = defaultDbxSvcAgentDSOPathPrefix;
- }
- if (cpu.equals("sparc")) {
- dbxSvcAgentDSOPathNames = new String[] {
- // FIXME: bad hack for SPARC v9. This is necessary because
- // there are two dbx executables on SPARC, one for v8 and one
- // for v9, and it isn't obvious how to tell the two apart
- // using the dbx command line. See
- // DbxDebuggerLocal.importDbxModule().
- dbxSvcAgentDSOPathPrefix + fileSep + os + fileSep + cpu + "v9" + fileSep + "lib" +
- fileSep + "libsvc_agent_dbx.so",
- dbxSvcAgentDSOPathPrefix + fileSep + os + fileSep + cpu + fileSep + "lib" +
- fileSep + "libsvc_agent_dbx.so",
- };
- } else {
- dbxSvcAgentDSOPathNames = new String[] {
- dbxSvcAgentDSOPathPrefix + fileSep + os + fileSep + cpu + fileSep + "lib" +
- fileSep + "libsvc_agent_dbx.so"
- };
- }
+ throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
}
-
- // Note we do not use a cache for the local debugger in server
- // mode; it's taken care of on the client side
- DbxDebuggerLocal dbg = new DbxDebuggerLocal(null, dbxPathName, dbxSvcAgentDSOPathNames, !isServer);
- debugger = dbg;
-
- attachDebugger();
-
- // Set up CPU-dependent stuff
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("sparc")) {
- int addressSize = dbg.getRemoteProcessAddressSize();
- if (addressSize == -1) {
- throw new DebuggerException("Error occurred while trying to determine the remote process's " +
- "address size. It's possible that the Serviceability Agent's dbx module failed to " +
- "initialize. Examine the standard output and standard error streams from the dbx " +
- "process for more information.");
- }
-
- if (addressSize == 32) {
- machDesc = new MachineDescriptionSPARC32Bit();
- } else if (addressSize == 64) {
- machDesc = new MachineDescriptionSPARC64Bit();
- } else {
- throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
- }
- }
-
- dbg.setMachineDescription(machDesc);
-
+ } else if (cpu.equals("amd64")) {
+ machDesc = new MachineDescriptionAMD64();
+ } else {
+ throw new DebuggerException("Solaris only supported on sparc/sparcv9/x86/amd64");
}
+
+ dbg.setMachineDescription(machDesc);
+ return;
}
private void connectRemoteDebugger() throws DebuggerException {
@@ -557,6 +484,8 @@ public class HotSpotAgent {
setupJVMLibNamesWin32();
} else if (os.equals("linux")) {
setupJVMLibNamesLinux();
+ } else if (os.equals("bsd")) {
+ setupJVMLibNamesBsd();
} else {
throw new RuntimeException("Unknown OS type");
}
@@ -589,11 +518,7 @@ public class HotSpotAgent {
// mode; it will be taken care of on the client side (once remote
// debugging is implemented).
- if (System.getProperty("sun.jvm.hotspot.debugger.useWindbgDebugger") != null) {
- debugger = new WindbgDebuggerLocal(machDesc, !isServer);
- } else {
- debugger = new Win32DebuggerLocal(machDesc, !isServer);
- }
+ debugger = new WindbgDebuggerLocal(machDesc, !isServer);
attachDebugger();
@@ -638,6 +563,31 @@ public class HotSpotAgent {
jvmLibNames = new String[] { "libjvm.so", "libjvm_g.so" };
}
+ //
+ // BSD
+ //
+
+ private void setupDebuggerBsd() {
+ setupJVMLibNamesBsd();
+
+ if (cpu.equals("x86")) {
+ machDesc = new MachineDescriptionIntelX86();
+ } else if (cpu.equals("amd64")) {
+ machDesc = new MachineDescriptionAMD64();
+ } else {
+ throw new DebuggerException("BSD only supported on x86/amd64");
+ }
+
+ BsdDebuggerLocal dbg = new BsdDebuggerLocal(machDesc, !isServer);
+ debugger = dbg;
+
+ attachDebugger();
+ }
+
+ private void setupJVMLibNamesBsd() {
+ jvmLibNames = new String[] { "libjvm.so", "libjvm_g.so" };
+ }
+
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java
index fd35915..fd9ff62 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotTypeDataBase.java
@@ -87,6 +87,7 @@ public class HotSpotTypeDataBase extends BasicTypeDataBase {
readVMStructs();
readVMIntConstants();
readVMLongConstants();
+ readExternalDefinitions();
}
public Type lookupType(String cTypeName, boolean throwException) {
@@ -98,9 +99,9 @@ public class HotSpotTypeDataBase extends BasicTypeDataBase {
fieldType = (BasicType)lookupType(cTypeName.substring(0, cTypeName.length() - 6), false);
}
if (fieldType == null) {
- if (cTypeName.startsWith("GrowableArray<") && cTypeName.endsWith(">*")) {
+ if (cTypeName.startsWith("GrowableArray<") && cTypeName.endsWith(">")) {
String ttype = cTypeName.substring("GrowableArray<".length(),
- cTypeName.length() - 2);
+ cTypeName.length() - 1);
Type templateType = lookupType(ttype, false);
if (templateType == null && typeNameIsPointerType(ttype)) {
templateType = recursiveCreateBasicPointerType(ttype);
@@ -108,7 +109,21 @@ public class HotSpotTypeDataBase extends BasicTypeDataBase {
if (templateType == null) {
lookupOrFail(ttype);
}
- fieldType = recursiveCreateBasicPointerType(cTypeName);
+
+ BasicType basicTargetType = createBasicType(cTypeName, false, false, false);
+
+ // transfer fields from GenericGrowableArray to template instance
+ BasicType generic = lookupOrFail("GenericGrowableArray");
+ BasicType specific = lookupOrFail("GrowableArray<int>");
+ basicTargetType.setSize(specific.getSize());
+ Iterator fields = generic.getFields();
+ while (fields.hasNext()) {
+ Field f = (Field)fields.next();
+ basicTargetType.addField(internalCreateField(basicTargetType, f.getName(),
+ f.getType(), f.isStatic(),
+ f.getOffset(), null));
+ }
+ fieldType = basicTargetType;
}
}
if (fieldType == null && typeNameIsPointerType(cTypeName)) {
@@ -208,6 +223,156 @@ public class HotSpotTypeDataBase extends BasicTypeDataBase {
return type;
}
+ private void readExternalDefinitions() {
+ String file = System.getProperty("sun.jvm.hotspot.typedb");
+ if (file != null) {
+ System.out.println("Reading " + file);
+ BufferedReader in = null;
+ try {
+ StreamTokenizer t = new StreamTokenizer(in = new BufferedReader(new InputStreamReader(new FileInputStream(file))));
+ t.resetSyntax();
+ t.wordChars('\u0000','\uFFFF');
+ t.whitespaceChars(' ', ' ');
+ t.whitespaceChars('\n', '\n');
+ t.whitespaceChars('\r', '\r');
+ t.quoteChar('\"');
+ t.eolIsSignificant(true);
+ while (t.nextToken() != StreamTokenizer.TT_EOF) {
+ if (t.ttype == StreamTokenizer.TT_EOL) {
+ continue;
+ }
+
+ if (t.sval.equals("field")) {
+ t.nextToken();
+ BasicType containingType = (BasicType)lookupType(t.sval);
+ t.nextToken();
+ String fieldName = t.sval;
+
+ // The field's Type must already be in the database -- no exceptions
+ t.nextToken();
+ Type fieldType = lookupType(t.sval);
+ t.nextToken();
+ boolean isStatic = Boolean.valueOf(t.sval).booleanValue();
+ t.nextToken();
+ long offset = Long.parseLong(t.sval);
+ t.nextToken();
+ Address staticAddress = null;
+ if (isStatic) {
+ throw new InternalError("static fields not supported");
+ }
+
+ // check to see if the field already exists
+ Iterator i = containingType.getFields();
+ boolean defined = false;
+ while (i.hasNext()) {
+ Field f = (Field) i.next();
+ if (f.getName().equals(fieldName)) {
+ if (f.isStatic() != isStatic) {
+ throw new RuntimeException("static/nonstatic mismatch: " + fieldName);
+ }
+ if (!isStatic) {
+ if (f.getOffset() != offset) {
+ throw new RuntimeException("bad redefinition of field offset: " + fieldName);
+ }
+ } else {
+ if (!f.getStaticFieldAddress().equals(staticAddress)) {
+ throw new RuntimeException("bad redefinition of field location: " + fieldName);
+ }
+ }
+ if (f.getType() != fieldType) {
+ System.out.println(fieldType);
+ System.out.println(f.getType());
+ throw new RuntimeException("bad redefinition of field type: " + fieldName);
+ }
+ defined = true;
+ break;
+ }
+ }
+
+ if (!defined) {
+ // Create field by type
+ createField(containingType,
+ fieldName, fieldType,
+ isStatic,
+ offset,
+ staticAddress);
+ }
+ } else if (t.sval.equals("type")) {
+ t.nextToken();
+ String typeName = t.sval;
+ t.nextToken();
+ String superclassName = t.sval;
+ if (superclassName.equals("null")) {
+ superclassName = null;
+ }
+ t.nextToken();
+ boolean isOop = Boolean.valueOf(t.sval).booleanValue();
+ t.nextToken();
+ boolean isInteger = Boolean.valueOf(t.sval).booleanValue();
+ t.nextToken();
+ boolean isUnsigned = Boolean.valueOf(t.sval).booleanValue();
+ t.nextToken();
+ long size = Long.parseLong(t.sval);
+
+ BasicType type = null;
+ try {
+ type = (BasicType)lookupType(typeName);
+ } catch (RuntimeException e) {
+ }
+ if (type != null) {
+ if (type.isOopType() != isOop) {
+ throw new RuntimeException("oop mismatch in type definition: " + typeName);
+ }
+ if (type.isCIntegerType() != isInteger) {
+ throw new RuntimeException("integer type mismatch in type definition: " + typeName);
+ }
+ if (type.isCIntegerType() && (((CIntegerType)type).isUnsigned()) != isUnsigned) {
+ throw new RuntimeException("unsigned mismatch in type definition: " + typeName);
+ }
+ if (type.getSuperclass() == null) {
+ if (superclassName != null) {
+ if (type.getSize() == -1) {
+ type.setSuperclass(lookupType(superclassName));
+ } else {
+ throw new RuntimeException("unexpected superclass in type definition: " + typeName);
+ }
+ }
+ } else {
+ if (superclassName == null) {
+ throw new RuntimeException("missing superclass in type definition: " + typeName);
+ }
+ if (!type.getSuperclass().getName().equals(superclassName)) {
+ throw new RuntimeException("incorrect superclass in type definition: " + typeName);
+ }
+ }
+ if (type.getSize() != size) {
+ if (type.getSize() == -1 || type.getSize() == 0) {
+ type.setSize(size);
+ } else {
+ throw new RuntimeException("size mismatch in type definition: " + typeName + ": " + type.getSize() + " != " + size);
+ }
+ }
+ }
+
+ if (lookupType(typeName, false) == null) {
+ // Create type
+ createType(typeName, superclassName, isOop, isInteger, isUnsigned, size);
+ }
+ } else {
+ throw new InternalError("\"" + t.sval + "\"");
+ }
+ }
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ } finally {
+ try {
+ in.close();
+ } catch (Exception e) {
+ }
+ }
+ }
+ }
+
private void readVMStructs() {
// Get the variables we need in order to traverse the VMStructEntry[]
long structEntryTypeNameOffset;
@@ -504,20 +669,6 @@ public class HotSpotTypeDataBase extends BasicTypeDataBase {
BasicType basicTargetType = createBasicType(targetTypeName, false, true, true);
basicTargetType.setSize(1);
targetType = basicTargetType;
- } else if (targetTypeName.startsWith("GrowableArray<")) {
- BasicType basicTargetType = createBasicType(targetTypeName, false, false, false);
-
- // transfer fields from GenericGrowableArray to template instance
- BasicType generic = lookupOrFail("GenericGrowableArray");
- basicTargetType.setSize(generic.getSize());
- Iterator fields = generic.getFields();
- while (fields.hasNext()) {
- Field f = (Field)fields.next();
- basicTargetType.addField(internalCreateField(basicTargetType, f.getName(),
- f.getType(), f.isStatic(),
- f.getOffset(), null));
- }
- targetType = basicTargetType;
} else {
if (DEBUG) {
System.err.println("WARNING: missing target type \"" + targetTypeName + "\" for pointer type \"" + typeName + "\"");
@@ -572,7 +723,7 @@ public class HotSpotTypeDataBase extends BasicTypeDataBase {
// Classes are created with a size of UNINITIALIZED_SIZE.
// Set size if necessary.
- if (curType.getSize() == UNINITIALIZED_SIZE) {
+ if (curType.getSize() == UNINITIALIZED_SIZE || curType.getSize() == 0) {
curType.setSize(size);
} else {
if (curType.getSize() != size) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java
index 5798a40..a0b0a99 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/TestDebugger.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,18 +25,12 @@
package sun.jvm.hotspot;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.dbx.*;
+import sun.jvm.hotspot.debugger.proc.*;
// A test of the debugger backend. This should be used to connect to
// the helloWorld.cpp program.
public class TestDebugger {
- // FIXME: make these configurable, i.e., via a dotfile
- private static final String dbxPathName = "/export/home/kbr/ws/dbx_61/dev/Derived-sparcv9-S2./src/dbx/dbx";
- private static final String[] dbxSvcAgentDSOPathNames =
- new String[] {
- "/export/home/kbr/main/sa_baseline/src/os/solaris/agent/libsvc_agent_dbx.so"
- };
private static void usage() {
System.out.println("usage: java TestDebugger [pid]");
@@ -58,8 +52,7 @@ public class TestDebugger {
usage();
}
- JVMDebugger debugger = new DbxDebuggerLocal(new MachineDescriptionSPARC64Bit(),
- dbxPathName, dbxSvcAgentDSOPathNames, true);
+ JVMDebugger debugger = new ProcDebuggerLocal(null, true);
try {
debugger.attach(pid);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java
index f925206..668fba7 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpot.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -34,7 +34,7 @@ import javax.swing.filechooser.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.posix.*;
-import sun.jvm.hotspot.debugger.win32.*;
+import sun.jvm.hotspot.debugger.windbg.*;
import sun.jvm.hotspot.livejvm.*;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
@@ -604,7 +604,7 @@ public class BugSpot extends JPanel {
throw new DebuggerException("Unsupported CPU \"" + cpu + "\" for Windows");
}
- localDebugger = new Win32DebuggerLocal(new MachineDescriptionIntelX86(), true);
+ localDebugger = new WindbgDebuggerLocal(new MachineDescriptionIntelX86(), true);
} else if (os.equals("linux")) {
if (!cpu.equals("x86")) {
throw new DebuggerException("Unsupported CPU \"" + cpu + "\" for Linux");
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java
index 84071dc..bb0a444 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -29,10 +29,9 @@ import java.net.*;
import java.rmi.*;
import sun.jvm.hotspot.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.dbx.*;
+import sun.jvm.hotspot.debugger.bsd.*;
import sun.jvm.hotspot.debugger.proc.*;
import sun.jvm.hotspot.debugger.cdbg.*;
-import sun.jvm.hotspot.debugger.win32.*;
import sun.jvm.hotspot.debugger.windbg.*;
import sun.jvm.hotspot.debugger.linux.*;
import sun.jvm.hotspot.debugger.sparc.*;
@@ -516,6 +515,8 @@ public class BugSpotAgent {
setupDebuggerWin32();
} else if (os.equals("linux")) {
setupDebuggerLinux();
+ } else if (os.equals("bsd")) {
+ setupDebuggerBsd();
} else {
// Add support for more operating systems here
throw new DebuggerException("Operating system " + os + " not yet supported");
@@ -567,6 +568,9 @@ public class BugSpotAgent {
} else if (os.equals("linux")) {
db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames),
debugger, jvmLibNames);
+ } else if (os.equals("bsd")) {
+ db = new HotSpotTypeDataBase(machDesc, new BsdVtblAccess(debugger, jvmLibNames),
+ debugger, jvmLibNames);
} else {
throw new DebuggerException("OS \"" + os + "\" not yet supported (no VtblAccess implemented yet)");
}
@@ -627,104 +631,33 @@ public class BugSpotAgent {
private void setupDebuggerSolaris() {
setupJVMLibNamesSolaris();
- String prop = System.getProperty("sun.jvm.hotspot.debugger.useProcDebugger");
- if (prop != null && !prop.equals("false")) {
- ProcDebuggerLocal dbg = new ProcDebuggerLocal(null, true);
- debugger = dbg;
- attachDebugger();
-
- // Set up CPU-dependent stuff
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("sparc")) {
- int addressSize = dbg.getRemoteProcessAddressSize();
- if (addressSize == -1) {
- throw new DebuggerException("Error occurred while trying to determine the remote process's address size");
- }
-
- if (addressSize == 32) {
- machDesc = new MachineDescriptionSPARC32Bit();
- } else if (addressSize == 64) {
- machDesc = new MachineDescriptionSPARC64Bit();
- } else {
- throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
- }
- } else if (cpu.equals("amd64")) {
- machDesc = new MachineDescriptionAMD64();
- } else {
- throw new DebuggerException("Solaris only supported on sparc/sparcv9/x86/amd64");
- }
+ ProcDebuggerLocal dbg = new ProcDebuggerLocal(null, true);
+ debugger = dbg;
+ attachDebugger();
- dbg.setMachineDescription(machDesc);
- return;
- } else {
- String dbxPathName;
- String dbxPathPrefix;
- String dbxSvcAgentDSOPathName;
- String dbxSvcAgentDSOPathPrefix;
- String[] dbxSvcAgentDSOPathNames = null;
-
- // use path names/prefixes specified on command
- dbxPathName = System.getProperty("dbxPathName");
- if (dbxPathName == null) {
- dbxPathPrefix = System.getProperty("dbxPathPrefix");
- if (dbxPathPrefix == null) {
- dbxPathPrefix = defaultDbxPathPrefix;
- }
- dbxPathName = dbxPathPrefix + fileSep + os + fileSep + cpu + fileSep + "bin" + fileSep + "dbx";
+ // Set up CPU-dependent stuff
+ if (cpu.equals("x86")) {
+ machDesc = new MachineDescriptionIntelX86();
+ } else if (cpu.equals("sparc")) {
+ int addressSize = dbg.getRemoteProcessAddressSize();
+ if (addressSize == -1) {
+ throw new DebuggerException("Error occurred while trying to determine the remote process's address size");
}
- dbxSvcAgentDSOPathName = System.getProperty("dbxSvcAgentDSOPathName");
- if (dbxSvcAgentDSOPathName != null) {
- dbxSvcAgentDSOPathNames = new String[] { dbxSvcAgentDSOPathName } ;
+ if (addressSize == 32) {
+ machDesc = new MachineDescriptionSPARC32Bit();
+ } else if (addressSize == 64) {
+ machDesc = new MachineDescriptionSPARC64Bit();
} else {
- dbxSvcAgentDSOPathPrefix = System.getProperty("dbxSvcAgentDSOPathPrefix");
- if (dbxSvcAgentDSOPathPrefix == null) {
- dbxSvcAgentDSOPathPrefix = defaultDbxSvcAgentDSOPathPrefix;
- }
- if (cpu.equals("sparc")) {
- dbxSvcAgentDSOPathNames = new String[] {
- // FIXME: bad hack for SPARC v9. This is necessary because
- // there are two dbx executables on SPARC, one for v8 and one
- // for v9, and it isn't obvious how to tell the two apart
- // using the dbx command line. See
- // DbxDebuggerLocal.importDbxModule().
- dbxSvcAgentDSOPathPrefix + fileSep + os + fileSep + cpu + "v9" + fileSep + "lib" + fileSep + "libsvc_agent_dbx.so",
- dbxSvcAgentDSOPathPrefix + fileSep + os + fileSep + cpu + fileSep + "lib" + fileSep + "libsvc_agent_dbx.so",
- };
- } else {
- dbxSvcAgentDSOPathNames = new String[] {
- dbxSvcAgentDSOPathPrefix + fileSep + os + fileSep + cpu + fileSep + "lib" + fileSep + "libsvc_agent_dbx.so"
- };
- }
- }
- // Note we do not use a cache for the local debugger in server
- // mode; it's taken care of on the client side
- DbxDebuggerLocal dbg = new DbxDebuggerLocal(null, dbxPathName, dbxSvcAgentDSOPathNames, !isServer);
- debugger = dbg;
-
- attachDebugger();
-
- // Set up CPU-dependent stuff
- if (cpu.equals("x86")) {
- machDesc = new MachineDescriptionIntelX86();
- } else if (cpu.equals("sparc")) {
- int addressSize = dbg.getRemoteProcessAddressSize();
- if (addressSize == -1) {
- throw new DebuggerException("Error occurred while trying to determine the remote process's address size. It's possible that the Serviceability Agent's dbx module failed to initialize. Examine the standard output and standard error streams from the dbx process for more information.");
- }
-
- if (addressSize == 32) {
- machDesc = new MachineDescriptionSPARC32Bit();
- } else if (addressSize == 64) {
- machDesc = new MachineDescriptionSPARC64Bit();
- } else {
- throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
- }
+ throw new DebuggerException("Address size " + addressSize + " is not supported on SPARC");
}
-
- dbg.setMachineDescription(machDesc);
+ } else if (cpu.equals("amd64")) {
+ machDesc = new MachineDescriptionAMD64();
+ } else {
+ throw new DebuggerException("Solaris only supported on sparc/sparcv9/x86/amd64");
}
+
+ dbg.setMachineDescription(machDesc);
}
private void connectRemoteDebugger() throws DebuggerException {
@@ -739,6 +672,8 @@ public class BugSpotAgent {
setupJVMLibNamesWin32();
} else if (os.equals("linux")) {
setupJVMLibNamesLinux();
+ } else if (os.equals("bsd")) {
+ setupJVMLibNamesBsd();
} else {
throw new RuntimeException("Unknown OS type");
}
@@ -772,11 +707,7 @@ public class BugSpotAgent {
// mode; it will be taken care of on the client side (once remote
// debugging is implemented).
- if (System.getProperty("sun.jvm.hotspot.debugger.useWindbgDebugger") != null) {
- debugger = new WindbgDebuggerLocal(machDesc, !isServer);
- } else {
- debugger = new Win32DebuggerLocal(machDesc, !isServer);
- }
+ debugger = new WindbgDebuggerLocal(machDesc, !isServer);
attachDebugger();
}
@@ -822,6 +753,34 @@ public class BugSpotAgent {
setupJVMLibNamesSolaris();
}
+ //
+ // BSD
+ //
+
+ private void setupDebuggerBsd() {
+ setupJVMLibNamesBsd();
+
+ if (cpu.equals("x86")) {
+ machDesc = new MachineDescriptionIntelX86();
+ } else if (cpu.equals("amd64")) {
+ machDesc = new MachineDescriptionAMD64();
+ } else {
+ throw new DebuggerException("Bsd only supported on x86/amd64");
+ }
+
+ // Note we do not use a cache for the local debugger in server
+ // mode; it will be taken care of on the client side (once remote
+ // debugging is implemented).
+
+ debugger = new BsdDebuggerLocal(machDesc, !isServer);
+ attachDebugger();
+ }
+
+ private void setupJVMLibNamesBsd() {
+ // same as solaris
+ setupJVMLibNamesSolaris();
+ }
+
/** Convenience routine which should be called by per-platform
debugger setup. Should not be called when startupMode is
REMOTE_MODE. */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java
new file mode 100644
index 0000000..1be16ea
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlass.java
@@ -0,0 +1,53 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciArrayKlass extends ciKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciArrayKlass");
+ dimensionField = new IntField(type.getJIntField("_dimension"), 0);
+ }
+
+ private static IntField dimensionField;
+
+ public ciArrayKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java
new file mode 100644
index 0000000..d188105
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciArrayKlassKlass.java
@@ -0,0 +1,51 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciArrayKlassKlass extends ciKlassKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciArrayKlassKlass");
+ }
+
+
+ public ciArrayKlassKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java
new file mode 100644
index 0000000..ab69f43
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciConstant.java
@@ -0,0 +1,63 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciConstant extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciConstant");
+ valueObjectField = type.getAddressField("_value._object");
+ valueDoubleField = type.getJDoubleField("_value._double");
+ valueFloatField = type.getJFloatField("_value._float");
+ valueLongField = type.getJLongField("_value._long");
+ valueIntField = type.getJIntField("_value._int");
+ typeField = new CIntField(type.getCIntegerField("_type"), 0);
+ }
+
+ private static AddressField valueObjectField;
+ private static JDoubleField valueDoubleField;
+ private static JFloatField valueFloatField;
+ private static JLongField valueLongField;
+ private static JIntField valueIntField;
+ private static CIntField typeField;
+
+ public ciConstant(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java
new file mode 100644
index 0000000..eb48eed
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciEnv.java
@@ -0,0 +1,77 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.opto.*;
+import sun.jvm.hotspot.compiler.CompileTask;
+import sun.jvm.hotspot.prims.JvmtiExport;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.GrowableArray;
+
+public class ciEnv extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciEnv");
+ dependenciesField = type.getAddressField("_dependencies");
+ factoryField = type.getAddressField("_factory");
+ compilerDataField = type.getAddressField("_compiler_data");
+ taskField = type.getAddressField("_task");
+ systemDictionaryModificationCounterField = new CIntField(type.getCIntegerField("_system_dictionary_modification_counter"), 0);
+ }
+
+ private static AddressField dependenciesField;
+ private static AddressField factoryField;
+ private static AddressField compilerDataField;
+ private static AddressField taskField;
+ private static CIntField systemDictionaryModificationCounterField;
+
+ public ciEnv(Address addr) {
+ super(addr);
+ }
+
+ public Compile compilerData() {
+ return new Compile(compilerDataField.getValue(this.getAddress()));
+ }
+
+ public ciObjectFactory factory() {
+ return new ciObjectFactory(factoryField.getValue(this.getAddress()));
+ }
+
+ public CompileTask task() {
+ return new CompileTask(taskField.getValue(this.getAddress()));
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciField.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciField.java
new file mode 100644
index 0000000..80b1b33
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciField.java
@@ -0,0 +1,62 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciField extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciField");
+ constantValueField = type.getAddressField("_constant_value");
+ isConstantField = type.getAddressField("_is_constant");
+ offsetField = new CIntField(type.getCIntegerField("_offset"), 0);
+ signatureField = type.getAddressField("_signature");
+ nameField = type.getAddressField("_name");
+ holderField = type.getAddressField("_holder");
+ }
+
+ private static AddressField constantValueField;
+ private static AddressField isConstantField;
+ private static CIntField offsetField;
+ private static AddressField signatureField;
+ private static AddressField nameField;
+ private static AddressField holderField;
+
+ public ciField(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java
new file mode 100644
index 0000000..6a59cab
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstance.java
@@ -0,0 +1,51 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciInstance extends ciObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciInstance");
+ }
+
+
+ public ciInstance(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java
new file mode 100644
index 0000000..df498c1
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlass.java
@@ -0,0 +1,83 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.memory.SystemDictionary;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.Type;
+import sun.jvm.hotspot.types.TypeDataBase;
+import sun.jvm.hotspot.types.WrongTypeException;
+
+public class ciInstanceKlass extends ciKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciInstanceKlass");
+ initStateField = new CIntField(type.getCIntegerField("_init_state"), 0);
+ isSharedField = new CIntField(type.getCIntegerField("_is_shared"), 0);
+ CLASS_STATE_LINKED = db.lookupIntConstant("instanceKlass::linked").intValue();
+ CLASS_STATE_FULLY_INITIALIZED = db.lookupIntConstant("instanceKlass::fully_initialized").intValue();
+ }
+
+ private static CIntField initStateField;
+ private static CIntField isSharedField;
+ private static int CLASS_STATE_LINKED;
+ private static int CLASS_STATE_FULLY_INITIALIZED;
+
+ public ciInstanceKlass(Address addr) {
+ super(addr);
+ }
+
+ public int initState() {
+ int initState = (int)initStateField.getValue(getAddress());
+ if (isShared() && initState < CLASS_STATE_LINKED) {
+ InstanceKlass ik = (InstanceKlass)getOop();
+ initState = ik.getInitStateAsInt();
+ }
+ return initState;
+ }
+
+ public boolean isShared() {
+ return isSharedField.getValue(getAddress()) != 0;
+ }
+
+ public boolean isLinked() {
+ return initState() >= CLASS_STATE_LINKED;
+ }
+
+ public boolean isInitialized() {
+ return initState() == CLASS_STATE_FULLY_INITIALIZED;
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java
new file mode 100644
index 0000000..b20f036
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciInstanceKlassKlass.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciInstanceKlassKlass extends ciKlassKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciInstanceKlassKlass");
+ }
+
+
+ public ciInstanceKlassKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlass.java
new file mode 100644
index 0000000..fc92044
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlass.java
@@ -0,0 +1,58 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciKlass extends ciType {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciKlass");
+ nameField = type.getAddressField("_name");
+ }
+
+ private static AddressField nameField;
+
+ public String name() {
+ ciSymbol sym = new ciSymbol(nameField.getValue(getAddress()));
+ return sym.asUtf88();
+ }
+
+ public ciKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java
new file mode 100644
index 0000000..f8d4db1
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciKlassKlass.java
@@ -0,0 +1,51 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciKlassKlass extends ciKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciKlassKlass");
+ }
+
+
+ public ciKlassKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java
new file mode 100644
index 0000000..c0ae576
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethod.java
@@ -0,0 +1,91 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.code.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciMethod extends ciObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciMethod");
+ interpreterThrowoutCountField = new CIntField(type.getCIntegerField("_interpreter_throwout_count"), 0);
+ interpreterInvocationCountField = new CIntField(type.getCIntegerField("_interpreter_invocation_count"), 0);
+ try {
+ // XXX
+ instructionsSizeField = new CIntField(type.getCIntegerField("_instructions_size"), 0);
+ } catch (Exception e) {
+ }
+ }
+
+ private static CIntField interpreterThrowoutCountField;
+ private static CIntField interpreterInvocationCountField;
+ private static CIntField instructionsSizeField;
+
+ public ciMethod(Address addr) {
+ super(addr);
+ }
+
+ public Method method() {
+ return (Method)getOop();
+ }
+
+ public int interpreterThrowoutCount() {
+ return (int) interpreterThrowoutCountField.getValue(getAddress());
+ }
+
+ public int interpreterInvocationCount() {
+ return (int) interpreterInvocationCountField.getValue(getAddress());
+ }
+
+ public int instructionsSize() {
+ if (instructionsSizeField == null) {
+ // XXX
+ Method method = (Method)getOop();
+ NMethod nm = method.getNativeMethod();
+ if (nm != null) return (int)nm.codeEnd().minus(nm.getVerifiedEntryPoint());
+ return 0;
+ }
+ return (int) instructionsSizeField.getValue(getAddress());
+ }
+
+ public void printShortName(PrintStream st) {
+ Method method = (Method)getOop();
+ st.printf(" %s::%s", method.getMethodHolder().getName().asString().replace('/', '.'),
+ method.getName().asString());
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.java
new file mode 100644
index 0000000..ca5628d
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodData.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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciMethodData extends ciObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciMethodData");
+ origField = type.getAddressField("_orig");
+ currentMileageField = new CIntField(type.getCIntegerField("_current_mileage"), 0);
+ argReturnedField = new CIntField(type.getCIntegerField("_arg_returned"), 0);
+ argStackField = new CIntField(type.getCIntegerField("_arg_stack"), 0);
+ argLocalField = new CIntField(type.getCIntegerField("_arg_local"), 0);
+ eflagsField = new CIntField(type.getCIntegerField("_eflags"), 0);
+ hintDiField = new CIntField(type.getCIntegerField("_hint_di"), 0);
+ currentMileageField = new CIntField(type.getCIntegerField("_current_mileage"), 0);
+ dataField = type.getAddressField("_data");
+ extraDataSizeField = new CIntField(type.getCIntegerField("_extra_data_size"), 0);
+ dataSizeField = new CIntField(type.getCIntegerField("_data_size"), 0);
+ stateField = new CIntField(type.getCIntegerField("_state"), 0);
+ sizeofMethodDataOopDesc = (int)db.lookupType("methodDataOopDesc").getSize();;
+ }
+
+ private static AddressField origField;
+ private static CIntField currentMileageField;
+ private static CIntField argReturnedField;
+ private static CIntField argStackField;
+ private static CIntField argLocalField;
+ private static CIntField eflagsField;
+ private static CIntField hintDiField;
+ private static AddressField dataField;
+ private static CIntField extraDataSizeField;
+ private static CIntField dataSizeField;
+ private static CIntField stateField;
+ private static int sizeofMethodDataOopDesc;
+
+ public ciMethodData(Address addr) {
+ super(addr);
+ }
+
+ private byte[] fetchDataAt(Address base, long size) {
+ byte[] result = new byte[(int)size];
+ for (int i = 0; i < size; i++) {
+ result[i] = base.getJByteAt(i);
+ }
+ return result;
+ }
+
+ public byte[] orig() {
+ // fetch the orig methodDataOopDesc data between header and dataSize
+ Address base = getAddress().addOffsetTo(origField.getOffset());
+ byte[] result = new byte[MethodData.sizeofMethodDataOopDesc];
+ for (int i = 0; i < MethodData.sizeofMethodDataOopDesc; i++) {
+ result[i] = base.getJByteAt(i);
+ }
+ return result;
+ }
+
+ public long[] data() {
+ // Read the data as an array of intptr_t elements
+ Address base = dataField.getValue(getAddress());
+ int elements = dataSize() / MethodData.cellSize;
+ long[] result = new long[elements];
+ for (int i = 0; i < elements; i++) {
+ Address value = base.getAddressAt(i * MethodData.cellSize);
+ if (value != null) {
+ result[i] = value.minus(null);
+ }
+ }
+ return result;
+ }
+
+ int dataSize() {
+ return (int)dataSizeField.getValue(getAddress());
+ }
+
+ int state() {
+ return (int)stateField.getValue(getAddress());
+ }
+
+ int currentMileage() {
+ return (int)currentMileageField.getValue(getAddress());
+ }
+
+ boolean outOfBounds(int dataIndex) {
+ return dataIndex >= dataSize();
+ }
+
+ ProfileData dataAt(int dataIndex) {
+ if (outOfBounds(dataIndex)) {
+ return null;
+ }
+ DataLayout dataLayout = new DataLayout(dataField.getValue(getAddress()), dataIndex);
+
+ switch (dataLayout.tag()) {
+ case DataLayout.noTag:
+ default:
+ throw new InternalError();
+ case DataLayout.bitDataTag:
+ return new BitData(dataLayout);
+ case DataLayout.counterDataTag:
+ return new CounterData(dataLayout);
+ case DataLayout.jumpDataTag:
+ return new JumpData(dataLayout);
+ case DataLayout.receiverTypeDataTag:
+ return new ciReceiverTypeData(dataLayout);
+ case DataLayout.virtualCallDataTag:
+ return new ciVirtualCallData(dataLayout);
+ case DataLayout.retDataTag:
+ return new RetData(dataLayout);
+ case DataLayout.branchDataTag:
+ return new BranchData(dataLayout);
+ case DataLayout.multiBranchDataTag:
+ return new MultiBranchData(dataLayout);
+ }
+ }
+
+ int dpToDi(int dp) {
+ return dp;
+ }
+
+ int firstDi() { return 0; }
+ ProfileData firstData() { return dataAt(firstDi()); }
+ ProfileData nextData(ProfileData current) {
+ int currentIndex = dpToDi(current.dp());
+ int nextIndex = currentIndex + current.sizeInBytes();
+ return dataAt(nextIndex);
+ }
+ boolean isValid(ProfileData current) { return current != null; }
+
+ public void printDataOn(PrintStream st) {
+ ProfileData data = firstData();
+ for ( ; isValid(data); data = nextData(data)) {
+ st.print(dpToDi(data.dp()));
+ st.print(" ");
+ // st->fillTo(6);
+ data.printDataOn(st);
+ }
+ }
+
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java
new file mode 100644
index 0000000..918de77
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciMethodKlass.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciMethodKlass extends ciKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciMethodKlass");
+ }
+
+
+ public ciMethodKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java
new file mode 100644
index 0000000..c412dee
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlass.java
@@ -0,0 +1,55 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciObjArrayKlass extends ciArrayKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciObjArrayKlass");
+ elementKlassField = type.getAddressField("_element_klass");
+ baseElementKlassField = type.getAddressField("_base_element_klass");
+ }
+
+ private static AddressField elementKlassField;
+ private static AddressField baseElementKlassField;
+
+ public ciObjArrayKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java
new file mode 100644
index 0000000..98078b0
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjArrayKlassKlass.java
@@ -0,0 +1,51 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciObjArrayKlassKlass extends ciArrayKlassKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciObjArrayKlassKlass");
+ }
+
+
+ public ciObjArrayKlassKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObject.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObject.java
new file mode 100644
index 0000000..efd33d9
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObject.java
@@ -0,0 +1,71 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciObject extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciObject");
+ identField = new CIntField(type.getCIntegerField("_ident"), 0);
+ klassField = type.getAddressField("_klass");
+ handleField = type.getAddressField("_handle");
+ }
+
+ private static CIntField identField;
+ private static AddressField klassField;
+ private static AddressField handleField;
+
+ public Oop getOop() {
+ OopHandle oh = handleField.getValue(getAddress()).getOopHandleAt(0);
+ return VM.getVM().getObjectHeap().newOop(oh);
+ }
+
+ public ciObject(Address addr) {
+ super(addr);
+ }
+
+ public void printOn(PrintStream out) {
+ getOop().printValueOn(out);
+ out.println();
+ }
+
+ public String toString() {
+ return getOop().toString();
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java
new file mode 100644
index 0000000..23f074b
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciObjectFactory.java
@@ -0,0 +1,78 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.lang.reflect.Constructor;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.utilities.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciObjectFactory extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciObjectFactory");
+ unloadedMethodsField = type.getAddressField("_unloaded_methods");
+ ciObjectsField = type.getAddressField("_ci_objects");
+ symbolsField = type.getAddressField("_symbols");
+
+ ciObjectConstructor = new VirtualBaseConstructor<ciObject>(db, db.lookupType("ciObject"), "sun.jvm.hotspot.ci", ciObject.class);
+ ciSymbolConstructor = new VirtualBaseConstructor<ciSymbol>(db, db.lookupType("ciSymbol"), "sun.jvm.hotspot.ci", ciSymbol.class);
+ }
+
+ private static AddressField unloadedMethodsField;
+ private static AddressField ciObjectsField;
+ private static AddressField symbolsField;
+
+ private static VirtualBaseConstructor<ciObject> ciObjectConstructor;
+ private static VirtualBaseConstructor<ciSymbol> ciSymbolConstructor;
+
+ public static ciObject get(Address addr) {
+ if (addr == null) return null;
+
+ return (ciObject)ciObjectConstructor.instantiateWrapperFor(addr);
+ }
+
+ public GrowableArray<ciObject> objects() {
+ return GrowableArray.create(ciObjectsField.getValue(getAddress()), ciObjectConstructor);
+ }
+
+ public GrowableArray<ciSymbol> symbols() {
+ return GrowableArray.create(symbolsField.getValue(getAddress()), ciSymbolConstructor);
+ }
+
+ public ciObjectFactory(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java
new file mode 100644
index 0000000..f391f5d
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciReceiverTypeData.java
@@ -0,0 +1,53 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciReceiverTypeData extends ReceiverTypeData {
+ public ciReceiverTypeData(DataLayout data) {
+ super(data);
+ }
+
+ public Klass receiver(int row) {
+ throw new InternalError("should not call");
+ }
+
+ public ciKlass receiverAt(int row) {
+ //assert((uint)row < rowLimit(), "oob");
+ ciObject recv = ciObjectFactory.get(addressAt(receiverCellIndex(row)));
+ if (recv != null && !(recv instanceof ciKlass)) {
+ System.err.println(recv);
+ }
+ //assert(recv == NULL || recv->isKlass(), "wrong type");
+ return (ciKlass)recv;
+ }
+
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciSymbol.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciSymbol.java
new file mode 100644
index 0000000..3023e25
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciSymbol.java
@@ -0,0 +1,60 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciSymbol extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciSymbol");
+ identField = type.getCIntegerField("_ident");
+ symbolField = type.getAddressField("_symbol");
+ }
+
+ private static AddressField symbolField;
+ private static CIntegerField identField;
+
+ public String asUtf88() {
+ Symbol sym = Symbol.create(symbolField.getValue(getAddress()));
+ return sym.asString();
+ }
+
+ public ciSymbol(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciType.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciType.java
new file mode 100644
index 0000000..5f6d773
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciType.java
@@ -0,0 +1,52 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciType extends ciObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciType");
+ basicTypeField = new CIntField(type.getCIntegerField("_basic_type"), 0);
+ }
+
+ private static CIntField basicTypeField;
+
+ public ciType(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java
new file mode 100644
index 0000000..cc02817
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlass.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciTypeArrayKlass extends ciArrayKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciTypeArrayKlass");
+ }
+
+ public ciTypeArrayKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java
new file mode 100644
index 0000000..4432e1f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciTypeArrayKlassKlass.java
@@ -0,0 +1,51 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciTypeArrayKlassKlass extends ciArrayKlassKlass {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ciTypeArrayKlassKlass");
+ }
+
+
+ public ciTypeArrayKlassKlass(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java
new file mode 100644
index 0000000..37c4f85
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ci/ciVirtualCallData.java
@@ -0,0 +1,52 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.ci;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ciVirtualCallData extends VirtualCallData {
+ public ciVirtualCallData(DataLayout data) {
+ super(data);
+ }
+
+ public Klass receiver(int row) {
+ throw new InternalError("should not call");
+ }
+
+ public ciKlass receiverAt(int row) {
+ //assert((uint)row < rowLimit(), "oob");
+ ciObject recv = ciObjectFactory.get(addressAt(receiverCellIndex(row)));
+ if (recv != null && !(recv instanceof ciKlass)) {
+ System.err.println(recv);
+ }
+ //assert(recv == NULL || recv->isKlass(), "wrong type");
+ return (ciKlass)recv;
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java
index 7ed801e..a9bc598 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeBlob.java
@@ -102,6 +102,11 @@ public class CodeBlob extends VMObject {
/** On-Stack Replacement method */
public boolean isOSRMethod() { return false; }
+ public NMethod asNMethodOrNull() {
+ if (isNMethod()) return (NMethod)this;
+ return null;
+ }
+
// Boundaries
public Address headerBegin() {
return addr;
@@ -195,7 +200,7 @@ public class CodeBlob extends VMObject {
}
// Returns true, if the next frame is responsible for GC'ing oops passed as arguments
- public boolean callerMustGCArguments(JavaThread thread) { return false; }
+ public boolean callerMustGCArguments() { return false; }
public String getName() {
return CStringUtilities.getString(nameField.getValue(addr));
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java
index bf7a12f..6d0dd0f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/CodeCache.java
@@ -59,6 +59,7 @@ public class CodeCache {
virtualConstructor.addMapping("RuntimeStub", RuntimeStub.class);
virtualConstructor.addMapping("RicochetBlob", RicochetBlob.class);
virtualConstructor.addMapping("AdapterBlob", AdapterBlob.class);
+ virtualConstructor.addMapping("MethodHandlesAdapterBlob", MethodHandlesAdapterBlob.class);
virtualConstructor.addMapping("SafepointBlob", SafepointBlob.class);
virtualConstructor.addMapping("DeoptimizationBlob", DeoptimizationBlob.class);
if (VM.getVM().isServerCompiler()) {
@@ -126,6 +127,10 @@ public class CodeCache {
Assert.that(result.blobContains(start) || result.blobContains(start.addOffsetTo(8)),
"found wrong CodeBlob");
}
+ if (result.isRicochetBlob()) {
+ // This should probably be done for other SingletonBlobs
+ return VM.getVM().ricochetBlob();
+ }
return result;
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
new file mode 100644
index 0000000..3b265e1
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/MethodHandlesAdapterBlob.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.code;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+
+public class MethodHandlesAdapterBlob extends AdapterBlob {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static void initialize(TypeDataBase db) {
+ Type type = db.lookupType("MethodHandlesAdapterBlob");
+
+ // FIXME: add any needed fields
+ }
+
+ public MethodHandlesAdapterBlob(Address addr) {
+ super(addr);
+ }
+
+ public boolean isMethodHandlesAdapterBlob() {
+ return true;
+ }
+
+ public String getName() {
+ return "MethodHandlesAdapterBlob: " + super.getName();
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
index 80da843..47503e1 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/NMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -46,6 +46,7 @@ public class NMethod extends CodeBlob {
/** Offsets for different nmethod parts */
private static CIntegerField exceptionOffsetField;
private static CIntegerField deoptOffsetField;
+ private static CIntegerField deoptMhOffsetField;
private static CIntegerField origPCOffsetField;
private static CIntegerField stubOffsetField;
private static CIntegerField oopsOffsetField;
@@ -95,6 +96,7 @@ public class NMethod extends CodeBlob {
exceptionOffsetField = type.getCIntegerField("_exception_offset");
deoptOffsetField = type.getCIntegerField("_deoptimize_offset");
+ deoptMhOffsetField = type.getCIntegerField("_deoptimize_mh_offset");
origPCOffsetField = type.getCIntegerField("_orig_pc_offset");
stubOffsetField = type.getCIntegerField("_stub_offset");
oopsOffsetField = type.getCIntegerField("_oops_offset");
@@ -136,10 +138,11 @@ public class NMethod extends CodeBlob {
/** Boundaries for different parts */
public Address constantsBegin() { return contentBegin(); }
public Address constantsEnd() { return getEntryPoint(); }
- public Address instsBegin() { return codeBegin(); }
+ public Address instsBegin() { return codeBegin(); }
public Address instsEnd() { return headerBegin().addOffsetTo(getStubOffset()); }
public Address exceptionBegin() { return headerBegin().addOffsetTo(getExceptionOffset()); }
- public Address deoptBegin() { return headerBegin().addOffsetTo(getDeoptOffset()); }
+ public Address deoptHandlerBegin() { return headerBegin().addOffsetTo(getDeoptOffset()); }
+ public Address deoptMhHandlerBegin() { return headerBegin().addOffsetTo(getDeoptMhOffset()); }
public Address stubBegin() { return headerBegin().addOffsetTo(getStubOffset()); }
public Address stubEnd() { return headerBegin().addOffsetTo(getOopsOffset()); }
public Address oopsBegin() { return headerBegin().addOffsetTo(getOopsOffset()); }
@@ -187,6 +190,8 @@ public class NMethod extends CodeBlob {
public boolean handlerTableContains(Address addr) { return handlerTableBegin().lessThanOrEqual(addr) && handlerTableEnd().greaterThan(addr); }
public boolean nulChkTableContains (Address addr) { return nulChkTableBegin() .lessThanOrEqual(addr) && nulChkTableEnd() .greaterThan(addr); }
+ public int getOopsLength() { return (int) (oopsSize() / VM.getVM().getOopSize()); }
+
/** Entry points */
public Address getEntryPoint() { return entryPointField.getValue(addr); }
public Address getVerifiedEntryPoint() { return verifiedEntryPointField.getValue(addr); }
@@ -195,7 +200,7 @@ public class NMethod extends CodeBlob {
public OopHandle getOopAt(int index) {
if (index == 0) return null;
if (Assert.ASSERTS_ENABLED) {
- Assert.that(index > 0 && index <= oopsSize(), "must be a valid non-zero index");
+ Assert.that(index > 0 && index <= getOopsLength(), "must be a valid non-zero index");
}
return oopsBegin().getOopHandleAt((index - 1) * VM.getVM().getOopSize());
}
@@ -250,6 +255,22 @@ public class NMethod extends CodeBlob {
return (int) scavengeRootStateField.getValue(addr);
}
+ // MethodHandle
+ public boolean isMethodHandleReturn(Address returnPc) {
+ // Hard to read a bit fields from Java and it's only there for performance
+ // so just go directly to the PCDesc
+ // if (!hasMethodHandleInvokes()) return false;
+ PCDesc pd = getPCDescAt(returnPc);
+ if (pd == null)
+ return false;
+ return pd.isMethodHandleInvoke();
+ }
+
+ // Deopt
+ // Return true is the PC is one would expect if the frame is being deopted.
+ public boolean isDeoptPc (Address pc) { return isDeoptEntry(pc) || isDeoptMhEntry(pc); }
+ public boolean isDeoptEntry (Address pc) { return pc == deoptHandlerBegin(); }
+ public boolean isDeoptMhEntry (Address pc) { return pc == deoptMhHandlerBegin(); }
/** Tells whether frames described by this nmethod can be
deoptimized. Note: native wrappers cannot be deoptimized. */
@@ -388,6 +409,7 @@ public class NMethod extends CodeBlob {
private int getEntryBCI() { return (int) entryBCIField .getValue(addr); }
private int getExceptionOffset() { return (int) exceptionOffsetField .getValue(addr); }
private int getDeoptOffset() { return (int) deoptOffsetField .getValue(addr); }
+ private int getDeoptMhOffset() { return (int) deoptMhOffsetField .getValue(addr); }
private int getStubOffset() { return (int) stubOffsetField .getValue(addr); }
private int getOopsOffset() { return (int) oopsOffsetField .getValue(addr); }
private int getScopesDataOffset() { return (int) scopesDataOffsetField .getValue(addr); }
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
index c6bf5d7..1584610 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/PCDesc.java
@@ -38,6 +38,9 @@ public class PCDesc extends VMObject {
private static CIntegerField scopeDecodeOffsetField;
private static CIntegerField objDecodeOffsetField;
private static CIntegerField pcFlagsField;
+ private static int reexecuteMask;
+ private static int isMethodHandleInvokeMask;
+ private static int returnOopMask;
static {
VM.registerVMInitializedObserver(new Observer() {
@@ -54,6 +57,10 @@ public class PCDesc extends VMObject {
scopeDecodeOffsetField = type.getCIntegerField("_scope_decode_offset");
objDecodeOffsetField = type.getCIntegerField("_obj_decode_offset");
pcFlagsField = type.getCIntegerField("_flags");
+
+ reexecuteMask = db.lookupIntConstant("PcDesc::PCDESC_reexecute");
+ isMethodHandleInvokeMask = db.lookupIntConstant("PcDesc::PCDESC_is_method_handle_invoke");
+ returnOopMask = db.lookupIntConstant("PcDesc::PCDESC_return_oop");
}
public PCDesc(Address addr) {
@@ -81,7 +88,12 @@ public class PCDesc extends VMObject {
public boolean getReexecute() {
int flags = (int)pcFlagsField.getValue(addr);
- return ((flags & 0x1)== 1); //first is the reexecute bit
+ return (flags & reexecuteMask) != 0;
+ }
+
+ public boolean isMethodHandleInvoke() {
+ int flags = (int)pcFlagsField.getValue(addr);
+ return (flags & isMethodHandleInvokeMask) != 0;
}
public void print(NMethod code) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java
index 3f7dd76..0fa8518 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RicochetBlob.java
@@ -41,11 +41,15 @@ public class RicochetBlob extends SingletonBlob {
}
private static void initialize(TypeDataBase db) {
- // Type type = db.lookupType("RicochetBlob");
+ Type type = db.lookupType("RicochetBlob");
- // FIXME: add any needed fields
+ bounceOffsetField = type.getCIntegerField("_bounce_offset");
+ exceptionOffsetField = type.getCIntegerField("_exception_offset");
}
+ private static CIntegerField bounceOffsetField;
+ private static CIntegerField exceptionOffsetField;
+
public RicochetBlob(Address addr) {
super(addr);
}
@@ -53,4 +57,14 @@ public class RicochetBlob extends SingletonBlob {
public boolean isRicochetBlob() {
return true;
}
+
+ public Address bounceAddr() {
+ return codeBegin().addOffsetTo(bounceOffsetField.getValue(addr));
+ }
+
+ public boolean returnsToBounceAddr(Address pc) {
+ Address bouncePc = bounceAddr();
+ return (pc.equals(bouncePc) || pc.addOffsetTo(Frame.pcReturnOffset()).equals(bouncePc));
+ }
+
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
index 86f471b..fd0d72a 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/code/RuntimeStub.java
@@ -30,6 +30,8 @@ import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.types.*;
public class RuntimeStub extends CodeBlob {
+ private static CIntegerField callerMustGCArgumentsField;
+
static {
VM.registerVMInitializedObserver(new Observer() {
public void update(Observable o, Object data) {
@@ -40,6 +42,7 @@ public class RuntimeStub extends CodeBlob {
private static void initialize(TypeDataBase db) {
Type type = db.lookupType("RuntimeStub");
+ callerMustGCArgumentsField = type.getCIntegerField("_caller_must_gc_arguments");
// FIXME: add any needed fields
}
@@ -52,6 +55,11 @@ public class RuntimeStub extends CodeBlob {
return true;
}
+ public boolean callerMustGCArguments() {
+ return callerMustGCArgumentsField.getValue(addr) != 0;
+ }
+
+
public String getName() {
return "RuntimeStub: " + super.getName();
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java
new file mode 100644
index 0000000..12779a4
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/CompileTask.java
@@ -0,0 +1,66 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.compiler;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.opto.*;
+import sun.jvm.hotspot.prims.JvmtiExport;
+import sun.jvm.hotspot.types.*;
+
+public class CompileTask extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CompileTask");
+ methodField = type.getAddressField("_method");
+ osrBciField = new CIntField(type.getCIntegerField("_osr_bci"), 0);
+ }
+
+ private static AddressField methodField;
+ private static CIntField osrBciField;
+
+ public CompileTask(Address addr) {
+ super(addr);
+ }
+
+ public Method method() {
+ OopHandle oh = methodField.getValue(getAddress()).getOopHandleAt(0);
+ return (Method)VM.getVM().getObjectHeap().newOop(oh);
+ }
+
+ public int osrBci() {
+ return (int)osrBciField.getValue(getAddress());
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java
index 3e88578..9433cf6 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/compiler/OopMapSet.java
@@ -246,7 +246,7 @@ public class OopMapSet extends VMObject {
}
// Check if caller must update oop argument
- regMap.setIncludeArgumentOops(cb.callerMustGCArguments(regMap.getThread()));
+ regMap.setIncludeArgumentOops(cb.callerMustGCArguments());
int nofCallee = 0;
Address[] locs = new Address[2 * REG_COUNT + 1];
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java
index 3d3ea75..e45fb49 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/AddressException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -39,4 +39,8 @@ public class AddressException extends RuntimeException {
public long getAddress() {
return addr;
}
+
+ public String getMessage() {
+ return Long.toHexString(addr);
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java
new file mode 100644
index 0000000..de707f0
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdAddress.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import sun.jvm.hotspot.debugger.*;
+
+class BsdAddress implements Address {
+ protected BsdDebugger debugger;
+ protected long addr;
+
+ BsdAddress(BsdDebugger debugger, long addr) {
+ this.debugger = debugger;
+ this.addr = addr;
+ }
+
+ //
+ // Basic Java routines
+ //
+
+ public boolean equals(Object arg) {
+ if (arg == null) {
+ return false;
+ }
+
+ if (!(arg instanceof BsdAddress)) {
+ return false;
+ }
+
+ return (addr == ((BsdAddress) arg).addr);
+ }
+
+ public int hashCode() {
+ // FIXME: suggestions on a better hash code?
+ return (int) addr;
+ }
+
+ public String toString() {
+ return debugger.addressValueToString(addr);
+ }
+
+ //
+ // C/C++-related routines
+ //
+
+ public long getCIntegerAt(long offset, long numBytes, boolean isUnsigned)
+ throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readCInteger(addr + offset, numBytes, isUnsigned);
+ }
+
+ public Address getAddressAt(long offset)
+ throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readAddress(addr + offset);
+ }
+
+ public Address getCompOopAddressAt(long offset)
+ throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readCompOopAddress(addr + offset);
+ }
+
+ //
+ // Java-related routines
+ //
+
+ public boolean getJBooleanAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJBoolean(addr + offset);
+ }
+
+ public byte getJByteAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJByte(addr + offset);
+ }
+
+ public char getJCharAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJChar(addr + offset);
+ }
+
+ public double getJDoubleAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJDouble(addr + offset);
+ }
+
+ public float getJFloatAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJFloat(addr + offset);
+ }
+
+ public int getJIntAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJInt(addr + offset);
+ }
+
+ public long getJLongAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJLong(addr + offset);
+ }
+
+ public short getJShortAt(long offset) throws UnalignedAddressException, UnmappedAddressException {
+ return debugger.readJShort(addr + offset);
+ }
+
+ public OopHandle getOopHandleAt(long offset)
+ throws UnalignedAddressException, UnmappedAddressException, NotInHeapException {
+ return debugger.readOopHandle(addr + offset);
+ }
+
+ public OopHandle getCompOopHandleAt(long offset)
+ throws UnalignedAddressException, UnmappedAddressException, NotInHeapException {
+ return debugger.readCompOopHandle(addr + offset);
+ }
+
+ // Mutators -- not implemented for now (FIXME)
+ public void setCIntegerAt(long offset, long numBytes, long value) {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setAddressAt(long offset, Address value) {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJBooleanAt (long offset, boolean value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJByteAt (long offset, byte value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJCharAt (long offset, char value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJDoubleAt (long offset, double value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJFloatAt (long offset, float value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJIntAt (long offset, int value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJLongAt (long offset, long value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setJShortAt (long offset, short value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+ public void setOopHandleAt (long offset, OopHandle value)
+ throws UnmappedAddressException, UnalignedAddressException {
+ throw new DebuggerException("Unimplemented");
+ }
+
+ //
+ // Arithmetic operations -- necessary evil.
+ //
+
+ public Address addOffsetTo (long offset) throws UnsupportedOperationException {
+ long value = addr + offset;
+ if (value == 0) {
+ return null;
+ }
+ return new BsdAddress(debugger, value);
+ }
+
+ public OopHandle addOffsetToAsOopHandle(long offset) throws UnsupportedOperationException {
+ long value = addr + offset;
+ if (value == 0) {
+ return null;
+ }
+ return new BsdOopHandle(debugger, value);
+ }
+
+ /** (FIXME: any signed/unsigned issues? Should this work for
+ OopHandles?) */
+ public long minus(Address arg) {
+ if (arg == null) {
+ return addr;
+ }
+ return addr - ((BsdAddress) arg).addr;
+ }
+
+ // Two's complement representation.
+ // All negative numbers are larger than positive numbers.
+ // Numbers with the same sign can be compared normally.
+ // Test harness is below in main().
+
+ public boolean lessThan (Address a) {
+ if (a == null) {
+ return false;
+ }
+ BsdAddress arg = (BsdAddress) a;
+ if ((addr >= 0) && (arg.addr < 0)) {
+ return true;
+ }
+ if ((addr < 0) && (arg.addr >= 0)) {
+ return false;
+ }
+ return (addr < arg.addr);
+ }
+
+ public boolean lessThanOrEqual (Address a) {
+ if (a == null) {
+ return false;
+ }
+ BsdAddress arg = (BsdAddress) a;
+ if ((addr >= 0) && (arg.addr < 0)) {
+ return true;
+ }
+ if ((addr < 0) && (arg.addr >= 0)) {
+ return false;
+ }
+ return (addr <= arg.addr);
+ }
+
+ public boolean greaterThan (Address a) {
+ if (a == null) {
+ return true;
+ }
+ BsdAddress arg = (BsdAddress) a;
+ if ((addr >= 0) && (arg.addr < 0)) {
+ return false;
+ }
+ if ((addr < 0) && (arg.addr >= 0)) {
+ return true;
+ }
+ return (addr > arg.addr);
+ }
+
+ public boolean greaterThanOrEqual(Address a) {
+ if (a == null) {
+ return true;
+ }
+ BsdAddress arg = (BsdAddress) a;
+ if ((addr >= 0) && (arg.addr < 0)) {
+ return false;
+ }
+ if ((addr < 0) && (arg.addr >= 0)) {
+ return true;
+ }
+ return (addr >= arg.addr);
+ }
+
+ public Address andWithMask(long mask) throws UnsupportedOperationException {
+ long value = addr & mask;
+ if (value == 0) {
+ return null;
+ }
+ return new BsdAddress(debugger, value);
+ }
+
+ public Address orWithMask(long mask) throws UnsupportedOperationException {
+ long value = addr | mask;
+ if (value == 0) {
+ return null;
+ }
+ return new BsdAddress(debugger, value);
+ }
+
+ public Address xorWithMask(long mask) throws UnsupportedOperationException {
+ long value = addr ^ mask;
+ if (value == 0) {
+ return null;
+ }
+ return new BsdAddress(debugger, value);
+ }
+
+
+ //--------------------------------------------------------------------------------
+ // Internals only below this point
+ //
+
+ long getValue() {
+ return addr;
+ }
+
+
+ private static void check(boolean arg, String failMessage) {
+ if (!arg) {
+ System.err.println(failMessage + ": FAILED");
+ System.exit(1);
+ }
+ }
+
+ // Test harness
+ public static void main(String[] args) {
+ // p/n indicates whether the interior address is really positive
+ // or negative. In unsigned terms, p1 < p2 < n1 < n2.
+
+ BsdAddress p1 = new BsdAddress(null, 0x7FFFFFFFFFFFFFF0L);
+ BsdAddress p2 = (BsdAddress) p1.addOffsetTo(10);
+ BsdAddress n1 = (BsdAddress) p2.addOffsetTo(10);
+ BsdAddress n2 = (BsdAddress) n1.addOffsetTo(10);
+
+ // lessThan positive tests
+ check(p1.lessThan(p2), "lessThan 1");
+ check(p1.lessThan(n1), "lessThan 2");
+ check(p1.lessThan(n2), "lessThan 3");
+ check(p2.lessThan(n1), "lessThan 4");
+ check(p2.lessThan(n2), "lessThan 5");
+ check(n1.lessThan(n2), "lessThan 6");
+
+ // lessThan negative tests
+ check(!p1.lessThan(p1), "lessThan 7");
+ check(!p2.lessThan(p2), "lessThan 8");
+ check(!n1.lessThan(n1), "lessThan 9");
+ check(!n2.lessThan(n2), "lessThan 10");
+
+ check(!p2.lessThan(p1), "lessThan 11");
+ check(!n1.lessThan(p1), "lessThan 12");
+ check(!n2.lessThan(p1), "lessThan 13");
+ check(!n1.lessThan(p2), "lessThan 14");
+ check(!n2.lessThan(p2), "lessThan 15");
+ check(!n2.lessThan(n1), "lessThan 16");
+
+ // lessThanOrEqual positive tests
+ check(p1.lessThanOrEqual(p1), "lessThanOrEqual 1");
+ check(p2.lessThanOrEqual(p2), "lessThanOrEqual 2");
+ check(n1.lessThanOrEqual(n1), "lessThanOrEqual 3");
+ check(n2.lessThanOrEqual(n2), "lessThanOrEqual 4");
+
+ check(p1.lessThanOrEqual(p2), "lessThanOrEqual 5");
+ check(p1.lessThanOrEqual(n1), "lessThanOrEqual 6");
+ check(p1.lessThanOrEqual(n2), "lessThanOrEqual 7");
+ check(p2.lessThanOrEqual(n1), "lessThanOrEqual 8");
+ check(p2.lessThanOrEqual(n2), "lessThanOrEqual 9");
+ check(n1.lessThanOrEqual(n2), "lessThanOrEqual 10");
+
+ // lessThanOrEqual negative tests
+ check(!p2.lessThanOrEqual(p1), "lessThanOrEqual 11");
+ check(!n1.lessThanOrEqual(p1), "lessThanOrEqual 12");
+ check(!n2.lessThanOrEqual(p1), "lessThanOrEqual 13");
+ check(!n1.lessThanOrEqual(p2), "lessThanOrEqual 14");
+ check(!n2.lessThanOrEqual(p2), "lessThanOrEqual 15");
+ check(!n2.lessThanOrEqual(n1), "lessThanOrEqual 16");
+
+ // greaterThan positive tests
+ check(n2.greaterThan(p1), "greaterThan 1");
+ check(n2.greaterThan(p2), "greaterThan 2");
+ check(n2.greaterThan(n1), "greaterThan 3");
+ check(n1.greaterThan(p1), "greaterThan 4");
+ check(n1.greaterThan(p2), "greaterThan 5");
+ check(p2.greaterThan(p1), "greaterThan 6");
+
+ // greaterThan negative tests
+ check(!p1.greaterThan(p1), "greaterThan 7");
+ check(!p2.greaterThan(p2), "greaterThan 8");
+ check(!n1.greaterThan(n1), "greaterThan 9");
+ check(!n2.greaterThan(n2), "greaterThan 10");
+
+ check(!p1.greaterThan(n2), "greaterThan 11");
+ check(!p2.greaterThan(n2), "greaterThan 12");
+ check(!n1.greaterThan(n2), "greaterThan 13");
+ check(!p1.greaterThan(n1), "greaterThan 14");
+ check(!p2.greaterThan(n1), "greaterThan 15");
+ check(!p1.greaterThan(p2), "greaterThan 16");
+
+ // greaterThanOrEqual positive tests
+ check(p1.greaterThanOrEqual(p1), "greaterThanOrEqual 1");
+ check(p2.greaterThanOrEqual(p2), "greaterThanOrEqual 2");
+ check(n1.greaterThanOrEqual(n1), "greaterThanOrEqual 3");
+ check(n2.greaterThanOrEqual(n2), "greaterThanOrEqual 4");
+
+ check(n2.greaterThanOrEqual(p1), "greaterThanOrEqual 5");
+ check(n2.greaterThanOrEqual(p2), "greaterThanOrEqual 6");
+ check(n2.greaterThanOrEqual(n1), "greaterThanOrEqual 7");
+ check(n1.greaterThanOrEqual(p1), "greaterThanOrEqual 8");
+ check(n1.greaterThanOrEqual(p2), "greaterThanOrEqual 9");
+ check(p2.greaterThanOrEqual(p1), "greaterThanOrEqual 10");
+
+ // greaterThanOrEqual negative tests
+ check(!p1.greaterThanOrEqual(n2), "greaterThanOrEqual 11");
+ check(!p2.greaterThanOrEqual(n2), "greaterThanOrEqual 12");
+ check(!n1.greaterThanOrEqual(n2), "greaterThanOrEqual 13");
+ check(!p1.greaterThanOrEqual(n1), "greaterThanOrEqual 14");
+ check(!p2.greaterThanOrEqual(n1), "greaterThanOrEqual 15");
+ check(!p1.greaterThanOrEqual(p2), "greaterThanOrEqual 16");
+
+ System.err.println("BsdAddress: all tests passed successfully.");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
new file mode 100644
index 0000000..92f7bbf
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+import sun.jvm.hotspot.debugger.x86.*;
+import sun.jvm.hotspot.debugger.amd64.*;
+import sun.jvm.hotspot.debugger.bsd.x86.*;
+import sun.jvm.hotspot.debugger.bsd.amd64.*;
+import sun.jvm.hotspot.utilities.*;
+
+class BsdCDebugger implements CDebugger {
+ private BsdDebugger dbg;
+
+ BsdCDebugger(BsdDebugger dbg) {
+ this.dbg = dbg;
+ }
+
+ public List getThreadList() throws DebuggerException {
+ return dbg.getThreadList();
+ }
+
+ public List/*<LoadObject>*/ getLoadObjectList() throws DebuggerException {
+ return dbg.getLoadObjectList();
+ }
+
+ public LoadObject loadObjectContainingPC(Address pc) throws DebuggerException {
+ if (pc == null) {
+ return null;
+ }
+ List objs = getLoadObjectList();
+ Object[] arr = objs.toArray();
+ // load objects are sorted by base address, do binary search
+ int mid = -1;
+ int low = 0;
+ int high = arr.length - 1;
+
+ while (low <= high) {
+ mid = (low + high) >> 1;
+ LoadObject midVal = (LoadObject) arr[mid];
+ long cmp = pc.minus(midVal.getBase());
+ if (cmp < 0) {
+ high = mid - 1;
+ } else if (cmp > 0) {
+ long size = midVal.getSize();
+ if (cmp >= size) {
+ low = mid + 1;
+ } else {
+ return (LoadObject) arr[mid];
+ }
+ } else { // match found
+ return (LoadObject) arr[mid];
+ }
+ }
+ // no match found.
+ return null;
+ }
+
+ public CFrame topFrameForThread(ThreadProxy thread) throws DebuggerException {
+ String cpu = dbg.getCPU();
+ if (cpu.equals("x86")) {
+ X86ThreadContext context = (X86ThreadContext) thread.getContext();
+ Address ebp = context.getRegisterAsAddress(X86ThreadContext.EBP);
+ if (ebp == null) return null;
+ Address pc = context.getRegisterAsAddress(X86ThreadContext.EIP);
+ if (pc == null) return null;
+ return new BsdX86CFrame(dbg, ebp, pc);
+ } else if (cpu.equals("amd64")) {
+ AMD64ThreadContext context = (AMD64ThreadContext) thread.getContext();
+ Address rbp = context.getRegisterAsAddress(AMD64ThreadContext.RBP);
+ if (rbp == null) return null;
+ Address pc = context.getRegisterAsAddress(AMD64ThreadContext.RIP);
+ if (pc == null) return null;
+ return new BsdAMD64CFrame(dbg, rbp, pc);
+ } else {
+ throw new DebuggerException(cpu + " is not yet supported");
+ }
+ }
+
+ public String getNameOfFile(String fileName) {
+ return new File(fileName).getName();
+ }
+
+ public ProcessControl getProcessControl() throws DebuggerException {
+ // FIXME: after stabs parser
+ return null;
+ }
+
+ public boolean canDemangle() {
+ return false;
+ }
+
+ public String demangle(String sym) {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java
new file mode 100644
index 0000000..a708a75
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebugger.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import java.util.List;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+
+/** An extension of the JVMDebugger interface with a few additions to
+ support 32-bit vs. 64-bit debugging as well as features required
+ by the architecture-specific subpackages. */
+
+public interface BsdDebugger extends JVMDebugger {
+ public String addressValueToString(long address) throws DebuggerException;
+ public boolean readJBoolean(long address) throws DebuggerException;
+ public byte readJByte(long address) throws DebuggerException;
+ public char readJChar(long address) throws DebuggerException;
+ public double readJDouble(long address) throws DebuggerException;
+ public float readJFloat(long address) throws DebuggerException;
+ public int readJInt(long address) throws DebuggerException;
+ public long readJLong(long address) throws DebuggerException;
+ public short readJShort(long address) throws DebuggerException;
+ public long readCInteger(long address, long numBytes, boolean isUnsigned)
+ throws DebuggerException;
+ public BsdAddress readAddress(long address) throws DebuggerException;
+ public BsdAddress readCompOopAddress(long address) throws DebuggerException;
+ public BsdOopHandle readOopHandle(long address) throws DebuggerException;
+ public BsdOopHandle readCompOopHandle(long address) throws DebuggerException;
+ public long[] getThreadIntegerRegisterSet(int lwp_id) throws DebuggerException;
+ public long getAddressValue(Address addr) throws DebuggerException;
+ public Address newAddress(long value) throws DebuggerException;
+
+ // For BsdCDebugger
+ public List getThreadList();
+ public List getLoadObjectList();
+ public ClosestSymbol lookup(long address);
+
+ // NOTE: this interface implicitly contains the following methods:
+ // From the Debugger interface via JVMDebugger
+ // public void attach(int processID) throws DebuggerException;
+ // public void attach(String executableName, String coreFileName) throws DebuggerException;
+ // public boolean detach();
+ // public Address parseAddress(String addressString) throws NumberFormatException;
+ // public String getOS();
+ // public String getCPU();
+ // From the SymbolLookup interface via Debugger and JVMDebugger
+ // public Address lookup(String objectName, String symbol);
+ // public OopHandle lookupOop(String objectName, String symbol);
+ // From the JVMDebugger interface
+ // public void configureJavaPrimitiveTypeSizes(long jbooleanSize,
+ // long jbyteSize,
+ // long jcharSize,
+ // long jdoubleSize,
+ // long jfloatSize,
+ // long jintSize,
+ // long jlongSize,
+ // long jshortSize);
+ // From the ThreadAccess interface via Debugger and JVMDebugger
+ // public ThreadProxy getThreadForIdentifierAddress(Address addr);
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
new file mode 100644
index 0000000..ce508e6
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdDebuggerLocal.java
@@ -0,0 +1,595 @@
+/*
+ * Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.x86.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+import sun.jvm.hotspot.utilities.*;
+import java.lang.reflect.*;
+
+/** <P> An implementation of the JVMDebugger interface. The basic debug
+ facilities are implemented through ptrace interface in the JNI code
+ (libsaproc.so). Library maps and symbol table management are done in
+ JNI. </P>
+
+ <P> <B>NOTE</B> that since we have the notion of fetching "Java
+ primitive types" from the remote process (which might have
+ different sizes than we expect) we have a bootstrapping
+ problem. We need to know the sizes of these types before we can
+ fetch them. The current implementation solves this problem by
+ requiring that it be configured with these type sizes before they
+ can be fetched. The readJ(Type) routines here will throw a
+ RuntimeException if they are called before the debugger is
+ configured with the Java primitive type sizes. </P> */
+
+public class BsdDebuggerLocal extends DebuggerBase implements BsdDebugger {
+ private boolean useGCC32ABI;
+ private boolean attached;
+ private long p_ps_prochandle; // native debugger handle
+ private boolean isCore;
+
+ // CDebugger support
+ private BsdCDebugger cdbg;
+
+ // threadList and loadObjectList are filled by attach0 method
+ private List threadList;
+ private List loadObjectList;
+
+ // called by native method lookupByAddress0
+ private ClosestSymbol createClosestSymbol(String name, long offset) {
+ return new ClosestSymbol(name, offset);
+ }
+
+ // called by native method attach0
+ private LoadObject createLoadObject(String fileName, long textsize,
+ long base) {
+ File f = new File(fileName);
+ Address baseAddr = newAddress(base);
+ return new SharedObject(this, fileName, f.length(), baseAddr);
+ }
+
+ // native methods
+
+ private native static void init0()
+ throws DebuggerException;
+ private native void attach0(int pid)
+ throws DebuggerException;
+ private native void attach0(String execName, String coreName)
+ throws DebuggerException;
+ private native void detach0()
+ throws DebuggerException;
+ private native long lookupByName0(String objectName, String symbol)
+ throws DebuggerException;
+ private native ClosestSymbol lookupByAddress0(long address)
+ throws DebuggerException;
+ private native long[] getThreadIntegerRegisterSet0(int lwp_id)
+ throws DebuggerException;
+ private native byte[] readBytesFromProcess0(long address, long numBytes)
+ throws DebuggerException;
+ public native static int getAddressSize() ;
+
+ // Note on Bsd threads are really processes. When target process is
+ // attached by a serviceability agent thread, only that thread can do
+ // ptrace operations on the target. This is because from kernel's point
+ // view, other threads are just separate processes and they are not
+ // attached to the target. When they attempt to make ptrace calls,
+ // an ESRCH error will be returned as kernel believes target is not
+ // being traced by the caller.
+ // To work around the problem, we use a worker thread here to handle
+ // all JNI functions that are making ptrace calls.
+
+ interface WorkerThreadTask {
+ public void doit(BsdDebuggerLocal debugger) throws DebuggerException;
+ }
+
+ class BsdDebuggerLocalWorkerThread extends Thread {
+ BsdDebuggerLocal debugger;
+ WorkerThreadTask task;
+ DebuggerException lastException;
+
+ public BsdDebuggerLocalWorkerThread(BsdDebuggerLocal debugger) {
+ this.debugger = debugger;
+ setDaemon(true);
+ }
+
+ public void run() {
+ synchronized (workerThread) {
+ for (;;) {
+ if (task != null) {
+ lastException = null;
+ try {
+ task.doit(debugger);
+ } catch (DebuggerException exp) {
+ lastException = exp;
+ }
+ task = null;
+ workerThread.notifyAll();
+ }
+
+ try {
+ workerThread.wait();
+ } catch (InterruptedException x) {}
+ }
+ }
+ }
+
+ public WorkerThreadTask execute(WorkerThreadTask task) throws DebuggerException {
+ synchronized (workerThread) {
+ this.task = task;
+ workerThread.notifyAll();
+ while (this.task != null) {
+ try {
+ workerThread.wait();
+ } catch (InterruptedException x) {}
+ }
+ if (lastException != null) {
+ throw new DebuggerException(lastException);
+ } else {
+ return task;
+ }
+ }
+ }
+ }
+
+ private BsdDebuggerLocalWorkerThread workerThread = null;
+
+ //----------------------------------------------------------------------
+ // Implementation of Debugger interface
+ //
+
+ /** <P> machDesc may not be null. </P>
+
+ <P> useCache should be set to true if debugging is being done
+ locally, and to false if the debugger is being created for the
+ purpose of supporting remote debugging. </P> */
+ public BsdDebuggerLocal(MachineDescription machDesc,
+ boolean useCache) throws DebuggerException {
+ this.machDesc = machDesc;
+ utils = new DebuggerUtilities(machDesc.getAddressSize(),
+ machDesc.isBigEndian()) {
+ public void checkAlignment(long address, long alignment) {
+ // Need to override default checkAlignment because we need to
+ // relax alignment constraints on Bsd/x86
+ if ( (address % alignment != 0)
+ &&(alignment != 8 || address % 4 != 0)) {
+ throw new UnalignedAddressException(
+ "Trying to read at address: "
+ + addressValueToString(address)
+ + " with alignment: " + alignment,
+ address);
+ }
+ }
+ };
+
+ if (useCache) {
+ // FIXME: re-test necessity of cache on Bsd, where data
+ // fetching is faster
+ // Cache portion of the remote process's address space.
+ // Fetching data over the socket connection to dbx is slow.
+ // Might be faster if we were using a binary protocol to talk to
+ // dbx, but would have to test. For now, this cache works best
+ // if it covers the entire heap of the remote process. FIXME: at
+ // least should make this tunable from the outside, i.e., via
+ // the UI. This is a cache of 4096 4K pages, or 16 MB. The page
+ // size must be adjusted to be the hardware's page size.
+ // (FIXME: should pick this up from the debugger.)
+ if (getCPU().equals("ia64")) {
+ initCache(16384, parseCacheNumPagesProperty(1024));
+ } else {
+ initCache(4096, parseCacheNumPagesProperty(4096));
+ }
+ }
+
+ workerThread = new BsdDebuggerLocalWorkerThread(this);
+ workerThread.start();
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public boolean hasProcessList() throws DebuggerException {
+ return false;
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public List getProcessList() throws DebuggerException {
+ throw new DebuggerException("getProcessList not implemented yet");
+ }
+
+ private void checkAttached() throws DebuggerException {
+ if (attached) {
+ if (isCore) {
+ throw new DebuggerException("attached to a core dump already");
+ } else {
+ throw new DebuggerException("attached to a process already");
+ }
+ }
+ }
+
+ private void requireAttach() {
+ if (! attached) {
+ throw new RuntimeException("not attached to a process or a core!");
+ }
+ }
+
+ /* called from attach methods */
+ private void findABIVersion() throws DebuggerException {
+ if (lookupByName0("libjvm.so", "__vt_10JavaThread") != 0 ||
+ lookupByName0("libjvm_g.so", "__vt_10JavaThread") != 0) {
+ // old C++ ABI
+ useGCC32ABI = false;
+ } else {
+ // new C++ ABI
+ useGCC32ABI = true;
+ }
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public synchronized void attach(int processID) throws DebuggerException {
+ checkAttached();
+ threadList = new ArrayList();
+ loadObjectList = new ArrayList();
+ class AttachTask implements WorkerThreadTask {
+ int pid;
+ public void doit(BsdDebuggerLocal debugger) {
+ debugger.attach0(pid);
+ debugger.attached = true;
+ debugger.isCore = false;
+ findABIVersion();
+ }
+ }
+
+ AttachTask task = new AttachTask();
+ task.pid = processID;
+ workerThread.execute(task);
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public synchronized void attach(String execName, String coreName) {
+ checkAttached();
+ threadList = new ArrayList();
+ loadObjectList = new ArrayList();
+ attach0(execName, coreName);
+ attached = true;
+ isCore = true;
+ findABIVersion();
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public synchronized boolean detach() {
+ if (!attached) {
+ return false;
+ }
+
+ threadList = null;
+ loadObjectList = null;
+
+ if (isCore) {
+ detach0();
+ attached = false;
+ return true;
+ } else {
+ class DetachTask implements WorkerThreadTask {
+ boolean result = false;
+
+ public void doit(BsdDebuggerLocal debugger) {
+ debugger.detach0();
+ debugger.attached = false;
+ result = true;
+ }
+ }
+
+ DetachTask task = new DetachTask();
+ workerThread.execute(task);
+ return task.result;
+ }
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public Address parseAddress(String addressString)
+ throws NumberFormatException {
+ long addr = utils.scanAddress(addressString);
+ if (addr == 0) {
+ return null;
+ }
+ return new BsdAddress(this, addr);
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public String getOS() {
+ return PlatformInfo.getOS();
+ }
+
+ /** From the Debugger interface via JVMDebugger */
+ public String getCPU() {
+ return PlatformInfo.getCPU();
+ }
+
+ public boolean hasConsole() throws DebuggerException {
+ return false;
+ }
+
+ public String consoleExecuteCommand(String cmd) throws DebuggerException {
+ throw new DebuggerException("No debugger console available on Bsd");
+ }
+
+ public String getConsolePrompt() throws DebuggerException {
+ return null;
+ }
+
+ /* called from lookup */
+ private long handleGCC32ABI(long addr, String symbol) throws DebuggerException {
+ if (useGCC32ABI && symbol.startsWith("_ZTV")) {
+ return addr + (2 * machDesc.getAddressSize());
+ } else {
+ return addr;
+ }
+ }
+
+ /** From the SymbolLookup interface via Debugger and JVMDebugger */
+ public synchronized Address lookup(String objectName, String symbol) {
+ requireAttach();
+ if (!attached) {
+ return null;
+ }
+
+ if (isCore) {
+ long addr = lookupByName0(objectName, symbol);
+ return (addr == 0)? null : new BsdAddress(this, handleGCC32ABI(addr, symbol));
+ } else {
+ class LookupByNameTask implements WorkerThreadTask {
+ String objectName, symbol;
+ Address result;
+
+ public void doit(BsdDebuggerLocal debugger) {
+ long addr = debugger.lookupByName0(objectName, symbol);
+ result = (addr == 0 ? null : new BsdAddress(debugger, handleGCC32ABI(addr, symbol)));
+ }
+ }
+
+ LookupByNameTask task = new LookupByNameTask();
+ task.objectName = objectName;
+ task.symbol = symbol;
+ workerThread.execute(task);
+ return task.result;
+ }
+ }
+
+ /** From the SymbolLookup interface via Debugger and JVMDebugger */
+ public synchronized OopHandle lookupOop(String objectName, String symbol) {
+ Address addr = lookup(objectName, symbol);
+ if (addr == null) {
+ return null;
+ }
+ return addr.addOffsetToAsOopHandle(0);
+ }
+
+ /** From the Debugger interface */
+ public MachineDescription getMachineDescription() {
+ return machDesc;
+ }
+
+ //----------------------------------------------------------------------
+ // Implementation of ThreadAccess interface
+ //
+
+ /** From the ThreadAccess interface via Debugger and JVMDebugger */
+ public ThreadProxy getThreadForIdentifierAddress(Address addr) {
+ return new BsdThread(this, addr);
+ }
+
+ /** From the ThreadAccess interface via Debugger and JVMDebugger */
+ public ThreadProxy getThreadForThreadId(long id) {
+ return new BsdThread(this, id);
+ }
+
+ //----------------------------------------------------------------------
+ // Internal routines (for implementation of BsdAddress).
+ // These must not be called until the MachineDescription has been set up.
+ //
+
+ /** From the BsdDebugger interface */
+ public String addressValueToString(long address) {
+ return utils.addressValueToString(address);
+ }
+
+ /** From the BsdDebugger interface */
+ public BsdAddress readAddress(long address)
+ throws UnmappedAddressException, UnalignedAddressException {
+ long value = readAddressValue(address);
+ return (value == 0 ? null : new BsdAddress(this, value));
+ }
+ public BsdAddress readCompOopAddress(long address)
+ throws UnmappedAddressException, UnalignedAddressException {
+ long value = readCompOopAddressValue(address);
+ return (value == 0 ? null : new BsdAddress(this, value));
+ }
+
+ /** From the BsdDebugger interface */
+ public BsdOopHandle readOopHandle(long address)
+ throws UnmappedAddressException, UnalignedAddressException,
+ NotInHeapException {
+ long value = readAddressValue(address);
+ return (value == 0 ? null : new BsdOopHandle(this, value));
+ }
+ public BsdOopHandle readCompOopHandle(long address)
+ throws UnmappedAddressException, UnalignedAddressException,
+ NotInHeapException {
+ long value = readCompOopAddressValue(address);
+ return (value == 0 ? null : new BsdOopHandle(this, value));
+ }
+
+ //----------------------------------------------------------------------
+ // Thread context access
+ //
+
+ public synchronized long[] getThreadIntegerRegisterSet(int lwp_id)
+ throws DebuggerException {
+ requireAttach();
+ if (isCore) {
+ return getThreadIntegerRegisterSet0(lwp_id);
+ } else {
+ class GetThreadIntegerRegisterSetTask implements WorkerThreadTask {
+ int lwp_id;
+ long[] result;
+ public void doit(BsdDebuggerLocal debugger) {
+ result = debugger.getThreadIntegerRegisterSet0(lwp_id);
+ }
+ }
+
+ GetThreadIntegerRegisterSetTask task = new GetThreadIntegerRegisterSetTask();
+ task.lwp_id = lwp_id;
+ workerThread.execute(task);
+ return task.result;
+ }
+ }
+
+ /** Need to override this to relax alignment checks on x86. */
+ public long readCInteger(long address, long numBytes, boolean isUnsigned)
+ throws UnmappedAddressException, UnalignedAddressException {
+ // Only slightly relaxed semantics -- this is a hack, but is
+ // necessary on x86 where it seems the compiler is
+ // putting some global 64-bit data on 32-bit boundaries
+ if (numBytes == 8) {
+ utils.checkAlignment(address, 4);
+ } else {
+ utils.checkAlignment(address, numBytes);
+ }
+ byte[] data = readBytes(address, numBytes);
+ return utils.dataToCInteger(data, isUnsigned);
+ }
+
+ // Overridden from DebuggerBase because we need to relax alignment
+ // constraints on x86
+ public long readJLong(long address)
+ throws UnmappedAddressException, UnalignedAddressException {
+ utils.checkAlignment(address, jintSize);
+ byte[] data = readBytes(address, jlongSize);
+ return utils.dataToJLong(data, jlongSize);
+ }
+
+ //----------------------------------------------------------------------
+ // Address access. Can not be package private, but should only be
+ // accessed by the architecture-specific subpackages.
+
+ /** From the BsdDebugger interface */
+ public long getAddressValue(Address addr) {
+ if (addr == null) return 0;
+ return ((BsdAddress) addr).getValue();
+ }
+
+ /** From the BsdDebugger interface */
+ public Address newAddress(long value) {
+ if (value == 0) return null;
+ return new BsdAddress(this, value);
+ }
+
+ /** From the BsdCDebugger interface */
+ public List/*<ThreadProxy>*/ getThreadList() {
+ requireAttach();
+ return threadList;
+ }
+
+ /** From the BsdCDebugger interface */
+ public List/*<LoadObject>*/ getLoadObjectList() {
+ requireAttach();
+ return loadObjectList;
+ }
+
+ /** From the BsdCDebugger interface */
+ public synchronized ClosestSymbol lookup(long addr) {
+ requireAttach();
+ if (isCore) {
+ return lookupByAddress0(addr);
+ } else {
+ class LookupByAddressTask implements WorkerThreadTask {
+ long addr;
+ ClosestSymbol result;
+
+ public void doit(BsdDebuggerLocal debugger) {
+ result = debugger.lookupByAddress0(addr);
+ }
+ }
+
+ LookupByAddressTask task = new LookupByAddressTask();
+ task.addr = addr;
+ workerThread.execute(task);
+ return task.result;
+ }
+ }
+
+ public CDebugger getCDebugger() {
+ if (cdbg == null) {
+ String cpu = getCPU();
+ if (cpu.equals("ia64") ) {
+ // IA-64 is not supported because of stack-walking issues
+ return null;
+ }
+ cdbg = new BsdCDebugger(this);
+ }
+ return cdbg;
+ }
+
+ /** This reads bytes from the remote process. */
+ public synchronized ReadResult readBytesFromProcess(long address,
+ long numBytes) throws UnmappedAddressException, DebuggerException {
+ requireAttach();
+ if (isCore) {
+ byte[] res = readBytesFromProcess0(address, numBytes);
+ return (res != null)? new ReadResult(res) : new ReadResult(address);
+ } else {
+ class ReadBytesFromProcessTask implements WorkerThreadTask {
+ long address, numBytes;
+ ReadResult result;
+ public void doit(BsdDebuggerLocal debugger) {
+ byte[] res = debugger.readBytesFromProcess0(address, numBytes);
+ if (res != null)
+ result = new ReadResult(res);
+ else
+ result = new ReadResult(address);
+ }
+ }
+
+ ReadBytesFromProcessTask task = new ReadBytesFromProcessTask();
+ task.address = address;
+ task.numBytes = numBytes;
+ workerThread.execute(task);
+ return task.result;
+ }
+ }
+
+ public void writeBytesToProcess(long address, long numBytes, byte[] data)
+ throws UnmappedAddressException, DebuggerException {
+ // FIXME
+ throw new DebuggerException("Unimplemented");
+ }
+
+ static {
+ System.loadLibrary("saproc");
+ init0();
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java
new file mode 100644
index 0000000..9df0e2f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdOopHandle.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import sun.jvm.hotspot.debugger.*;
+
+class BsdOopHandle extends BsdAddress implements OopHandle {
+ BsdOopHandle(BsdDebugger debugger, long addr) {
+ super(debugger, addr);
+ }
+
+ public boolean equals(Object arg) {
+ if (arg == null) {
+ return false;
+ }
+
+ if (!(arg instanceof BsdOopHandle)) {
+ return false;
+ }
+
+ return (addr == ((BsdAddress) arg).addr);
+ }
+
+ public Address addOffsetTo (long offset) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException("addOffsetTo not applicable to OopHandles (interior object pointers not allowed)");
+ }
+
+ public Address andWithMask(long mask) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException("andWithMask not applicable to OopHandles (i.e., anything but C addresses)");
+ }
+
+ public Address orWithMask(long mask) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException("orWithMask not applicable to OopHandles (i.e., anything but C addresses)");
+ }
+
+ public Address xorWithMask(long mask) throws UnsupportedOperationException {
+ throw new UnsupportedOperationException("xorWithMask not applicable to OopHandles (i.e., anything but C addresses)");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java
new file mode 100644
index 0000000..b7c507c
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThread.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import sun.jvm.hotspot.debugger.*;
+
+class BsdThread implements ThreadProxy {
+ private BsdDebugger debugger;
+ private int lwp_id;
+
+ /** The address argument must be the address of the _thread_id in the
+ OSThread. It's value is result ::gettid() call. */
+ BsdThread(BsdDebugger debugger, Address addr) {
+ this.debugger = debugger;
+ // FIXME: size of data fetched here should be configurable.
+ // However, making it so would produce a dependency on the "types"
+ // package from the debugger package, which is not desired.
+ this.lwp_id = (int) addr.getCIntegerAt(0, 4, true);
+ }
+
+ BsdThread(BsdDebugger debugger, long id) {
+ this.debugger = debugger;
+ this.lwp_id = (int) id;
+ }
+
+ public boolean equals(Object obj) {
+ if ((obj == null) || !(obj instanceof BsdThread)) {
+ return false;
+ }
+
+ return (((BsdThread) obj).lwp_id == lwp_id);
+ }
+
+ public int hashCode() {
+ return lwp_id;
+ }
+
+ public String toString() {
+ return Integer.toString(lwp_id);
+ }
+
+ public ThreadContext getContext() throws IllegalThreadStateException {
+ long[] data = debugger.getThreadIntegerRegisterSet(lwp_id);
+ ThreadContext context = BsdThreadContextFactory.createThreadContext(debugger);
+ for (int i = 0; i < data.length; i++) {
+ context.setRegister(i, data[i]);
+ }
+ return context;
+ }
+
+ public boolean canSetContext() throws DebuggerException {
+ return false;
+ }
+
+ public void setContext(ThreadContext context)
+ throws IllegalThreadStateException, DebuggerException {
+ throw new DebuggerException("Unimplemented");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
new file mode 100644
index 0000000..8c13ada
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.bsd.amd64.*;
+import sun.jvm.hotspot.debugger.bsd.x86.*;
+
+class BsdThreadContextFactory {
+ static ThreadContext createThreadContext(BsdDebugger dbg) {
+ String cpu = dbg.getCPU();
+ if (cpu.equals("x86")) {
+ return new BsdX86ThreadContext(dbg);
+ } else if (cpu.equals("amd64")) {
+ return new BsdAMD64ThreadContext(dbg);
+ } else {
+ throw new RuntimeException("cpu " + cpu + " is not yet supported");
+ }
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java
new file mode 100644
index 0000000..2f72f7d
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/SharedObject.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+import sun.jvm.hotspot.debugger.posix.*;
+
+/** A Object can represent either a .so or an a.out file. */
+
+class SharedObject extends DSO {
+ SharedObject(BsdDebugger dbg, String filename, long size, Address relocation) {
+ super(filename, size, relocation);
+ this.dbg = dbg;
+ }
+
+ protected Address newAddress(long address) {
+ return dbg.newAddress(address);
+ }
+
+ protected long getAddressValue(Address addr) {
+ return dbg.getAddressValue(addr);
+ }
+
+ private BsdDebugger dbg;
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java
new file mode 100644
index 0000000..b27a539
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64CFrame.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd.amd64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.bsd.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+import sun.jvm.hotspot.debugger.cdbg.basic.*;
+
+final public class BsdAMD64CFrame extends BasicCFrame {
+ public BsdAMD64CFrame(BsdDebugger dbg, Address rbp, Address rip) {
+ super(dbg.getCDebugger());
+ this.rbp = rbp;
+ this.rip = rip;
+ this.dbg = dbg;
+ }
+
+ // override base class impl to avoid ELF parsing
+ public ClosestSymbol closestSymbolToPC() {
+ // try native lookup in debugger.
+ return dbg.lookup(dbg.getAddressValue(pc()));
+ }
+
+ public Address pc() {
+ return rip;
+ }
+
+ public Address localVariableBase() {
+ return rbp;
+ }
+
+ public CFrame sender() {
+ if (rbp == null) {
+ return null;
+ }
+
+ Address nextRBP = rbp.getAddressAt( 0 * ADDRESS_SIZE);
+ if (nextRBP == null) {
+ return null;
+ }
+ Address nextPC = rbp.getAddressAt( 1 * ADDRESS_SIZE);
+ if (nextPC == null) {
+ return null;
+ }
+ return new BsdAMD64CFrame(dbg, nextRBP, nextPC);
+ }
+
+ // package/class internals only
+ private static final int ADDRESS_SIZE = 8;
+ private Address rip;
+ private Address rbp;
+ private BsdDebugger dbg;
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java
new file mode 100644
index 0000000..a9ebf83
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/amd64/BsdAMD64ThreadContext.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd.amd64;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.amd64.*;
+import sun.jvm.hotspot.debugger.bsd.*;
+
+public class BsdAMD64ThreadContext extends AMD64ThreadContext {
+ private BsdDebugger debugger;
+
+ public BsdAMD64ThreadContext(BsdDebugger debugger) {
+ super();
+ this.debugger = debugger;
+ }
+
+ public void setRegisterAsAddress(int index, Address value) {
+ setRegister(index, debugger.getAddressValue(value));
+ }
+
+ public Address getRegisterAsAddress(int index) {
+ return debugger.newAddress(getRegister(index));
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java
new file mode 100644
index 0000000..40292b9
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86CFrame.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd.x86;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.bsd.*;
+import sun.jvm.hotspot.debugger.cdbg.*;
+import sun.jvm.hotspot.debugger.cdbg.basic.*;
+
+final public class BsdX86CFrame extends BasicCFrame {
+ // package/class internals only
+ public BsdX86CFrame(BsdDebugger dbg, Address ebp, Address pc) {
+ super(dbg.getCDebugger());
+ this.ebp = ebp;
+ this.pc = pc;
+ this.dbg = dbg;
+ }
+
+ // override base class impl to avoid ELF parsing
+ public ClosestSymbol closestSymbolToPC() {
+ // try native lookup in debugger.
+ return dbg.lookup(dbg.getAddressValue(pc()));
+ }
+
+ public Address pc() {
+ return pc;
+ }
+
+ public Address localVariableBase() {
+ return ebp;
+ }
+
+ public CFrame sender() {
+ if (ebp == null) {
+ return null;
+ }
+
+ Address nextEBP = ebp.getAddressAt( 0 * ADDRESS_SIZE);
+ if (nextEBP == null) {
+ return null;
+ }
+ Address nextPC = ebp.getAddressAt( 1 * ADDRESS_SIZE);
+ if (nextPC == null) {
+ return null;
+ }
+ return new BsdX86CFrame(dbg, nextEBP, nextPC);
+ }
+
+ private static final int ADDRESS_SIZE = 4;
+ private Address pc;
+ private Address ebp;
+ private BsdDebugger dbg;
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java
new file mode 100644
index 0000000..8eaca2b
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/x86/BsdX86ThreadContext.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.debugger.bsd.x86;
+
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.x86.*;
+import sun.jvm.hotspot.debugger.bsd.*;
+
+public class BsdX86ThreadContext extends X86ThreadContext {
+ private BsdDebugger debugger;
+
+ public BsdX86ThreadContext(BsdDebugger debugger) {
+ super();
+ this.debugger = debugger;
+ }
+
+ public void setRegisterAsAddress(int index, Address value) {
+ setRegister(index, debugger.getAddressValue(value));
+ }
+
+ public Address getRegisterAsAddress(int index) {
+ return debugger.newAddress(getRegister(index));
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java
index 87c7a54..57f676a 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecode.java
@@ -26,6 +26,7 @@ package sun.jvm.hotspot.interpreter;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.utilities.*;
+import sun.jvm.hotspot.runtime.VM;
public class Bytecode {
Method method;
@@ -45,6 +46,23 @@ public class Bytecode {
return Bits.roundTo(bci + offset, jintSize) - bci;
}
+ public int getIndexU1() { return method.getBytecodeOrBPAt(bci() + 1) & 0xFF; }
+ public int getIndexU2(int bc, boolean isWide) {
+ if (can_use_native_byte_order(bc, isWide)) {
+ return method.getNativeShortArg(bci() + (isWide ? 2 : 1)) & 0xFFFF;
+ }
+ return method.getBytecodeShortArg(bci() + (isWide ? 2 : 1)) & 0xFFFF;
+ }
+ public int getIndexU4() { return method.getNativeIntArg(bci() + 1); }
+ public boolean hasIndexU4() { return code() == Bytecodes._invokedynamic; }
+
+ public int getIndexU1Cpcache() { return method.getBytecodeOrBPAt(bci() + 1) & 0xFF; }
+ public int getIndexU2Cpcache() { return method.getNativeShortArg(bci() + 1) & 0xFFFF; }
+
+ static boolean can_use_native_byte_order(int bc, boolean is_wide) {
+ return (VM.getVM().isBigEndian() || Bytecodes.native_byte_order(bc /*, is_wide*/));
+ }
+
int javaSignedWordAt(int offset) {
return method.getBytecodeIntArg(bci + offset);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java
index d1f9f70..2c27e3d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeLoadConstant.java
@@ -28,29 +28,25 @@ import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.utilities.*;
-public class BytecodeLoadConstant extends BytecodeWithCPIndex {
+public class BytecodeLoadConstant extends Bytecode {
BytecodeLoadConstant(Method method, int bci) {
super(method, bci);
}
public boolean hasCacheIndex() {
// normal ldc uses CP index, but fast_aldc uses swapped CP cache index
- return javaCode() != code();
+ return code() >= Bytecodes.number_of_java_codes;
}
- public int index() {
- int i = javaCode() == Bytecodes._ldc ?
- (int) (0xFF & javaByteAt(1))
- : (int) (0xFFFF & javaShortAt(1));
- if (hasCacheIndex()) {
- return (0xFFFF & VM.getVM().getBytes().swapShort((short) i));
- } else {
- return i;
- }
+ int rawIndex() {
+ if (javaCode() == Bytecodes._ldc)
+ return getIndexU1();
+ else
+ return getIndexU2(code(), false);
}
public int poolIndex() {
- int i = index();
+ int i = rawIndex();
if (hasCacheIndex()) {
ConstantPoolCache cpCache = method().getConstants().getCache();
return cpCache.getEntryAt(i).getConstantPoolIndex();
@@ -61,12 +57,18 @@ public class BytecodeLoadConstant extends BytecodeWithCPIndex {
public int cacheIndex() {
if (hasCacheIndex()) {
- return index();
+ return rawIndex();
} else {
return -1; // no cache index
}
}
+ public BasicType resultType() {
+ int index = poolIndex();
+ ConstantTag tag = method().getConstants().getTagAt(index);
+ return tag.basicType();
+ }
+
private Oop getCachedConstant() {
int i = cacheIndex();
if (i >= 0) {
@@ -88,7 +90,7 @@ public class BytecodeLoadConstant extends BytecodeWithCPIndex {
jcode == Bytecodes._ldc2_w;
if (! codeOk) return false;
- ConstantTag ctag = method().getConstants().getTagAt(index());
+ ConstantTag ctag = method().getConstants().getTagAt(poolIndex());
if (jcode == Bytecodes._ldc2_w) {
// has to be double or long
return (ctag.isDouble() || ctag.isLong()) ? true: false;
@@ -107,7 +109,7 @@ public class BytecodeLoadConstant extends BytecodeWithCPIndex {
return false;
}
- ConstantTag ctag = method().getConstants().getTagAt(index());
+ ConstantTag ctag = method().getConstants().getTagAt(poolIndex());
return ctag.isKlass() || ctag.isUnresolvedKlass();
}
@@ -120,7 +122,7 @@ public class BytecodeLoadConstant extends BytecodeWithCPIndex {
// We just look at the object at the corresponding index and
// decide based on the oop type.
ConstantPool cpool = method().getConstants();
- int cpIndex = index();
+ int cpIndex = poolIndex();
ConstantPool.CPSlot oop = cpool.getSlotAt(cpIndex);
if (oop.isOop()) {
return (Klass) oop.getOop();
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java
index 20e475b..6084b35 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2002, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -130,7 +130,13 @@ public class BytecodeStream {
public int getIndex() { return (isWide())
? (_method.getBytecodeShortArg(bci() + 2) & 0xFFFF)
: (_method.getBytecodeOrBPAt(bci() + 1) & 0xFF); }
- public int getIndexBig() { return _method.getBytecodeShortArg(bci() + 1); }
+ public int getIndexU1() { return _method.getBytecodeOrBPAt(bci() + 1) & 0xFF; }
+ public int getIndexU2() { return _method.getBytecodeShortArg(bci() + 1) & 0xFFFF; }
+ public int getIndexU4() { return _method.getNativeIntArg(bci() + 1); }
+ public boolean hasIndexU4() { return code() == Bytecodes._invokedynamic; }
+
+ public int getIndexU1Cpcache() { return _method.getBytecodeOrBPAt(bci() + 1) & 0xFF; }
+ public int getIndexU2Cpcache() { return _method.getNativeShortArg(bci() + 1) & 0xFFFF; }
// Fetch at absolute BCI (for manual parsing of certain bytecodes)
public int codeAt(int bci) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java
index b646873..30df125 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWideable.java
@@ -38,7 +38,6 @@ public abstract class BytecodeWideable extends Bytecode {
// the local variable index
public int getLocalVarIndex() {
- return (isWide()) ? (int) (0xFFFF & javaShortAt(1))
- : (int) (0xFF & javaByteAt(1));
+ return (isWide()) ? getIndexU2(code(), true) : getIndexU1();
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
index fc0730f..319558f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/BytecodeWithCPIndex.java
@@ -35,7 +35,7 @@ public abstract class BytecodeWithCPIndex extends Bytecode {
}
// the constant pool index for this bytecode
- public int index() { return 0xFFFF & javaShortAt(1); }
+ public int index() { return getIndexU2(code(), false); }
public int getSecondaryIndex() {
throw new IllegalArgumentException("must be invokedynamic");
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 1306dc4..5e5acc1 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
@@ -276,6 +276,34 @@ public class Bytecodes {
public static final int number_of_codes = 233;
+ // Flag bits derived from format strings, can_trap, can_rewrite, etc.:
+ // semantic flags:
+ static final int _bc_can_trap = 1<<0; // bytecode execution can trap or block
+ static final int _bc_can_rewrite = 1<<1; // bytecode execution has an alternate form
+
+ // format bits (determined only by the format string):
+ static final int _fmt_has_c = 1<<2; // constant, such as sipush "bcc"
+ static final int _fmt_has_j = 1<<3; // constant pool cache index, such as getfield "bjj"
+ static final int _fmt_has_k = 1<<4; // constant pool index, such as ldc "bk"
+ static final int _fmt_has_i = 1<<5; // local index, such as iload
+ static final int _fmt_has_o = 1<<6; // offset, such as ifeq
+ static final int _fmt_has_nbo = 1<<7; // contains native-order field(s)
+ static final int _fmt_has_u2 = 1<<8; // contains double-byte field(s)
+ static final int _fmt_has_u4 = 1<<9; // contains quad-byte field
+ static final int _fmt_not_variable = 1<<10; // not of variable length (simple or wide)
+ static final int _fmt_not_simple = 1<<11; // either wide or variable length
+ static final int _all_fmt_bits = (_fmt_not_simple*2 - _fmt_has_c);
+
+ // Example derived format syndromes:
+ static final int _fmt_b = _fmt_not_variable;
+ static final int _fmt_bc = _fmt_b | _fmt_has_c;
+ static final int _fmt_bi = _fmt_b | _fmt_has_i;
+ static final int _fmt_bkk = _fmt_b | _fmt_has_k | _fmt_has_u2;
+ static final int _fmt_bJJ = _fmt_b | _fmt_has_j | _fmt_has_u2 | _fmt_has_nbo;
+ static final int _fmt_bo2 = _fmt_b | _fmt_has_o | _fmt_has_u2;
+ static final int _fmt_bo4 = _fmt_b | _fmt_has_o | _fmt_has_u4;
+
+
public static int specialLengthAt(Method method, int bci) {
int code = codeAt(method, bci);
switch (code) {
@@ -337,18 +365,20 @@ public class Bytecodes {
// static Code non_breakpoint_code_at(address bcp, methodOop method = null);
// Bytecode attributes
- public static boolean isDefined (int code) { return 0 <= code && code < number_of_codes && _format[code] != null; }
- public static boolean wideIsDefined(int code) { return isDefined(code) && _wide_format[code] != null; }
+ public static boolean isDefined (int code) { return 0 <= code && code < number_of_codes && flags(code, false) != 0; }
+ public static boolean wideIsDefined(int code) { return isDefined(code) && flags(code, true) != 0; }
public static String name (int code) { check(code); return _name [code]; }
public static String format (int code) { check(code); return _format [code]; }
public static String wideFormat (int code) { wideCheck(code); return _wide_format [code]; }
public static int resultType (int code) { check(code); return _result_type [code]; }
public static int depth (int code) { check(code); return _depth [code]; }
- public static int lengthFor (int code) { check(code); return _length [code]; }
- public static boolean canTrap (int code) { check(code); return _can_trap [code]; }
+ public static int lengthFor (int code) { check(code); return _lengths [code] & 0xF; }
+ public static int wideLengthFor(int code) { check(code); return _lengths [code] >> 4; }
+ public static boolean canTrap (int code) { check(code); return has_all_flags(code, _bc_can_trap, false); }
public static int javaCode (int code) { check(code); return _java_code [code]; }
- public static boolean canRewrite (int code) { check(code); return _can_rewrite [code]; }
- public static int wideLengthFor(int code) { wideCheck(code); return wideFormat(code).length(); }
+ public static boolean canRewrite (int code) { check(code); return has_all_flags(code, _bc_can_rewrite, false); }
+ public static boolean native_byte_order(int code) { check(code); return has_all_flags(code, _fmt_has_nbo, false); }
+ public static boolean uses_cp_cache (int code) { check(code); return has_all_flags(code, _fmt_has_j, false); }
public static int lengthAt (Method method, int bci) { int l = lengthFor(codeAt(method, bci)); return l > 0 ? l : specialLengthAt(method, bci); }
public static int javaLengthAt (Method method, int bci) { int l = lengthFor(javaCode(codeAt(method, bci))); return l > 0 ? l : specialLengthAt(method, bci); }
public static boolean isJavaCode (int code) { return 0 <= code && code < number_of_java_codes; }
@@ -362,6 +392,92 @@ public class Bytecodes {
public static boolean isZeroConst (int code) { return (code == _aconst_null || code == _iconst_0
|| code == _fconst_0 || code == _dconst_0); }
+ static int flags (int code, boolean is_wide) {
+ assert code == (code & 0xff) : "must be a byte";
+ return _flags[code + (is_wide ? 256 : 0)];
+ }
+ static int format_bits (int code, boolean is_wide) { return flags(code, is_wide) & _all_fmt_bits; }
+ static boolean has_all_flags (int code, int test_flags, boolean is_wide) {
+ return (flags(code, is_wide) & test_flags) == test_flags;
+ }
+
+ static char compute_flags(String format) {
+ return compute_flags(format, 0);
+ }
+ static char compute_flags(String format, int more_flags) {
+ if (format == null) return 0; // not even more_flags
+ int flags = more_flags;
+ int fp = 0;
+ if (format.length() == 0) {
+ flags |= _fmt_not_simple; // but variable
+ } else {
+ switch (format.charAt(fp)) {
+ case 'b':
+ flags |= _fmt_not_variable; // but simple
+ ++fp; // skip 'b'
+ break;
+ case 'w':
+ flags |= _fmt_not_variable | _fmt_not_simple;
+ ++fp; // skip 'w'
+ assert(format.charAt(fp) == 'b') : "wide format must start with 'wb'";
+ ++fp; // skip 'b'
+ break;
+ }
+ }
+
+ boolean has_nbo = false, has_jbo = false;
+ int has_size = 0;
+ while (fp < format.length()) {
+ int this_flag = 0;
+ char fc = format.charAt(fp++);
+ switch (fc) {
+ case '_': continue; // ignore these
+
+ case 'j': this_flag = _fmt_has_j; has_jbo = true; break;
+ case 'k': this_flag = _fmt_has_k; has_jbo = true; break;
+ case 'i': this_flag = _fmt_has_i; has_jbo = true; break;
+ case 'c': this_flag = _fmt_has_c; has_jbo = true; break;
+ case 'o': this_flag = _fmt_has_o; has_jbo = true; break;
+
+ // uppercase versions mark native byte order (from Rewriter)
+ // actually, only the 'J' case happens currently
+ case 'J': this_flag = _fmt_has_j; has_nbo = true; break;
+ case 'K': this_flag = _fmt_has_k; has_nbo = true; break;
+ case 'I': this_flag = _fmt_has_i; has_nbo = true; break;
+ case 'C': this_flag = _fmt_has_c; has_nbo = true; break;
+ case 'O': this_flag = _fmt_has_o; has_nbo = true; break;
+ default: assert false : "bad char in format";
+ }
+
+ flags |= this_flag;
+
+ assert !(has_jbo && has_nbo) : "mixed byte orders in format";
+ if (has_nbo)
+ flags |= _fmt_has_nbo;
+
+ int this_size = 1;
+ if (fp < format.length() && format.charAt(fp) == fc) {
+ // advance beyond run of the same characters
+ this_size = 2;
+ while (fp + 1 < format.length() && format.charAt(++fp) == fc) this_size++;
+ switch (this_size) {
+ case 2: flags |= _fmt_has_u2; break;
+ case 4: flags |= _fmt_has_u4; break;
+ default: assert false : "bad rep count in format";
+ }
+ }
+ assert has_size == 0 || // no field yet
+ this_size == has_size || // same size
+ this_size < has_size && fp == format.length() : // last field can be short
+ "mixed field sizes in format";
+ has_size = this_size;
+ }
+
+ assert flags == (char)flags : "change _format_flags";
+ return (char)flags;
+ }
+
+
//----------------------------------------------------------------------
// Internals only below this point
//
@@ -371,10 +487,9 @@ public class Bytecodes {
private static String[] _wide_format;
private static int[] _result_type;
private static byte[] _depth;
- private static byte[] _length;
- private static boolean[] _can_trap;
+ private static byte[] _lengths;
private static int[] _java_code;
- private static boolean[] _can_rewrite;
+ private static char[] _flags;
static {
_name = new String [number_of_codes];
@@ -382,10 +497,9 @@ public class Bytecodes {
_wide_format = new String [number_of_codes];
_result_type = new int [number_of_codes]; // See BasicType.java
_depth = new byte [number_of_codes];
- _length = new byte [number_of_codes];
- _can_trap = new boolean[number_of_codes];
+ _lengths = new byte [number_of_codes];
_java_code = new int [number_of_codes];
- _can_rewrite = new boolean[number_of_codes];
+ _flags = new char[256 * 2]; // all second page for wide formats
// In case we want to fetch this information from the VM in the
// future
@@ -712,18 +826,19 @@ public class Bytecodes {
if (Assert.ASSERTS_ENABLED) {
Assert.that(wide_format == null || format != null, "short form must exist if there's a wide form");
}
+ int len = (format != null ? format.length() : 0);
+ int wlen = (wide_format != null ? wide_format.length() : 0);
_name [code] = name;
- _format [code] = format;
- _wide_format [code] = wide_format;
_result_type [code] = result_type;
_depth [code] = (byte) depth;
- _can_trap [code] = can_trap;
- _length [code] = (byte) (format != null ? format.length() : 0);
+ _lengths [code] = (byte)((wlen << 4) | (len & 0xF));
_java_code [code] = java_code;
- if (java_code != code) {
- _can_rewrite[java_code] = true;
- } else {
- _can_rewrite[java_code] = false;
- }
+ _format [code] = format;
+ _wide_format [code] = wide_format;
+ int bc_flags = 0;
+ if (can_trap) bc_flags |= _bc_can_trap;
+ if (java_code != code) bc_flags |= _bc_can_rewrite;
+ _flags[code+0*256] = compute_flags(format, bc_flags);
+ _flags[code+1*256] = compute_flags(wide_format, bc_flags);
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
index 811075d..d28bca1 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
@@ -28,11 +28,13 @@ import java.io.*;
import com.sun.jdi.*;
+import sun.jvm.hotspot.memory.SystemDictionary;
import sun.jvm.hotspot.oops.Instance;
import sun.jvm.hotspot.oops.InstanceKlass;
import sun.jvm.hotspot.oops.ArrayKlass;
import sun.jvm.hotspot.oops.JVMDIClassStatus;
import sun.jvm.hotspot.oops.Klass;
+import sun.jvm.hotspot.oops.ObjArray;
import sun.jvm.hotspot.oops.Oop;
import sun.jvm.hotspot.oops.Symbol;
import sun.jvm.hotspot.oops.DefaultHeapVisitor;
@@ -53,6 +55,7 @@ implements ReferenceType {
private SoftReference methodsCache;
private SoftReference allMethodsCache;
private SoftReference nestedTypesCache;
+ private SoftReference methodInvokesCache;
/* to mark when no info available */
static final SDE NO_SDE_INFO_MARK = new SDE();
@@ -82,6 +85,27 @@ implements ReferenceType {
return method;
}
}
+ if (ref.getMethodHolder().equals(SystemDictionary.getMethodHandleKlass())) {
+ // invoke methods are generated as needed, so make mirrors as needed
+ List mis = null;
+ if (methodInvokesCache == null) {
+ mis = new ArrayList();
+ methodInvokesCache = new SoftReference(mis);
+ } else {
+ mis = (List)methodInvokesCache.get();
+ }
+ it = mis.iterator();
+ while (it.hasNext()) {
+ MethodImpl method = (MethodImpl)it.next();
+ if (ref.equals(method.ref())) {
+ return method;
+ }
+ }
+
+ MethodImpl method = MethodImpl.createMethodImpl(vm, this, ref);
+ mis.add(method);
+ return method;
+ }
throw new IllegalArgumentException("Invalid method id: " + ref);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java
index df1fb81..df5cf24 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SADebugServer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -51,14 +51,6 @@ public final class SADebugServer {
usage();
}
- // By default, SA agent classes prefer dbx debugger to proc debugger
- // and Windows process debugger to windbg debugger. SA expects
- // special properties to be set to choose other debuggers. For SA/JDI,
- // we choose proc, windbg debuggers instead of the defaults.
-
- System.setProperty("sun.jvm.hotspot.debugger.useProcDebugger", "true");
- System.setProperty("sun.jvm.hotspot.debugger.useWindbgDebugger", "true");
-
// delegate to the actual SA debug server.
sun.jvm.hotspot.DebugServer.main(args);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/StackFrameImpl.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/StackFrameImpl.java
index 8ef0aa1..69461d3 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/StackFrameImpl.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/StackFrameImpl.java
@@ -123,6 +123,9 @@ public class StackFrameImpl extends MirrorImpl
Assert.that(values.size() > 0, "this is missing");
}
// 'this' at index 0.
+ if (values.get(0).getType() == BasicType.getTConflict()) {
+ return null;
+ }
OopHandle handle = values.oopHandleAt(0);
ObjectHeap heap = vm.saObjectHeap();
thisObject = vm.objectMirror(heap.newOop(handle));
@@ -210,6 +213,8 @@ public class StackFrameImpl extends MirrorImpl
validateStackFrame();
StackValueCollection values = saFrame.getLocals();
MethodImpl mmm = (MethodImpl)location.method();
+ if (mmm.isNative())
+ return null;
List argSigs = mmm.argumentSignatures();
int count = argSigs.size();
List res = new ArrayList(0);
@@ -231,34 +236,67 @@ public class StackFrameImpl extends MirrorImpl
ValueImpl valueImpl = null;
OopHandle handle = null;
ObjectHeap heap = vm.saObjectHeap();
- if (variableType == BasicType.T_BOOLEAN) {
+ if (values.get(ss).getType() == BasicType.getTConflict()) {
+ // Dead locals, so just represent them as a zero of the appropriate type
+ if (variableType == BasicType.T_BOOLEAN) {
+ valueImpl = (BooleanValueImpl) vm.mirrorOf(false);
+ } else if (variableType == BasicType.T_CHAR) {
+ valueImpl = (CharValueImpl) vm.mirrorOf((char)0);
+ } else if (variableType == BasicType.T_FLOAT) {
+ valueImpl = (FloatValueImpl) vm.mirrorOf((float)0);
+ } else if (variableType == BasicType.T_DOUBLE) {
+ valueImpl = (DoubleValueImpl) vm.mirrorOf((double)0);
+ } else if (variableType == BasicType.T_BYTE) {
+ valueImpl = (ByteValueImpl) vm.mirrorOf((byte)0);
+ } else if (variableType == BasicType.T_SHORT) {
+ valueImpl = (ShortValueImpl) vm.mirrorOf((short)0);
+ } else if (variableType == BasicType.T_INT) {
+ valueImpl = (IntegerValueImpl) vm.mirrorOf((int)0);
+ } else if (variableType == BasicType.T_LONG) {
+ valueImpl = (LongValueImpl) vm.mirrorOf((long)0);
+ } else if (variableType == BasicType.T_OBJECT) {
+ // we may have an [Ljava/lang/Object; - i.e., Object[] with the
+ // elements themselves may be arrays because every array is an Object.
+ handle = null;
+ valueImpl = (ObjectReferenceImpl) vm.objectMirror(heap.newOop(handle));
+ } else if (variableType == BasicType.T_ARRAY) {
+ handle = null;
+ valueImpl = vm.arrayMirror((Array)heap.newOop(handle));
+ } else if (variableType == BasicType.T_VOID) {
+ valueImpl = new VoidValueImpl(vm);
+ } else {
+ throw new RuntimeException("Should not read here");
+ }
+ } else {
+ if (variableType == BasicType.T_BOOLEAN) {
valueImpl = (BooleanValueImpl) vm.mirrorOf(values.booleanAt(ss));
- } else if (variableType == BasicType.T_CHAR) {
+ } else if (variableType == BasicType.T_CHAR) {
valueImpl = (CharValueImpl) vm.mirrorOf(values.charAt(ss));
- } else if (variableType == BasicType.T_FLOAT) {
+ } else if (variableType == BasicType.T_FLOAT) {
valueImpl = (FloatValueImpl) vm.mirrorOf(values.floatAt(ss));
- } else if (variableType == BasicType.T_DOUBLE) {
+ } else if (variableType == BasicType.T_DOUBLE) {
valueImpl = (DoubleValueImpl) vm.mirrorOf(values.doubleAt(ss));
- } else if (variableType == BasicType.T_BYTE) {
+ } else if (variableType == BasicType.T_BYTE) {
valueImpl = (ByteValueImpl) vm.mirrorOf(values.byteAt(ss));
- } else if (variableType == BasicType.T_SHORT) {
+ } else if (variableType == BasicType.T_SHORT) {
valueImpl = (ShortValueImpl) vm.mirrorOf(values.shortAt(ss));
- } else if (variableType == BasicType.T_INT) {
+ } else if (variableType == BasicType.T_INT) {
valueImpl = (IntegerValueImpl) vm.mirrorOf(values.intAt(ss));
- } else if (variableType == BasicType.T_LONG) {
+ } else if (variableType == BasicType.T_LONG) {
valueImpl = (LongValueImpl) vm.mirrorOf(values.longAt(ss));
- } else if (variableType == BasicType.T_OBJECT) {
+ } else if (variableType == BasicType.T_OBJECT) {
// we may have an [Ljava/lang/Object; - i.e., Object[] with the
// elements themselves may be arrays because every array is an Object.
handle = values.oopHandleAt(ss);
valueImpl = (ObjectReferenceImpl) vm.objectMirror(heap.newOop(handle));
- } else if (variableType == BasicType.T_ARRAY) {
+ } else if (variableType == BasicType.T_ARRAY) {
handle = values.oopHandleAt(ss);
valueImpl = vm.arrayMirror((Array)heap.newOop(handle));
- } else if (variableType == BasicType.T_VOID) {
+ } else if (variableType == BasicType.T_VOID) {
valueImpl = new VoidValueImpl(vm);
- } else {
+ } else {
throw new RuntimeException("Should not read here");
+ }
}
return valueImpl;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java
index d6e4e61..4cbc144 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/VirtualMachineImpl.java
@@ -263,14 +263,6 @@ public class VirtualMachineImpl extends MirrorImpl implements PathSearchingVirtu
this.hashCode() + "]");
((com.sun.tools.jdi.VirtualMachineManagerImpl)mgr).addVirtualMachine(this);
-
- // By default SA agent classes prefer dbx debugger to proc debugger
- // and Windows process debugger to windbg debugger. SA expects
- // special properties to be set to choose other debuggers. We will set
- // those here before attaching to SA agent.
-
- System.setProperty("sun.jvm.hotspot.debugger.useProcDebugger", "true");
- System.setProperty("sun.jvm.hotspot.debugger.useWindbgDebugger", "true");
}
// we reflectively use newly spec'ed class because our ALT_BOOTDIR
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
index f8bb01a..c999ff1 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/memory/SystemDictionary.java
@@ -44,6 +44,7 @@ public class SystemDictionary {
private static sun.jvm.hotspot.types.OopField systemKlassField;
private static sun.jvm.hotspot.types.OopField threadKlassField;
private static sun.jvm.hotspot.types.OopField threadGroupKlassField;
+ private static sun.jvm.hotspot.types.OopField methodHandleKlassField;
static {
VM.registerVMInitializedObserver(new Observer() {
@@ -69,6 +70,7 @@ public class SystemDictionary {
systemKlassField = type.getOopField(WK_KLASS("System_klass"));
threadKlassField = type.getOopField(WK_KLASS("Thread_klass"));
threadGroupKlassField = type.getOopField(WK_KLASS("ThreadGroup_klass"));
+ methodHandleKlassField = type.getOopField(WK_KLASS("MethodHandle_klass"));
}
// This WK functions must follow the definitions in systemDictionary.hpp:
@@ -127,6 +129,10 @@ public class SystemDictionary {
return (InstanceKlass) newOop(systemKlassField.getValue());
}
+ public static InstanceKlass getMethodHandleKlass() {
+ return (InstanceKlass) newOop(methodHandleKlassField.getValue());
+ }
+
public InstanceKlass getAbstractOwnableSynchronizerKlass() {
return (InstanceKlass) find("java/util/concurrent/locks/AbstractOwnableSynchronizer",
null, null);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java
new file mode 100644
index 0000000..4a92692
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ArrayData.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// ArrayData
+//
+// A ArrayData is a base class for accessing profiling data which does
+// not have a statically known size. It consists of an array length
+// and an array start.
+abstract class ArrayData extends ProfileData {
+
+ static final int arrayLenOffSet = 0;
+ static final int arrayStartOffSet = 1;
+
+ int arrayUintAt(int index) {
+ int aindex = index + arrayStartOffSet;
+ return uintAt(aindex);
+ }
+ int arrayIntAt(int index) {
+ int aindex = index + arrayStartOffSet;
+ return intAt(aindex);
+ }
+ Oop arrayOopAt(int index) {
+ int aindex = index + arrayStartOffSet;
+ return oopAt(aindex);
+ }
+
+ // Code generation support for subclasses.
+ static int arrayElementOffset(int index) {
+ return cellOffset(arrayStartOffSet + index);
+ }
+
+ ArrayData(DataLayout layout) {
+ super(layout);
+ }
+
+ static int staticCellCount() {
+ return -1;
+ }
+
+ int arrayLen() {
+ return intAt(arrayLenOffSet);
+ }
+
+ public int cellCount() {
+ return arrayLen() + 1;
+ }
+
+ // Code generation support
+ static int arrayLenOffset() {
+ return cellOffset(arrayLenOffSet);
+ }
+ static int arrayStartOffset() {
+ return cellOffset(arrayStartOffSet);
+ }
+
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java
new file mode 100644
index 0000000..80902b0
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/BitData.java
@@ -0,0 +1,74 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// BitData
+//
+// A BitData holds a flag or two in its header.
+public class BitData extends ProfileData {
+
+ // nullSeen:
+ // saw a null operand (cast/aastore/instanceof)
+ static final int nullSeenFlag = DataLayout.firstFlag + 0;
+ static final int bitCellCount = 0;
+
+ public BitData(DataLayout layout) {
+ super(layout);
+ }
+
+ static int staticCellCount() {
+ return bitCellCount;
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ // Accessor
+
+ // The nullSeen flag bit is specially known to the interpreter.
+ // Consulting it allows the compiler to avoid setting up nullCheck traps.
+ boolean nullSeen() { return flagAt(nullSeenFlag); }
+
+ // Code generation support
+ // static int nullSeenByteConstant() {
+ // return flagNumberToByteConstant(nullSeenFlag);
+ // }
+
+ static int bitDataSize() {
+ return cellOffset(bitCellCount);
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "BitData");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java
new file mode 100644
index 0000000..a80382f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/BranchData.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// BranchData
+//
+// A BranchData is used to access profiling data for a two-way branch.
+// It consists of taken and notTaken counts as well as a data displacement
+// for the taken case.
+public class BranchData extends JumpData {
+
+ static final int notTakenOffSet = jumpCellCount;
+ static final int branchCellCount = notTakenOffSet + 1;
+
+ public BranchData(DataLayout layout) {
+ super(layout);
+ //assert(layout.tag() == DataLayout.branchDataTag, "wrong type");
+ }
+
+ static int staticCellCount() {
+ return branchCellCount;
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ // Direct accessor
+ int notTaken() {
+ return uintAt(notTakenOffSet);
+ }
+
+ // Code generation support
+ static int notTakenOffset() {
+ return cellOffset(notTakenOffSet);
+ }
+ static int branchDataSize() {
+ return cellOffset(branchCellCount);
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "BranchData");
+ st.println("taken(" + taken() + ") displacement(" + displacement() + ")");
+ tab(st);
+ st.println("not taken(" + notTaken() + ")");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CIntField.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CIntField.java
index 91d2807..1cb99ad 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CIntField.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CIntField.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -41,6 +41,9 @@ public class CIntField extends Field {
public long getValue(Oop obj) {
return obj.getHandle().getCIntegerAt(getOffset(), size, isUnsigned);
}
+ public long getValue(Address addr) {
+ return addr.getCIntegerAt(getOffset(), size, isUnsigned);
+ }
public void setValue(Oop obj, long value) throws MutationException {
// Fix this: set* missing in Address
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java
index 51285d3..5346d49 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstMethod.java
@@ -164,6 +164,18 @@ public class ConstMethod extends Oop {
return (short) ((hi << 8) | lo);
}
+ /** Fetches a 16-bit native ordered value from the
+ bytecode stream */
+ public short getNativeShortArg(int bci) {
+ int hi = getBytecodeOrBPAt(bci);
+ int lo = getBytecodeOrBPAt(bci + 1);
+ if (VM.getVM().isBigEndian()) {
+ return (short) ((hi << 8) | lo);
+ } else {
+ return (short) ((lo << 8) | hi);
+ }
+ }
+
/** Fetches a 32-bit big-endian ("Java ordered") value from the
bytecode stream */
public int getBytecodeIntArg(int bci) {
@@ -175,6 +187,21 @@ public class ConstMethod extends Oop {
return (b4 << 24) | (b3 << 16) | (b2 << 8) | b1;
}
+ /** Fetches a 32-bit native ordered value from the
+ bytecode stream */
+ public int getNativeIntArg(int bci) {
+ int b4 = getBytecodeOrBPAt(bci);
+ int b3 = getBytecodeOrBPAt(bci + 1);
+ int b2 = getBytecodeOrBPAt(bci + 2);
+ int b1 = getBytecodeOrBPAt(bci + 3);
+
+ if (VM.getVM().isBigEndian()) {
+ return (b4 << 24) | (b3 << 16) | (b2 << 8) | b1;
+ } else {
+ return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
+ }
+ }
+
public byte[] getByteCode() {
byte[] bc = new byte[ (int) getCodeSize() ];
for( int i=0; i < bc.length; i++ )
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
index f297e32..5752eae 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPool.java
@@ -212,13 +212,60 @@ public class ConstantPool extends Oop implements ClassConstants {
}
public Symbol getNameRefAt(int which) {
- int nameIndex = getNameAndTypeAt(getNameAndTypeRefIndexAt(which))[0];
- return getSymbolAt(nameIndex);
+ return implGetNameRefAt(which, false);
+ }
+
+ private Symbol implGetNameRefAt(int which, boolean uncached) {
+ int signatureIndex = getNameRefIndexAt(implNameAndTypeRefIndexAt(which, uncached));
+ return getSymbolAt(signatureIndex);
}
public Symbol getSignatureRefAt(int which) {
- int sigIndex = getNameAndTypeAt(getNameAndTypeRefIndexAt(which))[1];
- return getSymbolAt(sigIndex);
+ return implGetSignatureRefAt(which, false);
+ }
+
+ private Symbol implGetSignatureRefAt(int which, boolean uncached) {
+ int signatureIndex = getSignatureRefIndexAt(implNameAndTypeRefIndexAt(which, uncached));
+ return getSymbolAt(signatureIndex);
+ }
+
+
+ private int implNameAndTypeRefIndexAt(int which, boolean uncached) {
+ int i = which;
+ if (!uncached && getCache() != null) {
+ if (ConstantPoolCache.isSecondaryIndex(which)) {
+ // Invokedynamic index.
+ int pool_index = getCache().getMainEntryAt(which).getConstantPoolIndex();
+ pool_index = invokeDynamicNameAndTypeRefIndexAt(pool_index);
+ // assert(tagAt(pool_index).isNameAndType(), "");
+ return pool_index;
+ }
+ // change byte-ordering and go via cache
+ i = remapInstructionOperandFromCache(which);
+ } else {
+ if (getTagAt(which).isInvokeDynamic()) {
+ int pool_index = invokeDynamicNameAndTypeRefIndexAt(which);
+ // assert(tag_at(pool_index).is_name_and_type(), "");
+ return pool_index;
+ }
+ }
+ // assert(tag_at(i).is_field_or_method(), "Corrupted constant pool");
+ // assert(!tag_at(i).is_invoke_dynamic(), "Must be handled above");
+ int ref_index = getIntAt(i);
+ return extractHighShortFromInt(ref_index);
+ }
+
+ private int remapInstructionOperandFromCache(int operand) {
+ int cpc_index = operand;
+ // DEBUG_ONLY(cpc_index -= CPCACHE_INDEX_TAG);
+ // assert((int)(u2)cpc_index == cpc_index, "clean u2");
+ int member_index = getCache().getEntryAt(cpc_index).getConstantPoolIndex();
+ return member_index;
+ }
+
+ int invokeDynamicNameAndTypeRefIndexAt(int which) {
+ // assert(tag_at(which).is_invoke_dynamic(), "Corrupted constant pool");
+ return extractHighShortFromInt(getIntAt(which));
}
// returns null, if not resolved.
@@ -253,15 +300,7 @@ public class ConstantPool extends Oop implements ClassConstants {
}
public int getNameAndTypeRefIndexAt(int index) {
- int refIndex = getFieldOrMethodAt(index);
- if (DEBUG) {
- System.err.println("ConstantPool.getNameAndTypeRefIndexAt(" + index + "): refIndex = " + refIndex);
- }
- int i = extractHighShortFromInt(refIndex);
- if (DEBUG) {
- System.err.println("ConstantPool.getNameAndTypeRefIndexAt(" + index + "): result = " + i);
- }
- return i;
+ return implNameAndTypeRefIndexAt(index, false);
}
/** Lookup for entries consisting of (name_index, signature_index) */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java
index 47a3fac..df14416 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ConstantPoolCache.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -72,9 +72,7 @@ public class ConstantPoolCache extends Oop {
}
public ConstantPoolCacheEntry getEntryAt(int i) {
- if (Assert.ASSERTS_ENABLED) {
- Assert.that(0 <= i && i < getLength(), "index out of bounds");
- }
+ if (i < 0 || i >= getLength()) throw new IndexOutOfBoundsException(i + " " + getLength());
return new ConstantPoolCacheEntry(this, i);
}
@@ -84,21 +82,27 @@ public class ConstantPoolCache extends Oop {
// secondary entries hold invokedynamic call site bindings
public ConstantPoolCacheEntry getSecondaryEntryAt(int i) {
- ConstantPoolCacheEntry e = new ConstantPoolCacheEntry(this, decodeSecondaryIndex(i));
+ int rawIndex = i;
+ if (isSecondaryIndex(i)) {
+ rawIndex = decodeSecondaryIndex(i);
+ }
+ ConstantPoolCacheEntry e = getEntryAt(rawIndex);
if (Assert.ASSERTS_ENABLED) {
- Assert.that(e.isSecondaryEntry(), "must be a secondary entry");
+ Assert.that(e.isSecondaryEntry(), "must be a secondary entry:" + rawIndex);
}
return e;
}
public ConstantPoolCacheEntry getMainEntryAt(int i) {
+ int primaryIndex = i;
if (isSecondaryIndex(i)) {
// run through an extra level of indirection:
- i = getSecondaryEntryAt(i).getMainEntryIndex();
+ int rawIndex = decodeSecondaryIndex(i);
+ primaryIndex = getEntryAt(rawIndex).getMainEntryIndex();
}
- ConstantPoolCacheEntry e = new ConstantPoolCacheEntry(this, i);
+ ConstantPoolCacheEntry e = getEntryAt(primaryIndex);
if (Assert.ASSERTS_ENABLED) {
- Assert.that(!e.isSecondaryEntry(), "must not be a secondary entry");
+ Assert.that(!e.isSecondaryEntry(), "must not be a secondary entry:" + primaryIndex);
}
return e;
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java
new file mode 100644
index 0000000..41b3dd2
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/CounterData.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// CounterData
+//
+// A CounterData corresponds to a simple counter.
+public class CounterData extends BitData {
+
+ static final int countOff = 0;
+ static final int counterCellCount = 1;
+
+ public CounterData(DataLayout layout) {
+ super(layout);
+ }
+
+ static int staticCellCount() {
+ return counterCellCount;
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ // Direct accessor
+ int count() {
+ return uintAt(countOff);
+ }
+
+ // Code generation support
+ static int countOffset() {
+ return cellOffset(countOff);
+ }
+ static int counterDataSize() {
+ return cellOffset(counterCellCount);
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "CounterData");
+ st.println("count(" + count() + ")");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java
new file mode 100644
index 0000000..1a63eae
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/DataLayout.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+public class DataLayout {
+ public static final int noTag = 0;
+ public static final int bitDataTag = 1;
+ public static final int counterDataTag = 2;
+ public static final int jumpDataTag= 3;
+ public static final int receiverTypeDataTag = 4;
+ public static final int virtualCallDataTag = 5;
+ public static final int retDataTag = 6;
+ public static final int branchDataTag = 7;
+ public static final int multiBranchDataTag = 8;
+
+ // The _struct._flags word is formatted as [trapState:4 | flags:4].
+ // The trap state breaks down further as [recompile:1 | reason:3].
+ // This further breakdown is defined in deoptimization.cpp.
+ // See Deoptimization.trapStateReason for an assert that
+ // trapBits is big enough to hold reasons < reasonRecordedLimit.
+ //
+ // The trapState is collected only if ProfileTraps is true.
+ public static final int trapBits = 1+3; // 3: enough to distinguish [0..reasonRecordedLimit].
+ public static final int trapShift = 8 - trapBits;
+ public static final int trapMask = Bits.rightNBits(trapBits);
+ public static final int trapMaskInPlace = (trapMask << trapShift);
+ public static final int flagLimit = trapShift;
+ public static final int flagMask = Bits.rightNBits(flagLimit);
+ public static final int firstFlag = 0;
+
+ private Address data;
+
+ private int offset;
+
+ private boolean handlized;
+
+ public DataLayout(MethodData d, int o) {
+ data = d.getHandle();
+ offset = o;
+ }
+
+ public DataLayout(Address d, int o) {
+ data = d;
+ offset = o;
+ handlized = true;
+ }
+
+ public int dp() { return offset; }
+
+ private int getU11(int at) {
+ return data.getJByteAt(offset + at) & 0xff;
+ }
+
+ private int getU22(int at) {
+ return data.getJShortAt(offset + at) & 0xffff;
+ }
+
+ int cellAt(int index) {
+ // Cells are intptr_t sized but only contain ints as raw values
+ return (int)data.getCIntegerAt(offset + cellOffset(index), MethodData.cellSize, false);
+ }
+
+ Oop oopAt(int index) {
+ OopHandle handle;
+ if (handlized) {
+ throw new InternalError("unsupported");
+ }
+ handle = data.getOopHandleAt(offset + cellOffset(index));
+ return VM.getVM().getObjectHeap().newOop(handle);
+ }
+
+ public Address addressAt(int index) {
+ OopHandle handle;
+ if (handlized) {
+ return data.getAddressAt(offset + cellOffset(index));
+ } else {
+ return data.getOopHandleAt(offset + cellOffset(index));
+ }
+ }
+
+ // Every data layout begins with a header. This header
+ // contains a tag, which is used to indicate the size/layout
+ // of the data, 4 bits of flags, which can be used in any way,
+ // 4 bits of trap history (none/one reason/many reasons),
+ // and a bci, which is used to tie this piece of data to a
+ // specific bci in the bytecodes.
+ // union {
+ // intptrT _bits;
+ // struct {
+ // u1 _tag;
+ // u1 _flags;
+ // u2 _bci;
+ // } _struct;
+ // } _header;
+
+ // Some types of data layouts need a length field.
+ static boolean needsArrayLen(int tag) {
+ return (tag == multiBranchDataTag);
+ }
+
+ public static final int counterIncrement = 1;
+
+ // Size computation
+ static int headerSizeInBytes() {
+ return MethodData.cellSize;
+ }
+ static int headerSizeInCells() {
+ return 1;
+ }
+
+ static int computeSizeInBytes(int cellCount) {
+ return headerSizeInBytes() + cellCount * MethodData.cellSize;
+ }
+
+ // Initialization
+ // void initialize(int tag, int bci, int cellCount);
+
+ // Accessors
+ public int tag() {
+ return getU11(0);
+ }
+
+ // Return a few bits of trap state. Range is [0..trapMask].
+ // The state tells if traps with zero, one, or many reasons have occurred.
+ // It also tells whether zero or many recompilations have occurred.
+ // The associated trap histogram in the MDO itself tells whether
+ // traps are common or not. If a BCI shows that a trap X has
+ // occurred, and the MDO shows N occurrences of X, we make the
+ // simplifying assumption that all N occurrences can be blamed
+ // on that BCI.
+ int trapState() {
+ return (flags() >> trapShift) & trapMask;
+ }
+
+ int flags() {
+ return getU11(1);
+ }
+
+ int bci() {
+ return getU22(2);
+ }
+
+ boolean flagAt(int flagNumber) {
+ // assert(flagNumber < flagLimit, "oob");
+ return (flags() & (0x1 << flagNumber)) != 0;
+ }
+
+ // Low-level support for code generation.
+ static int headerOffset() {
+ return 0;
+ }
+ static int tagOffset() {
+ return 0;
+ }
+ static int flagsOffset() {
+ return 1;
+ }
+ static int bciOffset() {
+ return 2;
+ }
+ public static int cellOffset(int index) {
+ return MethodData.cellSize + index * MethodData.cellSize;
+ }
+ // // Return a value which, when or-ed as a byte into _flags, sets the flag.
+ // static int flagNumberToByteConstant(int flagNumber) {
+ // assert(0 <= flagNumber && flagNumber < flagLimit, "oob");
+ // DataLayout temp; temp.setHeader(0);
+ // temp.setFlagAt(flagNumber);
+ // return temp._header._struct._flags;
+ // }
+ // // Return a value which, when or-ed as a word into _header, sets the flag.
+ // static intptrT flagMaskToHeaderMask(int byteConstant) {
+ // DataLayout temp; temp.setHeader(0);
+ // temp._header._struct._flags = byteConstant;
+ // return temp._header._bits;
+ // }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java
index fc29a39..6c3130c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Field.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -39,28 +39,20 @@ public class Field {
/** Constructor for fields that are named in an InstanceKlass's
fields array (i.e., named, non-VM fields) */
- Field(InstanceKlass holder, int fieldArrayIndex) {
+ Field(InstanceKlass holder, int fieldIndex) {
this.holder = holder;
- this.fieldArrayIndex = fieldArrayIndex;
-
- ConstantPool cp = holder.getConstants();
- TypeArray fields = holder.getFields();
- short access = fields.getShortAt(fieldArrayIndex + InstanceKlass.ACCESS_FLAGS_OFFSET);
- short nameIndex = fields.getShortAt(fieldArrayIndex + InstanceKlass.NAME_INDEX_OFFSET);
- short signatureIndex = fields.getShortAt(fieldArrayIndex + InstanceKlass.SIGNATURE_INDEX_OFFSET);
- offset = VM.getVM().buildIntFromShorts(fields.getShortAt(fieldArrayIndex + InstanceKlass.LOW_OFFSET),
- fields.getShortAt(fieldArrayIndex + InstanceKlass.HIGH_OFFSET));
- short genericSignatureIndex = fields.getShortAt(fieldArrayIndex + InstanceKlass.GENERIC_SIGNATURE_INDEX_OFFSET);
- Symbol name = cp.getSymbolAt(nameIndex);
+ this.fieldIndex = fieldIndex;
+
+ offset = holder.getFieldOffset(fieldIndex);
+ genericSignature = holder.getFieldGenericSignature(fieldIndex);
+
+ Symbol name = holder.getFieldName(fieldIndex);
id = new NamedFieldIdentifier(name.asString());
- signature = cp.getSymbolAt(signatureIndex);
- if (genericSignatureIndex != 0) {
- genericSignature = cp.getSymbolAt(genericSignatureIndex);
- } else {
- genericSignature = null;
- }
+ signature = holder.getFieldSignature(fieldIndex);
fieldType = new FieldType(signature);
+
+ short access = holder.getFieldAccessFlags(fieldIndex);
accessFlags = new AccessFlags(access);
}
@@ -73,7 +65,7 @@ public class Field {
private Symbol signature;
private Symbol genericSignature;
private AccessFlags accessFlags;
- private int fieldArrayIndex;
+ private int fieldIndex;
/** Returns the byte offset of the field within the object or klass */
public long getOffset() { return offset; }
@@ -101,8 +93,8 @@ public class Field {
/** (Named, non-VM fields only) Returns the index in the fields
TypeArray for this field. Equivalent to the "index" in the VM's
fieldDescriptors. */
- public int getFieldArrayIndex() {
- return fieldArrayIndex;
+ public int getFieldIndex() {
+ return fieldIndex;
}
/** (Named, non-VM fields only) Retrieves the access flags. */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java
index 2f340b0..b7a3766 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/FieldType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -67,6 +67,8 @@ public class FieldType {
public boolean isObject() { return first == 'L'; }
public boolean isArray() { return first == '['; }
+ public Symbol getSignature() { return signature; }
+
public static class ArrayInfo {
private int dimension;
private int elementBasicType; // See BasicType.java
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java
index 30f3497..f25493d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/GenerateOopMap.java
@@ -569,10 +569,10 @@ public class GenerateOopMap {
case Bytecodes._invokedynamic:
// FIXME: print signature of referenced method (need more
// accessors in ConstantPool and ConstantPoolCache)
- int idx = currentBC.getIndexBig();
+ int idx = currentBC.hasIndexU4() ? currentBC.getIndexU4() : currentBC.getIndexU2();
tty.print(" idx " + idx);
/*
- int idx = currentBC.getIndexBig();
+ int idx = currentBC.getIndexU2();
ConstantPool cp = method().getConstants();
int nameAndTypeIdx = cp.name_and_type_ref_index_at(idx);
int signatureIdx = cp.signature_ref_index_at(nameAndTypeIdx);
@@ -609,10 +609,10 @@ public class GenerateOopMap {
case Bytecodes._invokedynamic:
// FIXME: print signature of referenced method (need more
// accessors in ConstantPool and ConstantPoolCache)
- int idx = currentBC.getIndexBig();
+ int idx = currentBC.hasIndexU4() ? currentBC.getIndexU4() : currentBC.getIndexU2();
tty.print(" idx " + idx);
/*
- int idx = currentBC.getIndexBig();
+ int idx = currentBC.getIndexU2();
constantPoolOop cp = method().constants();
int nameAndTypeIdx = cp.name_and_type_ref_index_at(idx);
int signatureIdx = cp.signature_ref_index_at(nameAndTypeIdx);
@@ -1118,7 +1118,8 @@ public class GenerateOopMap {
current instruction, starting in the current state. */
void interp1 (BytecodeStream itr) {
if (DEBUG) {
- System.err.println(" - bci " + itr.bci());
+ System.err.println(" - bci " + itr.bci() + " " + itr.code());
+ printCurrentState(System.err, itr, false);
}
// if (TraceNewOopMapGeneration) {
@@ -1179,8 +1180,8 @@ public class GenerateOopMap {
case Bytecodes._ldc2_w: ppush(vvCTS); break;
- case Bytecodes._ldc: doLdc(itr.getIndex(), itr.bci()); break;
- case Bytecodes._ldc_w: doLdc(itr.getIndexBig(), itr.bci());break;
+ case Bytecodes._ldc: doLdc(itr.bci()); break;
+ case Bytecodes._ldc_w: doLdc(itr.bci()); break;
case Bytecodes._iload:
case Bytecodes._fload: ppload(vCTS, itr.getIndex()); break;
@@ -1372,18 +1373,16 @@ public class GenerateOopMap {
case Bytecodes._jsr: doJsr(itr.dest()); break;
case Bytecodes._jsr_w: doJsr(itr.dest_w()); break;
- case Bytecodes._getstatic: doField(true, true,
- itr.getIndexBig(),
- itr.bci()); break;
- case Bytecodes._putstatic: doField(false, true, itr.getIndexBig(), itr.bci()); break;
- case Bytecodes._getfield: doField(true, false, itr.getIndexBig(), itr.bci()); break;
- case Bytecodes._putfield: doField(false, false, itr.getIndexBig(), itr.bci()); break;
+ case Bytecodes._getstatic: doField(true, true, itr.getIndexU2Cpcache(), itr.bci()); break;
+ case Bytecodes._putstatic: doField(false, true, itr.getIndexU2Cpcache(), itr.bci()); break;
+ case Bytecodes._getfield: doField(true, false, itr.getIndexU2Cpcache(), itr.bci()); break;
+ case Bytecodes._putfield: doField(false, false, itr.getIndexU2Cpcache(), itr.bci()); break;
case Bytecodes._invokevirtual:
- case Bytecodes._invokespecial: doMethod(false, false, itr.getIndexBig(), itr.bci()); break;
- case Bytecodes._invokestatic: doMethod(true, false, itr.getIndexBig(), itr.bci()); break;
- case Bytecodes._invokedynamic: doMethod(false, true, itr.getIndexBig(), itr.bci()); break;
- case Bytecodes._invokeinterface: doMethod(false, true, itr.getIndexBig(), itr.bci()); break;
+ case Bytecodes._invokespecial: doMethod(false, false, itr.getIndexU2Cpcache(), itr.bci()); break;
+ case Bytecodes._invokestatic: doMethod(true, false, itr.getIndexU2Cpcache(), itr.bci()); break;
+ case Bytecodes._invokedynamic: doMethod(true, false, itr.getIndexU4(), itr.bci()); break;
+ case Bytecodes._invokeinterface: doMethod(false, true, itr.getIndexU2Cpcache(), itr.bci()); break;
case Bytecodes._newarray:
case Bytecodes._anewarray: ppNewRef(vCTS, itr.bci()); break;
case Bytecodes._checkcast: doCheckcast(); break;
@@ -1665,13 +1664,11 @@ public class GenerateOopMap {
}
}
- void doLdc (int idx, int bci) {
+ void doLdc (int bci) {
+ BytecodeLoadConstant ldc = BytecodeLoadConstant.at(_method, bci);
ConstantPool cp = method().getConstants();
- ConstantTag tag = cp.getTagAt(idx);
- CellTypeState cts = (tag.isString() || tag.isUnresolvedString() ||
- tag.isKlass() || tag.isUnresolvedKlass())
- ? CellTypeState.makeLineRef(bci)
- : valCTS;
+ BasicType bt = ldc.resultType();
+ CellTypeState cts = (bt == BasicType.T_OBJECT) ? CellTypeState.makeLineRef(bci) : valCTS;
ppush1(cts);
}
@@ -1729,15 +1726,7 @@ public class GenerateOopMap {
void doMethod (boolean is_static, boolean is_interface, int idx, int bci) {
// Dig up signature for field in constant pool
ConstantPool cp = _method.getConstants();
- int nameAndTypeIdx = cp.getTagAt(idx).isNameAndType() ? idx : cp.getNameAndTypeRefIndexAt(idx);
- int signatureIdx = cp.getSignatureRefIndexAt(nameAndTypeIdx);
- Symbol signature = cp.getSymbolAt(signatureIdx);
-
- if (DEBUG) {
- System.err.println("doMethod: signature = " + signature.asString() + ", idx = " + idx +
- ", nameAndTypeIdx = " + nameAndTypeIdx + ", signatureIdx = " + signatureIdx +
- ", bci = " + bci);
- }
+ Symbol signature = cp.getSignatureRefAt(idx);
// Parse method signature
CellTypeStateList out = new CellTypeStateList(4);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
index b1d6741..87de970 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java
@@ -44,14 +44,14 @@ public class InstanceKlass extends Klass {
}
// field offset constants
- public static int ACCESS_FLAGS_OFFSET;
- public static int NAME_INDEX_OFFSET;
- public static int SIGNATURE_INDEX_OFFSET;
- public static int INITVAL_INDEX_OFFSET;
- public static int LOW_OFFSET;
- public static int HIGH_OFFSET;
- public static int GENERIC_SIGNATURE_INDEX_OFFSET;
- public static int NEXT_OFFSET;
+ private static int ACCESS_FLAGS_OFFSET;
+ private static int NAME_INDEX_OFFSET;
+ private static int SIGNATURE_INDEX_OFFSET;
+ private static int INITVAL_INDEX_OFFSET;
+ private static int LOW_OFFSET;
+ private static int HIGH_OFFSET;
+ private static int GENERIC_SIGNATURE_INDEX_OFFSET;
+ private static int FIELD_SLOTS;
public static int IMPLEMENTORS_LIMIT;
// ClassState constants
@@ -78,6 +78,7 @@ public class InstanceKlass extends Klass {
implementors[i] = new OopField(type.getOopField("_implementors[0]"), arrayOffset);
}
fields = new OopField(type.getOopField("_fields"), Oop.getHeaderSize());
+ javaFieldsCount = new CIntField(type.getCIntegerField("_java_fields_count"), Oop.getHeaderSize());
constants = new OopField(type.getOopField("_constants"), Oop.getHeaderSize());
classLoader = new OopField(type.getOopField("_class_loader"), Oop.getHeaderSize());
protectionDomain = new OopField(type.getOopField("_protection_domain"), Oop.getHeaderSize());
@@ -100,14 +101,14 @@ public class InstanceKlass extends Klass {
headerSize = alignObjectOffset(Oop.getHeaderSize() + type.getSize());
// read field offset constants
- ACCESS_FLAGS_OFFSET = db.lookupIntConstant("instanceKlass::access_flags_offset").intValue();
- NAME_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::name_index_offset").intValue();
- SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::signature_index_offset").intValue();
- INITVAL_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::initval_index_offset").intValue();
- LOW_OFFSET = db.lookupIntConstant("instanceKlass::low_offset").intValue();
- HIGH_OFFSET = db.lookupIntConstant("instanceKlass::high_offset").intValue();
- GENERIC_SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("instanceKlass::generic_signature_offset").intValue();
- NEXT_OFFSET = db.lookupIntConstant("instanceKlass::next_offset").intValue();
+ ACCESS_FLAGS_OFFSET = db.lookupIntConstant("FieldInfo::access_flags_offset").intValue();
+ NAME_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::name_index_offset").intValue();
+ SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::signature_index_offset").intValue();
+ INITVAL_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::initval_index_offset").intValue();
+ LOW_OFFSET = db.lookupIntConstant("FieldInfo::low_offset").intValue();
+ HIGH_OFFSET = db.lookupIntConstant("FieldInfo::high_offset").intValue();
+ GENERIC_SIGNATURE_INDEX_OFFSET = db.lookupIntConstant("FieldInfo::generic_signature_offset").intValue();
+ FIELD_SLOTS = db.lookupIntConstant("FieldInfo::field_slots").intValue();
// read ClassState constants
CLASS_STATE_UNPARSABLE_BY_GC = db.lookupIntConstant("instanceKlass::unparsable_by_gc").intValue();
CLASS_STATE_ALLOCATED = db.lookupIntConstant("instanceKlass::allocated").intValue();
@@ -121,6 +122,13 @@ public class InstanceKlass extends Klass {
InstanceKlass(OopHandle handle, ObjectHeap heap) {
super(handle, heap);
+ if (getJavaFieldsCount() != getAllFieldsCount()) {
+ // Exercise the injected field logic
+ for (int i = getJavaFieldsCount(); i < getAllFieldsCount(); i++) {
+ getFieldName(i);
+ getFieldSignature(i);
+ }
+ }
}
private static OopField arrayKlasses;
@@ -131,6 +139,7 @@ public class InstanceKlass extends Klass {
private static CIntField nofImplementors;
private static OopField[] implementors;
private static OopField fields;
+ private static CIntField javaFieldsCount;
private static OopField constants;
private static OopField classLoader;
private static OopField protectionDomain;
@@ -172,7 +181,7 @@ public class InstanceKlass extends Klass {
private String value;
}
- private int getInitStateAsInt() { return (int) initState.getValue(this); }
+ public int getInitStateAsInt() { return (int) initState.getValue(this); }
public ClassState getInitState() {
int state = getInitStateAsInt();
if (state == CLASS_STATE_UNPARSABLE_BY_GC) {
@@ -247,6 +256,61 @@ public class InstanceKlass extends Klass {
public static long getHeaderSize() { return headerSize; }
+ public short getFieldAccessFlags(int index) {
+ return getFields().getShortAt(index * FIELD_SLOTS + ACCESS_FLAGS_OFFSET);
+ }
+
+ public short getFieldNameIndex(int index) {
+ if (index >= getJavaFieldsCount()) throw new IndexOutOfBoundsException("not a Java field;");
+ return getFields().getShortAt(index * FIELD_SLOTS + NAME_INDEX_OFFSET);
+ }
+
+ public Symbol getFieldName(int index) {
+ int nameIndex = getFields().getShortAt(index * FIELD_SLOTS + NAME_INDEX_OFFSET);
+ if (index < getJavaFieldsCount()) {
+ return getConstants().getSymbolAt(nameIndex);
+ } else {
+ return vmSymbols.symbolAt(nameIndex);
+ }
+ }
+
+ public short getFieldSignatureIndex(int index) {
+ if (index >= getJavaFieldsCount()) throw new IndexOutOfBoundsException("not a Java field;");
+ return getFields().getShortAt(index * FIELD_SLOTS + SIGNATURE_INDEX_OFFSET);
+ }
+
+ public Symbol getFieldSignature(int index) {
+ int signatureIndex = getFields().getShortAt(index * FIELD_SLOTS + SIGNATURE_INDEX_OFFSET);
+ if (index < getJavaFieldsCount()) {
+ return getConstants().getSymbolAt(signatureIndex);
+ } else {
+ return vmSymbols.symbolAt(signatureIndex);
+ }
+ }
+
+ public short getFieldGenericSignatureIndex(int index) {
+ return getFields().getShortAt(index * FIELD_SLOTS + GENERIC_SIGNATURE_INDEX_OFFSET);
+ }
+
+ public Symbol getFieldGenericSignature(int index) {
+ short genericSignatureIndex = getFieldGenericSignatureIndex(index);
+ if (genericSignatureIndex != 0) {
+ return getConstants().getSymbolAt(genericSignatureIndex);
+ }
+ return null;
+ }
+
+ public short getFieldInitialValueIndex(int index) {
+ if (index >= getJavaFieldsCount()) throw new IndexOutOfBoundsException("not a Java field;");
+ return getFields().getShortAt(index * FIELD_SLOTS + INITVAL_INDEX_OFFSET);
+ }
+
+ public int getFieldOffset(int index) {
+ TypeArray fields = getFields();
+ return VM.getVM().buildIntFromShorts(fields.getShortAt(index * FIELD_SLOTS + LOW_OFFSET),
+ fields.getShortAt(index * FIELD_SLOTS + HIGH_OFFSET));
+ }
+
// Accessors for declared fields
public Klass getArrayKlasses() { return (Klass) arrayKlasses.getValue(this); }
public ObjArray getMethods() { return (ObjArray) methods.getValue(this); }
@@ -257,6 +321,8 @@ public class InstanceKlass extends Klass {
public Klass getImplementor() { return (Klass) implementors[0].getValue(this); }
public Klass getImplementor(int i) { return (Klass) implementors[i].getValue(this); }
public TypeArray getFields() { return (TypeArray) fields.getValue(this); }
+ public int getJavaFieldsCount() { return (int) javaFieldsCount.getValue(this); }
+ public int getAllFieldsCount() { return (int)getFields().getLength() / FIELD_SLOTS; }
public ConstantPool getConstants() { return (ConstantPool) constants.getValue(this); }
public Oop getClassLoader() { return classLoader.getValue(this); }
public Oop getProtectionDomain() { return protectionDomain.getValue(this); }
@@ -479,12 +545,10 @@ public class InstanceKlass extends Klass {
}
void iterateStaticFieldsInternal(OopVisitor visitor) {
- TypeArray fields = getFields();
- int length = (int) fields.getLength();
- for (int index = 0; index < length; index += NEXT_OFFSET) {
- short accessFlags = fields.getShortAt(index + ACCESS_FLAGS_OFFSET);
- short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET);
- FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex));
+ int length = getJavaFieldsCount();
+ for (int index = 0; index < length; index++) {
+ short accessFlags = getFieldAccessFlags(index);
+ FieldType type = new FieldType(getFieldSignature(index));
AccessFlags access = new AccessFlags(accessFlags);
if (access.isStatic()) {
visitField(visitor, type, index);
@@ -496,18 +560,24 @@ public class InstanceKlass extends Klass {
return getSuper();
}
+ public static class StaticField {
+ public AccessFlags flags;
+ public Field field;
+
+ StaticField(Field field, AccessFlags flags) {
+ this.field = field;
+ this.flags = flags;
+ }
+ }
+
public void iterateNonStaticFields(OopVisitor visitor, Oop obj) {
if (getSuper() != null) {
((InstanceKlass) getSuper()).iterateNonStaticFields(visitor, obj);
}
- TypeArray fields = getFields();
-
- int length = (int) fields.getLength();
- for (int index = 0; index < length; index += NEXT_OFFSET) {
- short accessFlags = fields.getShortAt(index + ACCESS_FLAGS_OFFSET);
- short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET);
-
- FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex));
+ int length = getJavaFieldsCount();
+ for (int index = 0; index < length; index++) {
+ short accessFlags = getFieldAccessFlags(index);
+ FieldType type = new FieldType(getFieldSignature(index));
AccessFlags access = new AccessFlags(accessFlags);
if (!access.isStatic()) {
visitField(visitor, type, index);
@@ -517,14 +587,10 @@ public class InstanceKlass extends Klass {
/** Field access by name. */
public Field findLocalField(Symbol name, Symbol sig) {
- TypeArray fields = getFields();
- int n = (int) fields.getLength();
- ConstantPool cp = getConstants();
- for (int i = 0; i < n; i += NEXT_OFFSET) {
- int nameIndex = fields.getShortAt(i + NAME_INDEX_OFFSET);
- int sigIndex = fields.getShortAt(i + SIGNATURE_INDEX_OFFSET);
- Symbol f_name = cp.getSymbolAt(nameIndex);
- Symbol f_sig = cp.getSymbolAt(sigIndex);
+ int length = getJavaFieldsCount();
+ for (int i = 0; i < length; i++) {
+ Symbol f_name = getFieldName(i);
+ Symbol f_sig = getFieldSignature(i);
if (name.equals(f_name) && sig.equals(f_sig)) {
return newField(i);
}
@@ -599,8 +665,8 @@ public class InstanceKlass extends Klass {
/** Get field by its index in the fields array. Only designed for
use in a debugging system. */
- public Field getFieldByIndex(int fieldArrayIndex) {
- return newField(fieldArrayIndex);
+ public Field getFieldByIndex(int fieldIndex) {
+ return newField(fieldIndex);
}
@@ -611,11 +677,9 @@ public class InstanceKlass extends Klass {
public List getImmediateFields() {
// A list of Fields for each field declared in this class/interface,
// not including inherited fields.
- TypeArray fields = getFields();
-
- int length = (int) fields.getLength();
- List immediateFields = new ArrayList(length / NEXT_OFFSET);
- for (int index = 0; index < length; index += NEXT_OFFSET) {
+ int length = getJavaFieldsCount();
+ List immediateFields = new ArrayList(length);
+ for (int index = 0; index < length; index++) {
immediateFields.add(getFieldByIndex(index));
}
@@ -802,9 +866,7 @@ public class InstanceKlass extends Klass {
// Creates new field from index in fields TypeArray
private Field newField(int index) {
- TypeArray fields = getFields();
- short signatureIndex = fields.getShortAt(index + SIGNATURE_INDEX_OFFSET);
- FieldType type = new FieldType(getConstants().getSymbolAt(signatureIndex));
+ FieldType type = new FieldType(getFieldSignature(index));
if (type.isOop()) {
if (VM.getVM().isCompressedOopsEnabled()) {
return new NarrowOopField(this, index);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java
new file mode 100644
index 0000000..b7921c5
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/JumpData.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// JumpData
+//
+// A JumpData is used to access profiling information for a direct
+// branch. It is a counter, used for counting the number of branches,
+// plus a data displacement, used for realigning the data pointer to
+// the corresponding target bci.
+public class JumpData extends ProfileData {
+ static final int takenOffSet = 0;
+ static final int displacementOffSet = 1;
+ static final int jumpCellCount = 2;
+
+ public JumpData(DataLayout layout) {
+ super(layout);
+ //assert(layout.tag() == DataLayout.jumpDataTag ||
+ // layout.tag() == DataLayout.branchDataTag, "wrong type");
+ }
+
+ static int staticCellCount() {
+ return jumpCellCount;
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ // Direct accessor
+ int taken() {
+ return uintAt(takenOffSet);
+ }
+
+ int displacement() {
+ return intAt(displacementOffSet);
+ }
+
+ // Code generation support
+ static int takenOffset() {
+ return cellOffset(takenOffSet);
+ }
+
+ static int displacementOffset() {
+ return cellOffset(displacementOffSet);
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "JumpData");
+ st.println("taken(" + taken() + ") displacement(" + displacement() + ")");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java
index 3a40619..d42115b 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/Method.java
@@ -49,6 +49,7 @@ public class Method extends Oop {
Type type = db.lookupType("methodOopDesc");
constMethod = new OopField(type.getOopField("_constMethod"), 0);
constants = new OopField(type.getOopField("_constants"), 0);
+ methodData = new OopField(type.getOopField("_method_data"), 0);
methodSize = new CIntField(type.getCIntegerField("_method_size"), 0);
maxStack = new CIntField(type.getCIntegerField("_max_stack"), 0);
maxLocals = new CIntField(type.getCIntegerField("_max_locals"), 0);
@@ -58,9 +59,13 @@ public class Method extends Oop {
vtableIndex = new CIntField(type.getCIntegerField("_vtable_index"), 0);
if (!VM.getVM().isCore()) {
invocationCounter = new CIntField(type.getCIntegerField("_invocation_counter"), 0);
+ backedgeCounter = new CIntField(type.getCIntegerField("_backedge_counter"), 0);
}
bytecodeOffset = type.getSize();
+ interpreterThrowoutCountField = new CIntField(type.getCIntegerField("_interpreter_throwout_count"), 0);
+ interpreterInvocationCountField = new CIntField(type.getCIntegerField("_interpreter_invocation_count"), 0);
+
/*
interpreterEntry = type.getAddressField("_interpreter_entry");
fromCompiledCodeEntryPoint = type.getAddressField("_from_compiled_code_entry_point");
@@ -79,6 +84,7 @@ public class Method extends Oop {
// Fields
private static OopField constMethod;
private static OopField constants;
+ private static OopField methodData;
private static CIntField methodSize;
private static CIntField maxStack;
private static CIntField maxLocals;
@@ -86,10 +92,14 @@ public class Method extends Oop {
private static CIntField accessFlags;
private static CIntField vtableIndex;
private static CIntField invocationCounter;
+ private static CIntField backedgeCounter;
private static long bytecodeOffset;
private static AddressField code;
+ private static CIntField interpreterThrowoutCountField;
+ private static CIntField interpreterInvocationCountField;
+
// constant method names - <init>, <clinit>
// Initialized lazily to avoid initialization ordering dependencies between Method and SymbolTable
private static Symbol objectInitializerName;
@@ -116,6 +126,7 @@ public class Method extends Oop {
// Accessors for declared fields
public ConstMethod getConstMethod() { return (ConstMethod) constMethod.getValue(this); }
public ConstantPool getConstants() { return (ConstantPool) constants.getValue(this); }
+ public MethodData getMethodData() { return (MethodData) methodData.getValue(this); }
public TypeArray getExceptionTable() { return getConstMethod().getExceptionTable(); }
/** WARNING: this is in words, not useful in this system; use getObjectSize() instead */
public long getMethodSize() { return methodSize.getValue(this); }
@@ -134,6 +145,12 @@ public class Method extends Oop {
}
return invocationCounter.getValue(this);
}
+ public long getBackedgeCounter() {
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(!VM.getVM().isCore(), "must not be used in core build");
+ }
+ return backedgeCounter.getValue(this);
+ }
// get associated compiled native method, if available, else return null.
public NMethod getNativeMethod() {
@@ -180,12 +197,24 @@ public class Method extends Oop {
return getConstMethod().getBytecodeShortArg(bci);
}
+ /** Fetches a 16-bit native ordered value from the
+ bytecode stream */
+ public short getNativeShortArg(int bci) {
+ return getConstMethod().getNativeShortArg(bci);
+ }
+
/** Fetches a 32-bit big-endian ("Java ordered") value from the
bytecode stream */
public int getBytecodeIntArg(int bci) {
return getConstMethod().getBytecodeIntArg(bci);
}
+ /** Fetches a 32-bit native ordered value from the
+ bytecode stream */
+ public int getNativeIntArg(int bci) {
+ return getConstMethod().getNativeIntArg(bci);
+ }
+
public byte[] getByteCode() {
return getConstMethod().getByteCode();
}
@@ -321,4 +350,11 @@ public class Method extends Oop {
buf.append(")");
return buf.toString().replace('/', '.');
}
+ public int interpreterThrowoutCount() {
+ return (int) interpreterThrowoutCountField.getValue(getHandle());
+ }
+
+ public int interpreterInvocationCount() {
+ return (int) interpreterInvocationCountField.getValue(getHandle());
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java
index 53dad60..83c36b6 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MethodData.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -34,6 +34,92 @@ import sun.jvm.hotspot.utilities.*;
// A MethodData provides interpreter profiling information
public class MethodData extends Oop {
+ static int TypeProfileWidth = 2;
+ static int BciProfileWidth = 2;
+ static int CompileThreshold;
+
+ static int Reason_many; // indicates presence of several reasons
+ static int Reason_none; // indicates absence of a relevant deopt.
+ static int Reason_LIMIT;
+ static int Reason_RECORDED_LIMIT; // some are not recorded per bc
+
+ private static String[] trapReasonName;
+
+ static String trapReasonName(int reason) {
+ if (reason == Reason_many) return "many";
+ if (reason < Reason_LIMIT)
+ return trapReasonName[reason];
+ return "reason" + reason;
+ }
+
+
+ static int trapStateReason(int trapState) {
+ // This assert provides the link between the width of DataLayout.trapBits
+ // and the encoding of "recorded" reasons. It ensures there are enough
+ // bits to store all needed reasons in the per-BCI MDO profile.
+ // assert(dsReasonMask >= reasonRecordedLimit, "enough bits");
+ int recompileBit = (trapState & dsRecompileBit);
+ trapState -= recompileBit;
+ if (trapState == dsReasonMask) {
+ return Reason_many;
+ } else {
+ // assert((int)reasonNone == 0, "state=0 => Reason_none");
+ return trapState;
+ }
+ }
+
+
+ static final int dsReasonMask = DataLayout.trapMask >> 1;
+ static final int dsRecompileBit = DataLayout.trapMask - dsReasonMask;
+
+ static boolean trapStateIsRecompiled(int trapState) {
+ return (trapState & dsRecompileBit) != 0;
+ }
+
+ static boolean reasonIsRecordedPerBytecode(int reason) {
+ return reason > Reason_none && reason < Reason_RECORDED_LIMIT;
+ }
+ static int trapStateAddReason(int trapState, int reason) {
+ // assert(reasonIsRecordedPerBytecode((DeoptReason)reason) || reason == reasonMany, "valid reason");
+ int recompileBit = (trapState & dsRecompileBit);
+ trapState -= recompileBit;
+ if (trapState == dsReasonMask) {
+ return trapState + recompileBit; // already at state lattice bottom
+ } else if (trapState == reason) {
+ return trapState + recompileBit; // the condition is already true
+ } else if (trapState == 0) {
+ return reason + recompileBit; // no condition has yet been true
+ } else {
+ return dsReasonMask + recompileBit; // fall to state lattice bottom
+ }
+ }
+ static int trapStateSetRecompiled(int trapState, boolean z) {
+ if (z) return trapState | dsRecompileBit;
+ else return trapState & ~dsRecompileBit;
+ }
+
+ static String formatTrapState(int trapState) {
+ int reason = trapStateReason(trapState);
+ boolean recompFlag = trapStateIsRecompiled(trapState);
+ // Re-encode the state from its decoded components.
+ int decodedState = 0;
+ if (reasonIsRecordedPerBytecode(reason) || reason == Reason_many)
+ decodedState = trapStateAddReason(decodedState, reason);
+ if (recompFlag)
+ decodedState = trapStateSetRecompiled(decodedState, recompFlag);
+ // If the state re-encodes properly, format it symbolically.
+ // Because this routine is used for debugging and diagnostics,
+ // be robust even if the state is a strange value.
+ if (decodedState != trapState) {
+ // Random buggy state that doesn't decode??
+ return "#" + trapState;
+ } else {
+ return trapReasonName(reason) + (recompFlag ? " recompiled" : "");
+ }
+ }
+
+
+
static {
VM.registerVMInitializedObserver(new Observer() {
public void update(Observable o, Object data) {
@@ -48,7 +134,58 @@ public class MethodData extends Oop {
size = new CIntField(type.getCIntegerField("_size"), 0);
method = new OopField(type.getOopField("_method"), 0);
- // FIXME: add more fields and accessors
+
+ VM.Flag[] flags = VM.getVM().getCommandLineFlags();
+ for (int f = 0; f < flags.length; f++) {
+ VM.Flag flag = flags[f];
+ if (flag.getName().equals("TypeProfileWidth")) {
+ TypeProfileWidth = (int)flag.getIntx();
+ } else if (flag.getName().equals("BciProfileWidth")) {
+ BciProfileWidth = (int)flag.getIntx();
+ } else if (flag.getName().equals("CompileThreshold")) {
+ CompileThreshold = (int)flag.getIntx();
+ }
+ }
+
+ cellSize = (int)VM.getVM().getAddressSize();
+
+ dataSize = new CIntField(type.getCIntegerField("_data_size"), 0);
+ data = type.getAddressField("_data[0]");
+
+ sizeofMethodDataOopDesc = (int)type.getSize();;
+
+ Reason_many = db.lookupIntConstant("Deoptimization::Reason_many").intValue();
+ Reason_none = db.lookupIntConstant("Deoptimization::Reason_none").intValue();
+ Reason_LIMIT = db.lookupIntConstant("Deoptimization::Reason_LIMIT").intValue();
+ Reason_RECORDED_LIMIT = db.lookupIntConstant("Deoptimization::Reason_RECORDED_LIMIT").intValue();
+
+ trapReasonName = new String[Reason_LIMIT];
+
+ // Find Deopt reasons
+ Iterator i = db.getIntConstants();
+ String prefix = "Deoptimization::Reason_";
+ while (i.hasNext()) {
+ String name = (String)i.next();
+ if (name.startsWith(prefix)) {
+ // Strip prefix
+ if (!name.endsWith("Reason_many") &&
+ !name.endsWith("Reason_LIMIT") &&
+ !name.endsWith("Reason_RECORDED_LIMIT")) {
+ String trimmed = name.substring(prefix.length());
+ int value = db.lookupIntConstant(name).intValue();
+ if (trapReasonName[value] != null) {
+ throw new InternalError("duplicate reasons: " + trapReasonName[value] + " " + trimmed);
+ }
+ trapReasonName[value] = trimmed;
+ }
+ }
+ }
+ for (int index = 0; index < trapReasonName.length; index++) {
+ if (trapReasonName[index] == null) {
+ throw new InternalError("missing reason for " + index);
+ }
+ System.out.println(trapReasonName[index]);
+ }
}
MethodData(OopHandle handle, ObjectHeap heap) {
@@ -60,6 +197,11 @@ public class MethodData extends Oop {
private static long baseOffset;
private static CIntField size;
private static OopField method;
+ private static CIntField dataSize;
+ private static AddressField data;
+
+ public static int sizeofMethodDataOopDesc;
+ public static int cellSize;
public long getObjectSize() {
return alignObjectSize(size.getValue(this));
@@ -81,4 +223,119 @@ public class MethodData extends Oop {
visitor.doCInt(size, true);
}
}
+
+ int dataSize() {
+ if (dataSize == null) {
+ return 0;
+ } else {
+ return (int)dataSize.getValue(this);
+ }
+ }
+
+ boolean outOfBounds(int dataIndex) {
+ return dataIndex >= dataSize();
+ }
+
+ ProfileData dataAt(int dataIndex) {
+ if (outOfBounds(dataIndex)) {
+ return null;
+ }
+ DataLayout dataLayout = new DataLayout(this, dataIndex + (int)data.getOffset());
+
+ switch (dataLayout.tag()) {
+ case DataLayout.noTag:
+ default:
+ throw new InternalError(dataIndex + " " + dataSize() + " " + dataLayout.tag());
+ case DataLayout.bitDataTag:
+ return new BitData(dataLayout);
+ case DataLayout.counterDataTag:
+ return new CounterData(dataLayout);
+ case DataLayout.jumpDataTag:
+ return new JumpData(dataLayout);
+ case DataLayout.receiverTypeDataTag:
+ return new ReceiverTypeData(dataLayout);
+ case DataLayout.virtualCallDataTag:
+ return new VirtualCallData(dataLayout);
+ case DataLayout.retDataTag:
+ return new RetData(dataLayout);
+ case DataLayout.branchDataTag:
+ return new BranchData(dataLayout);
+ case DataLayout.multiBranchDataTag:
+ return new MultiBranchData(dataLayout);
+ }
+ }
+
+ int dpToDi(int dp) {
+ // this in an offset from the base of the MDO, so convert to offset into _data
+ return dp - (int)data.getOffset();
+ }
+
+ int firstDi() { return 0; }
+ public ProfileData firstData() { return dataAt(firstDi()); }
+ public ProfileData nextData(ProfileData current) {
+ int currentIndex = dpToDi(current.dp());
+ int nextIndex = currentIndex + current.sizeInBytes();
+ return dataAt(nextIndex);
+ }
+ boolean isValid(ProfileData current) { return current != null; }
+
+ public void printDataOn(PrintStream st) {
+ ProfileData data = firstData();
+ for ( ; isValid(data); data = nextData(data)) {
+ st.print(dpToDi(data.dp()));
+ st.print(" ");
+ // st->fillTo(6);
+ data.printDataOn(st);
+ }
+ }
+
+ private byte[] fetchDataAt(Address base, long offset, long size) {
+ byte[] result = new byte[(int)size];
+ for (int i = 0; i < size; i++) {
+ result[i] = base.getJByteAt(offset + i);
+ }
+ return result;
+ }
+
+ public byte[] orig() {
+ // fetch the orig methodDataOopDesc data between header and dataSize
+ return fetchDataAt(this.getHandle(), 0, sizeofMethodDataOopDesc);
+ }
+
+ public long[] data() {
+ // Read the data as an array of intptr_t elements
+ OopHandle base = getHandle();
+ long offset = data.getOffset();
+ int elements = dataSize() / cellSize;
+ long[] result = new long[elements];
+ for (int i = 0; i < elements; i++) {
+ Address value = base.getAddressAt(offset + i * MethodData.cellSize);
+ if (value != null) {
+ result[i] = value.minus(null);
+ }
+ }
+ return result;
+ }
+
+ // Get a measure of how much mileage the method has on it.
+ int mileageOf(Method method) {
+ long mileage = 0;
+ int iic = method.interpreterInvocationCount();
+ if (mileage < iic) mileage = iic;
+
+ long ic = method.getInvocationCounter();
+ long bc = method.getBackedgeCounter();
+
+ long icval = ic >> 3;
+ if ((ic & 4) != 0) icval += CompileThreshold;
+ if (mileage < icval) mileage = icval;
+ long bcval = bc >> 3;
+ if ((bc & 4) != 0) bcval += CompileThreshold;
+ if (mileage < bcval) mileage = bcval;
+ return (int)mileage;
+ }
+
+ public int currentMileage() {
+ return 20000;
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java
new file mode 100644
index 0000000..565d493
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/MultiBranchData.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// MultiBranchData
+//
+// A MultiBranchData is used to access profiling information for
+// a multi-way branch (*switch bytecodes). It consists of a series
+// of (count, displacement) pairs, which count the number of times each
+// case was taken and specify the data displacment for each branch target.
+public class MultiBranchData extends ArrayData {
+ static final int defaultCountOffSet = 0;
+ static final int defaultDisaplacementOffSet = 1;
+ static final int caseArrayStart = 2;
+ static final int relativeCountOffSet = 0;
+ static final int relativeDisplacementOffSet = 1;
+ static final int perCaseCellCount = 2;
+
+ public MultiBranchData(DataLayout layout) {
+ super(layout);
+ //assert(layout.tag() == DataLayout.multiBranchDataTag, "wrong type");
+ }
+
+ // static int computeCellCount(BytecodeStream stream);
+
+ int numberOfCases() {
+ int alen = arrayLen() - 2; // get rid of default case here.
+ //assert(alen % perCaseCellCount == 0, "must be even");
+ return (alen / perCaseCellCount);
+ }
+
+ int defaultCount() {
+ return arrayUintAt(defaultCountOffSet);
+ }
+ int defaultDisplacement() {
+ return arrayIntAt(defaultDisaplacementOffSet);
+ }
+
+ int countAt(int index) {
+ return arrayUintAt(caseArrayStart +
+ index * perCaseCellCount +
+ relativeCountOffSet);
+ }
+ int displacementAt(int index) {
+ return arrayIntAt(caseArrayStart +
+ index * perCaseCellCount +
+ relativeDisplacementOffSet);
+ }
+
+ // Code generation support
+ static int defaultCountOffset() {
+ return arrayElementOffset(defaultCountOffSet);
+ }
+ static int defaultDisplacementOffset() {
+ return arrayElementOffset(defaultDisaplacementOffSet);
+ }
+ static int caseCountOffset(int index) {
+ return caseArrayOffset() +
+ (perCaseSize() * index) +
+ relativeCountOffset();
+ }
+ static int caseArrayOffset() {
+ return arrayElementOffset(caseArrayStart);
+ }
+ static int perCaseSize() {
+ return (perCaseCellCount) * MethodData.cellSize;
+ }
+ static int relativeCountOffset() {
+ return (relativeCountOffSet) * MethodData.cellSize;
+ }
+ static int relativeDisplacementOffset() {
+ return (relativeDisplacementOffSet) * MethodData.cellSize;
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "MultiBranchData");
+ st.println("default_count(" + defaultCount() + ") displacement(" + defaultDisplacement() + ")");
+ int cases = numberOfCases();
+ for (int i = 0; i < cases; i++) {
+ tab(st);
+ st.println("count(" + countAt(i) + ") displacement(" + displacementAt(i) + ")");
+ }
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
index e6887b1..edd8a80 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/OopUtilities.java
@@ -112,6 +112,32 @@ public class OopUtilities implements /* imports */ JVMTIThreadState {
return buf.toString();
}
+ public static String escapeString(String s) {
+ StringBuilder sb = null;
+ for (int index = 0; index < s.length(); index++) {
+ char value = s.charAt(index);
+ if (value >= 32 && value < 127 || value == '\'' || value == '\\') {
+ if (sb != null) {
+ sb.append(value);
+ }
+ } else {
+ if (sb == null) {
+ sb = new StringBuilder(s.length() * 2);
+ sb.append(s, 0, index);
+ }
+ sb.append("\\u");
+ if (value < 0x10) sb.append("000");
+ else if (value < 0x100) sb.append("00");
+ else if (value < 0x1000) sb.append("0");
+ sb.append(Integer.toHexString(value));
+ }
+ }
+ if (sb != null) {
+ return sb.toString();
+ }
+ return s;
+ }
+
public static String stringOopToString(Oop stringOop) {
if (offsetField == null) {
InstanceKlass k = (InstanceKlass) stringOop.getKlass();
@@ -129,6 +155,10 @@ public class OopUtilities implements /* imports */ JVMTIThreadState {
countField.getValue(stringOop));
}
+ public static String stringOopToEscapedString(Oop stringOop) {
+ return escapeString(stringOopToString(stringOop));
+ }
+
private static void initThreadGroupFields() {
if (threadGroupParentField == null) {
SystemDictionary sysDict = VM.getVM().getSystemDictionary();
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ProfileData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ProfileData.java
new file mode 100644
index 0000000..24b62e4
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ProfileData.java
@@ -0,0 +1,127 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+public abstract class ProfileData {
+ // This is a pointer to a section of profiling data.
+ private DataLayout _data;
+
+ public DataLayout data() { return _data; }
+
+ // How many cells are in this?
+ public abstract int cellCount();
+
+
+ // Return the size of this data.
+ public int sizeInBytes() {
+ return DataLayout.computeSizeInBytes(cellCount());
+ }
+
+ public int dp() {
+ return data().dp();
+ }
+
+ // Low-level accessors for underlying data
+ int intptrAt(int index) {
+ //assert(0 <= index && index < cellCount(), "oob");
+ return data().cellAt(index);
+ }
+ int intAt(int index) {
+ return (int)intptrAt(index);
+ }
+ int uintAt(int index) {
+ return (int)intptrAt(index);
+ }
+ Oop oopAt(int index) {
+ return data().oopAt(index);
+ }
+
+ public Address addressAt(int index) {
+ return data().addressAt(index);
+ }
+
+ boolean flagAt(int flagNumber) {
+ return data().flagAt(flagNumber);
+ }
+
+ // two convenient imports for use by subclasses:
+ public static int cellOffset(int index) {
+ return DataLayout.cellOffset(index);
+ }
+
+ public ProfileData(DataLayout data) {
+ _data = data;
+ }
+
+ // Constructor for invalid ProfileData.
+ ProfileData() {
+ _data = null;
+ }
+
+ int bci() {
+ return data().bci();
+ }
+
+ int trapState() {
+ return data().trapState();
+ }
+ public abstract void printDataOn(PrintStream st);
+
+ void tab(PrintStream st) {
+ st.print("\t");
+ }
+
+ void printShared(PrintStream st, String name) {
+ st.print("bci: " + bci());
+ // st.fillTo(tabWidthOne);
+ st.print(" " + name + " ");
+ tab(st);
+ int trap = trapState();
+ if (trap != 0) {
+ st.print("trap(" + MethodData.formatTrapState(trap) + ") ");
+ }
+ int flags = data().flags();
+ if (flags != 0)
+ st.print("flags(" + flags + ") ");
+ }
+
+ public String toString() {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ PrintStream ps = new PrintStream(baos);
+ try {
+ printDataOn(ps);
+ } finally {
+ ps.close();
+ }
+ return baos.toString();
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java
new file mode 100644
index 0000000..c6a7ac8
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/ReceiverTypeData.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// ReceiverTypeData
+//
+// A ReceiverTypeData is used to access profiling information about a
+// dynamic type check. It consists of a counter which counts the total times
+// that the check is reached, and a series of (Klass, count) pairs
+// which are used to store a type profile for the receiver of the check.
+public class ReceiverTypeData extends CounterData {
+ static final int receiver0Offset = counterCellCount;
+ static final int count0Offset = receiver0Offset + 1;
+ static final int receiverTypeRowCellCount = (count0Offset + 1) - receiver0Offset;
+
+ public ReceiverTypeData(DataLayout layout) {
+ super(layout);
+ //assert(layout.tag() == DataLayout.receiverTypeDataTag ||
+ // layout.tag() == DataLayout.virtualCallDataTag, "wrong type");
+ }
+
+ boolean isReceivertypedata() { return true; }
+
+ static int staticCellCount() {
+ return counterCellCount + MethodData.TypeProfileWidth * receiverTypeRowCellCount;
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ // Direct accessors
+ public static int rowLimit() {
+ return MethodData.TypeProfileWidth;
+ }
+ public static int receiverCellIndex(int row) {
+ return receiver0Offset + row * receiverTypeRowCellCount;
+ }
+ public static int receiverCountCellIndex(int row) {
+ return count0Offset + row * receiverTypeRowCellCount;
+ }
+
+ // Get the receiver at row. The 'unchecked' version is needed by parallel old
+ // gc; it does not assert the receiver is a klass. During compaction of the
+ // perm gen, the klass may already have moved, so the isKlass() predicate
+ // would fail. The 'normal' version should be used whenever possible.
+ Klass receiverUnchecked(int row) {
+ //assert(row < rowLimit(), "oob");
+ Oop recv = oopAt(receiverCellIndex(row));
+ return (Klass)recv;
+ }
+
+ public Klass receiver(int row) {
+ Klass recv = receiverUnchecked(row);
+ //assert(recv == NULL || ((oop)recv).isKlass(), "wrong type");
+ return recv;
+ }
+
+ public int receiverCount(int row) {
+ //assert(row < rowLimit(), "oob");
+ return uintAt(receiverCountCellIndex(row));
+ }
+
+ // Code generation support
+ static int receiverOffset(int row) {
+ return cellOffset(receiverCellIndex(row));
+ }
+ static int receiverCountOffset(int row) {
+ return cellOffset(receiverCountCellIndex(row));
+ }
+ static int receiverTypeDataSize() {
+ return cellOffset(staticCellCount());
+ }
+
+ void printReceiverDataOn(PrintStream st) {
+ int row;
+ int entries = 0;
+ for (row = 0; row < rowLimit(); row++) {
+ if (receiver(row) != null) entries++;
+ }
+ st.println("count(" + count() + ") entries(" + entries + ")");
+ for (row = 0; row < rowLimit(); row++) {
+ if (receiver(row) != null) {
+ tab(st);
+ receiver(row).printValueOn(st);
+ st.println("(" + receiverCount(row) + ")");
+ }
+ }
+ }
+ public void printDataOn(PrintStream st) {
+ printShared(st, "ReceiverTypeData");
+ printReceiverDataOn(st);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java
new file mode 100644
index 0000000..374623b
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/RetData.java
@@ -0,0 +1,113 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// RetData
+//
+// A RetData is used to access profiling information for a ret bytecode.
+// It is composed of a count of the number of times that the ret has
+// been executed, followed by a series of triples of the form
+// (bci, count, di) which count the number of times that some bci was the
+// target of the ret and cache a corresponding data displacement.
+public class RetData extends CounterData {
+
+ static final int bci0Offset = counterCellCount;
+ static final int count0Offset = bci0Offset + 1;
+ static final int displacement0Offset = count0Offset + 1;
+ static final int retRowCellCount = (displacement0Offset + 1) - bci0Offset;
+
+ public RetData(DataLayout layout) {
+ super(layout);
+ //assert(layout.tag() == DataLayout.retDataTag, "wrong type");
+ }
+
+ static final int noBci = -1; // value of bci when bci1/2 are not in use.
+
+ static int staticCellCount() {
+ return counterCellCount + MethodData.BciProfileWidth * retRowCellCount;
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ static int rowLimit() {
+ return MethodData.BciProfileWidth;
+ }
+ static int bciCellIndex(int row) {
+ return bci0Offset + row * retRowCellCount;
+ }
+ static int bciCountCellIndex(int row) {
+ return count0Offset + row * retRowCellCount;
+ }
+ static int bciDisplacementCellIndex(int row) {
+ return displacement0Offset + row * retRowCellCount;
+ }
+
+ // Direct accessors
+ int bci(int row) {
+ return intAt(bciCellIndex(row));
+ }
+ int bciCount(int row) {
+ return uintAt(bciCountCellIndex(row));
+ }
+ int bciDisplacement(int row) {
+ return intAt(bciDisplacementCellIndex(row));
+ }
+
+ // Code generation support
+ static int bciOffset(int row) {
+ return cellOffset(bciCellIndex(row));
+ }
+ static int bciCountOffset(int row) {
+ return cellOffset(bciCountCellIndex(row));
+ }
+ static int bciDisplacementOffset(int row) {
+ return cellOffset(bciDisplacementCellIndex(row));
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "RetData");
+ int row;
+ int entries = 0;
+ for (row = 0; row < rowLimit(); row++) {
+ if (bci(row) != noBci) entries++;
+ }
+ st.println("count(" + count() + ") entries(" + entries + ")");
+ for (row = 0; row < rowLimit(); row++) {
+ if (bci(row) != noBci) {
+ tab(st);
+ st.println(" bci(" + bci(row) + ": count(" + bciCount(row) + ") displacement(" + bciDisplacement(row) + "))");
+ }
+ }
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java
index f7f5244..900b111 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/TypeArray.java
@@ -53,6 +53,9 @@ public class TypeArray extends Array {
public boolean isTypeArray() { return true; }
public byte getByteAt(long index) {
+ if (index < 0 || index >= getLength()) {
+ throw new ArrayIndexOutOfBoundsException(index + " " + getLength());
+ }
long offset = baseOffsetInBytes(BasicType.T_BYTE) + index * getHeap().getByteSize();
return getHandle().getJByteAt(offset);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java
new file mode 100644
index 0000000..a1eed08
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/VirtualCallData.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+package sun.jvm.hotspot.oops;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+// VirtualCallData
+//
+// A VirtualCallData is used to access profiling information about a
+// call. For now, it has nothing more than a ReceiverTypeData.
+public class VirtualCallData extends ReceiverTypeData {
+ public VirtualCallData(DataLayout layout) {
+ super(layout);
+ //assert(layout.tag() == DataLayout.virtualCallDataTag, "wrong type");
+ }
+
+ static int staticCellCount() {
+ // At this point we could add more profile state, e.g., for arguments.
+ // But for now it's the same size as the base record type.
+ return ReceiverTypeData.staticCellCount();
+ }
+
+ public int cellCount() {
+ return staticCellCount();
+ }
+
+ // Direct accessors
+ static int virtualCallDataSize() {
+ return cellOffset(staticCellCount());
+ }
+
+ public void printDataOn(PrintStream st) {
+ printShared(st, "VirtualCallData");
+ printReceiverDataOn(st);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java
index b91eab3..9f2dbb3 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/oops/java_lang_Class.java
@@ -55,13 +55,13 @@ public class java_lang_Class {
// klass and oop_size are HotSpot magic fields and hence we can't
// find them from InstanceKlass for java.lang.Class.
Type jlc = db.lookupType("java_lang_Class");
- int klassOffset = (int) jlc.getCIntegerField("klass_offset").getValue();
+ int klassOffset = (int) jlc.getCIntegerField("_klass_offset").getValue();
if (VM.getVM().isCompressedOopsEnabled()) {
klassField = new NarrowOopField(new NamedFieldIdentifier("klass"), klassOffset, true);
} else {
klassField = new OopField(new NamedFieldIdentifier("klass"), klassOffset, true);
}
- int oopSizeOffset = (int) jlc.getCIntegerField("oop_size_offset").getValue();
+ int oopSizeOffset = (int) jlc.getCIntegerField("_oop_size_offset").getValue();
oopSizeField = new IntField(new NamedFieldIdentifier("oop_size"), oopSizeOffset, true);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java
new file mode 100644
index 0000000..106713f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block.java
@@ -0,0 +1,88 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Block extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Block");
+ nodesField = type.getAddressField("_nodes");
+ succsField = type.getAddressField("_succs");
+ numSuccsField = new CIntField(type.getCIntegerField("_num_succs"), 0);
+ preOrderField = new CIntField(type.getCIntegerField("_pre_order"), 0);
+ domDepthField = new CIntField(type.getCIntegerField("_dom_depth"), 0);
+ idomField = type.getAddressField("_idom");
+ freqField = type.getJFloatField("_freq");
+ }
+
+ private static AddressField nodesField;
+ private static AddressField succsField;
+ private static CIntField numSuccsField;
+ private static CIntField preOrderField;
+ private static CIntField domDepthField;
+ private static AddressField idomField;
+ private static JFloatField freqField;
+
+ public Block(Address addr) {
+ super(addr);
+ }
+
+ public int preOrder() {
+ return (int)preOrderField.getValue(getAddress());
+ }
+
+ public float freq() {
+ return (float)freqField.getValue(getAddress());
+ }
+
+ public Node_List nodes() {
+ return new Node_List(getAddress().addOffsetTo(nodesField.getOffset()));
+ }
+
+ public void dump(PrintStream out) {
+ out.print("B" + preOrder());
+ out.print(" Freq: " + freq());
+ out.println();
+ Node_List nl = nodes();
+ int cnt = nl.size();
+ for( int i=0; i<cnt; i++ )
+ nl.at(i).dump(out);
+ out.print("\n");
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java
new file mode 100644
index 0000000..b219ca7
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block_Array.java
@@ -0,0 +1,64 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Block_Array extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Block_Array");
+ sizeField = new CIntField(type.getCIntegerField("_size"), 0);
+ blocksField = type.getAddressField("_blocks");
+ arenaField = type.getAddressField("_arena");
+ }
+
+ private static CIntField sizeField;
+ private static AddressField blocksField;
+ private static AddressField arenaField;
+
+ public Block_Array(Address addr) {
+ super(addr);
+ }
+
+ public int Max() {
+ return (int) sizeField.getValue(getAddress());
+ }
+
+ public Block at(int i) {
+ return new Block(blocksField.getValue(getAddress()).getAddressAt(i * (int)VM.getVM().getAddressSize()));
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block_List.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block_List.java
new file mode 100644
index 0000000..8945334
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Block_List.java
@@ -0,0 +1,56 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Block_List extends Block_Array {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Block_List");
+ cntField = new CIntField(type.getCIntegerField("_cnt"), 0);
+ }
+
+ private static CIntField cntField;
+
+ public Block_List(Address addr) {
+ super(addr);
+ }
+
+ public int size() {
+ return (int) cntField.getValue(getAddress());
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java
new file mode 100644
index 0000000..ca68643
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallDynamicJavaNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class CallDynamicJavaNode extends CallJavaNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CallDynamicJavaNode");
+ }
+
+
+ public CallDynamicJavaNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java
new file mode 100644
index 0000000..94a5e99
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallJavaNode.java
@@ -0,0 +1,66 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.*;
+import sun.jvm.hotspot.code.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.ci.*;
+import sun.jvm.hotspot.types.*;
+
+public class CallJavaNode extends CallNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CallJavaNode");
+ methodField = type.getAddressField("_method");
+ }
+
+ private static AddressField methodField;
+
+ public CallJavaNode(Address addr) {
+ super(addr);
+ }
+
+ public ciMethod method() {
+ return (ciMethod) ciObjectFactory.get(methodField.getValue(getAddress()));
+ }
+
+ public void dumpSpec(PrintStream out) {
+ if (method() != null) {
+ out.print(" " + method().method().externalNameAndSignature());
+ }
+ super.dumpSpec(out);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java
new file mode 100644
index 0000000..5634917
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallNode.java
@@ -0,0 +1,65 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class CallNode extends SafePointNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CallNode");
+ entryPointField = type.getAddressField("_entry_point");
+ }
+
+ private static AddressField entryPointField;
+
+ public Address entryPoint() {
+ return entryPointField.getValue(getAddress());
+ }
+
+ public CallNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream out) {
+ out.print(" ");
+ // tf()->dumpOn(st);
+ // if (_cnt != countUnknown) st->print(" C=%f",_cnt);
+ JVMState jvms = jvms();
+ if (jvms != null) jvms.dumpSpec(out);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java
new file mode 100644
index 0000000..7f730ef
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallRuntimeNode.java
@@ -0,0 +1,64 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.utilities.CStringUtilities;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class CallRuntimeNode extends CallNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CallRuntimeNode");
+ nameField = type.getAddressField("_name");
+ }
+
+ static private AddressField nameField;
+
+ public String name() {
+ return CStringUtilities.getString(nameField.getValue(getAddress()));
+ }
+
+ public CallRuntimeNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream out) {
+ out.print(" #");
+ out.print(name());
+ super.dumpSpec(out);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java
new file mode 100644
index 0000000..47ff13f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/CallStaticJavaNode.java
@@ -0,0 +1,75 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.utilities.CStringUtilities;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class CallStaticJavaNode extends CallJavaNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CallStaticJavaNode");
+ nameField = type.getAddressField("_name");
+ }
+
+ static private AddressField nameField;
+
+ public String name() {
+ return CStringUtilities.getString(nameField.getValue(getAddress()));
+ }
+
+ public CallStaticJavaNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream out) {
+ out.print(" Static ");
+ String name = name();
+ if (name != null) {
+ out.print(name);
+ // int trapReq = uncommonTrapRequest();
+ // if (trapReq != 0) {
+ // char buf[100];
+ // st->print("(%s)",
+ // Deoptimization::formatTrapRequest(buf, sizeof(buf),
+ // trapReq));
+ // }
+ out.print(" ");
+ }
+ super.dumpSpec(out);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java
new file mode 100644
index 0000000..31aacd5
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Compile.java
@@ -0,0 +1,95 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.ci.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Compile extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Compile");
+ rootField = type.getAddressField("_root");
+ uniqueField = new CIntField(type.getCIntegerField("_unique"), 0);
+ entryBciField = new CIntField(type.getCIntegerField("_entry_bci"), 0);
+ topField = type.getAddressField("_top");
+ cfgField = type.getAddressField("_cfg");
+ regallocField = type.getAddressField("_regalloc");
+ methodField = type.getAddressField("_method");
+ iltField = type.getAddressField("_ilt");
+ }
+
+ private static AddressField rootField;
+ private static CIntField uniqueField;
+ private static CIntField entryBciField;
+ private static AddressField topField;
+ private static AddressField cfgField;
+ private static AddressField regallocField;
+ private static AddressField methodField;
+ private static AddressField iltField;
+
+ public Compile(Address addr) {
+ super(addr);
+ }
+
+ public Node root() {
+ return new RootNode(rootField.getValue(this.getAddress()));
+ }
+
+ public int entryBci() {
+ return (int)entryBciField.getValue(getAddress());
+ }
+
+ public ciMethod method() {
+ return (ciMethod) ciObjectFactory.get(methodField.getValue(getAddress()));
+ }
+
+ public PhaseCFG cfg() {
+ Address a = cfgField.getValue(this.getAddress());
+ if (a != null) {
+ return new PhaseCFG(a);
+ }
+ return null;
+ }
+
+ public InlineTree ilt() {
+ Address a = iltField.getValue(this.getAddress());
+ if (a != null) {
+ return new InlineTree(a);
+ }
+ return null;
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/HaltNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/HaltNode.java
new file mode 100644
index 0000000..ea8ef89
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/HaltNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class HaltNode extends Node {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("HaltNode");
+ }
+
+
+ public HaltNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java
new file mode 100644
index 0000000..0a0f6fe
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/InlineTree.java
@@ -0,0 +1,104 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.ci.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.utilities.GrowableArray;
+import sun.jvm.hotspot.types.*;
+
+public class InlineTree extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("InlineTree");
+ callerJvmsField = type.getAddressField("_caller_jvms");
+ methodField = type.getAddressField("_method");
+ callerTreeField = type.getAddressField("_caller_tree");
+ subtreesField = type.getAddressField("_subtrees");
+ }
+
+ private static AddressField callerJvmsField;
+ private static AddressField methodField;
+ private static AddressField callerTreeField;
+ private static AddressField subtreesField;
+
+ private static StaticBaseConstructor inlineTreeConstructor = new StaticBaseConstructor<InlineTree>(InlineTree.class);
+
+ public InlineTree(Address addr) {
+ super(addr);
+ }
+
+ public InlineTree callerTree() {
+ Address addr = callerTreeField.getValue(getAddress());
+ if (addr == null) return null;
+
+ return new InlineTree(addr);
+ }
+
+ public ciMethod method() {
+ return (ciMethod) ciObjectFactory.get(methodField.getValue(getAddress()));
+ }
+
+ public JVMState callerJvms() {
+ return JVMState.create(callerJvmsField.getValue(getAddress()));
+ }
+
+ public int callerBci() {
+ JVMState jvms = callerJvms();
+ return (jvms != null) ? jvms.bci() : -1;
+ }
+
+ public GrowableArray<InlineTree> subtrees() {
+ Address addr = getAddress().addOffsetTo(subtreesField.getOffset());
+
+ return GrowableArray.create(addr, inlineTreeConstructor);
+ }
+
+ public void printImpl(PrintStream st, int indent) {
+ for (int i = 0; i < indent; i++) st.print(" ");
+ st.printf(" @ %d ", callerBci());
+ method().printShortName(st);
+ st.println();
+
+ GrowableArray<InlineTree> subt = subtrees();
+ for (int i = 0 ; i < subt.length(); i++) {
+ subt.at(i).printImpl(st, indent + 2);
+ }
+ }
+ public void print(PrintStream st) {
+ printImpl(st, 2);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java
new file mode 100644
index 0000000..40147a1
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/JVMState.java
@@ -0,0 +1,106 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.ci.*;
+import sun.jvm.hotspot.types.*;
+
+public class JVMState extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("JVMState");
+ mapField = type.getAddressField("_map");
+ methodField = type.getAddressField("_method");
+ bciField = new CIntField(type.getCIntegerField("_bci"), 0);
+ spField = new CIntField(type.getCIntegerField("_sp"), 0);
+ endoffField = new CIntField(type.getCIntegerField("_endoff"), 0);
+ try {
+ scloffField = new CIntField(type.getCIntegerField("_scloff"), 0);
+ } catch (Exception e) {
+ }
+ monoffField = new CIntField(type.getCIntegerField("_monoff"), 0);
+ stkoffField = new CIntField(type.getCIntegerField("_stkoff"), 0);
+ locoffField = new CIntField(type.getCIntegerField("_locoff"), 0);
+ depthField = new CIntField(type.getCIntegerField("_depth"), 0);
+ callerField = type.getAddressField("_caller");
+ }
+
+ private static AddressField mapField;
+ private static AddressField methodField;
+ private static CIntField bciField;
+ private static CIntField spField;
+ private static CIntField endoffField;
+ private static CIntField scloffField;
+ private static CIntField monoffField;
+ private static CIntField stkoffField;
+ private static CIntField locoffField;
+ private static CIntField depthField;
+ private static AddressField callerField;
+
+ public static JVMState create(Address addr) {
+ if (addr == null) return null;
+ return new JVMState(addr);
+ }
+
+ public JVMState(Address addr) {
+ super(addr);
+ }
+
+ public ciMethod method() {
+ return (ciMethod) ciObjectFactory.get(methodField.getValue(getAddress()));
+ }
+
+ public int bci() {
+ return (int)bciField.getValue(getAddress());
+ }
+
+ public JVMState caller() {
+ return create(callerField.getValue(getAddress()));
+ }
+
+ public void dumpSpec(PrintStream out) {
+ ciMethod m = method();
+ if (m != null) {
+ Method meth = m.method();
+ out.print(" " + meth.getMethodHolder().getName().asString().replace('/', '.') + "::" +
+ meth.getName().asString() + " @ bci:" + bci());
+ } else {
+ out.print(" runtime stub");
+ }
+ if (caller() != null) caller().dumpSpec(out);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java
new file mode 100644
index 0000000..c62ad08
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/LoopNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class LoopNode extends RegionNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("LoopNode");
+ }
+
+
+ public LoopNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java
new file mode 100644
index 0000000..5d22719
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallJavaNode.java
@@ -0,0 +1,70 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.ci.ciMethod;
+import sun.jvm.hotspot.ci.ciObjectFactory;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachCallJavaNode extends MachCallNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachCallJavaNode");
+ methodField = type.getAddressField("_method");
+ bciField = new CIntField(type.getCIntegerField("_bci"), 0);
+ }
+
+ private static AddressField methodField;
+ private static CIntField bciField;
+
+ public ciMethod method() {
+ return (ciMethod) ciObjectFactory.get(methodField.getValue(getAddress()));
+ }
+
+ public MachCallJavaNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream st) {
+ ciMethod m = method();
+ if (m != null) {
+ m.printShortName(st);
+ st.print(" ");
+ }
+ super.dumpSpec(st);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java
new file mode 100644
index 0000000..7f3691e
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallNode.java
@@ -0,0 +1,57 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachCallNode extends MachSafePointNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachCallNode");
+ }
+
+ public MachCallNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream st) {
+ st.print("# ");
+ // tf()->dump_on(st);
+ // if (_cnt != COUNT_UNKNOWN) st->print(" C=%f",_cnt);
+ if (jvms() != null) jvms().dumpSpec(st);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java
new file mode 100644
index 0000000..9a6655f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallRuntimeNode.java
@@ -0,0 +1,63 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.CStringUtilities;
+
+public class MachCallRuntimeNode extends MachCallJavaNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachCallRuntimeNode");
+ nameField = type.getAddressField("_name");
+ }
+
+ private static AddressField nameField;
+
+ public String name() {
+ return CStringUtilities.getString(nameField.getValue(getAddress()));
+ }
+
+ public MachCallRuntimeNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream out) {
+ out.printf("%s ", name());
+ super.dumpSpec(out);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java
new file mode 100644
index 0000000..4668acb
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachCallStaticJavaNode.java
@@ -0,0 +1,69 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.CStringUtilities;
+
+public class MachCallStaticJavaNode extends MachCallJavaNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachCallStaticJavaNode");
+ nameField = type.getAddressField("_name");
+ }
+
+ private static AddressField nameField;
+
+ public String name() {
+ return CStringUtilities.getString(nameField.getValue(getAddress()));
+ }
+
+ public MachCallStaticJavaNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream st) {
+ st.print("Static ");
+ String n = name();
+ if (n != null) {
+ st.printf("wrapper for: %s", n);
+ // dump_trap_args(st);
+ st.print(" ");
+ }
+ super.dumpSpec(st);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachIfNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachIfNode.java
new file mode 100644
index 0000000..dc47e13
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachIfNode.java
@@ -0,0 +1,67 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachIfNode extends MachNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachIfNode");
+ probField = type.getJFloatField("_prob");
+ fcntField = type.getJFloatField("_fcnt");
+ }
+
+ private static JFloatField probField;
+ private static JFloatField fcntField;
+
+ float prob() {
+ return probField.getValue(getAddress());
+ }
+
+ float cnt() {
+ return fcntField.getValue(getAddress());
+ }
+
+ public MachIfNode(Address addr) {
+ super(addr);
+ }
+
+ public void dumpSpec(PrintStream out) {
+ out.print("P=" + prob() + ", C=" + cnt());
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachNode.java
new file mode 100644
index 0000000..c59ef7a
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachNode.java
@@ -0,0 +1,49 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachNode extends Node {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachNode");
+ }
+
+ public MachNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java
new file mode 100644
index 0000000..a9bd39a
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachReturnNode.java
@@ -0,0 +1,49 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachReturnNode extends MachNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachReturnNode");
+ }
+
+ public MachReturnNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java
new file mode 100644
index 0000000..630f269
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MachSafePointNode.java
@@ -0,0 +1,75 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MachSafePointNode extends MachReturnNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MachSafePointNode");
+ jvmsField = type.getAddressField("_jvms");
+ jvmadjField = new CIntField(type.getCIntegerField("_jvmadj"), 0);
+ }
+
+ private static AddressField jvmsField;
+ private static CIntField jvmadjField;
+
+ public MachSafePointNode(Address addr) {
+ super(addr);
+ }
+
+ public JVMState jvms() {
+ return JVMState.create(jvmsField.getValue(getAddress()));
+ }
+
+ public void dumpSpec(PrintStream out) {
+ try {
+ JVMState jvms = jvms();
+ if (jvms != null) out.print(" !");
+ if (jvms == null) out.print("empty jvms");
+ while (jvms != null) {
+ Method m = jvms.method().method();
+ int bci = jvms.bci();
+ out.print(" " + m.getMethodHolder().getName().asString().replace('/', '.') + "::" + m.getName().asString() + " @ bci:" + bci);
+ jvms = jvms.caller();
+ }
+ } catch (Exception e) {
+ out.print(e);
+ }
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MultiNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MultiNode.java
new file mode 100644
index 0000000..69d666e
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/MultiNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class MultiNode extends Node {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("MultiNode");
+ }
+
+
+ public MultiNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node.java
new file mode 100644
index 0000000..e393383
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node.java
@@ -0,0 +1,269 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.io.*;
+import java.lang.reflect.Constructor;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Node extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Node");
+ outmaxField = new CIntField(type.getCIntegerField("_outmax"), 0);
+ outcntField = new CIntField(type.getCIntegerField("_outcnt"), 0);
+ maxField = new CIntField(type.getCIntegerField("_max"), 0);
+ cntField = new CIntField(type.getCIntegerField("_cnt"), 0);
+ idxField = new CIntField(type.getCIntegerField("_idx"), 0);
+ outField = type.getAddressField("_out");
+ inField = type.getAddressField("_in");
+
+ nodeType = db.lookupType("Node");
+
+ virtualConstructor = new VirtualBaseConstructor(db, nodeType, "sun.jvm.hotspot.opto", Node.class);
+ }
+
+ private static CIntField outmaxField;
+ private static CIntField outcntField;
+ private static CIntField maxField;
+ private static CIntField cntField;
+ private static CIntField idxField;
+ private static AddressField outField;
+ private static AddressField inField;
+
+ private static VirtualBaseConstructor virtualConstructor;
+
+ private static Type nodeType;
+
+ static HashMap nodes = new HashMap();
+
+ static HashMap constructors = new HashMap();
+
+ static abstract class Instantiator {
+ abstract Node create(Address addr);
+ }
+
+ static public Node create(Address addr) {
+ if (addr == null) return null;
+ Node result = (Node)nodes.get(addr);
+ if (result == null) {
+ result = (Node)virtualConstructor.instantiateWrapperFor(addr);
+ nodes.put(addr, result);
+ }
+ return result;
+ }
+
+ public Node(Address addr) {
+ super(addr);
+ }
+
+ public int outcnt() {
+ return (int)outcntField.getValue(this.getAddress());
+ }
+
+ public int req() {
+ return (int)cntField.getValue(this.getAddress());
+ }
+
+ public int len() {
+ return (int)maxField.getValue(this.getAddress());
+ }
+
+ public int idx() {
+ return (int)idxField.getValue(this.getAddress());
+ }
+
+ private Node[] _out;
+ private Node[] _in;
+
+ public Node rawOut(int i) {
+ if (_out == null) {
+ int addressSize = (int)VM.getVM().getAddressSize();
+ _out = new Node[outcnt()];
+ Address ptr = outField.getValue(this.getAddress());
+ for (int j = 0; j < outcnt(); j++) {
+ _out[j] = Node.create(ptr.getAddressAt(j * addressSize));
+ }
+ }
+ return _out[i];
+ }
+
+ public Node in(int i) {
+ if (_in == null) {
+ int addressSize = (int)VM.getVM().getAddressSize();
+ _in = new Node[len()];
+ Address ptr = inField.getValue(this.getAddress());
+ for (int j = 0; j < len(); j++) {
+ _in[j] = Node.create(ptr.getAddressAt(j * addressSize));
+ }
+ }
+ return _in[i];
+ }
+
+ public ArrayList collect(int d, boolean onlyCtrl) {
+ int depth = Math.abs(d);
+ ArrayList nstack = new ArrayList();
+ BitSet set = new BitSet();
+
+ nstack.add(this);
+ set.set(idx());
+ int begin = 0;
+ int end = 0;
+ for (int i = 0; i < depth; i++) {
+ end = nstack.size();
+ for(int j = begin; j < end; j++) {
+ Node tp = (Node)nstack.get(j);
+ int limit = d > 0 ? tp.len() : tp.outcnt();
+ for(int k = 0; k < limit; k++) {
+ Node n = d > 0 ? tp.in(k) : tp.rawOut(k);
+
+ // if (NotANode(n)) continue;
+ if (n == null) continue;
+ // do not recurse through top or the root (would reach unrelated stuff)
+ // if (n.isRoot() || n.isTop()) continue;
+ // if (onlyCtrl && !n.isCfg()) continue;
+
+ if (!set.get(n.idx())) {
+ nstack.add(n);
+ set.set(n.idx());
+ }
+ }
+ }
+ begin = end;
+ }
+ return nstack;
+ }
+
+ protected void dumpNodes(Node s, int d, boolean onlyCtrl, PrintStream out) {
+ if (s == null) return;
+
+ ArrayList nstack = s.collect(d, onlyCtrl);
+ int end = nstack.size();
+ if (d > 0) {
+ for(int j = end-1; j >= 0; j--) {
+ ((Node)nstack.get(j)).dump(out);
+ }
+ } else {
+ for(int j = 0; j < end; j++) {
+ ((Node)nstack.get(j)).dump(out);
+ }
+ }
+ }
+
+ public void dump(int depth, PrintStream out) {
+ dumpNodes(this, depth, false, out);
+ }
+
+ public String Name() {
+ Type t = VM.getVM().getTypeDataBase().findDynamicTypeForAddress(getAddress(), nodeType);
+ String name = null;
+ if (t != null) {
+ name = t.toString();
+ } else {
+ Class c = getClass();
+ if (c == Node.class) {
+ // couldn't identify class type
+ return "UnknownNode<" + getAddress().getAddressAt(0) + ">";
+ }
+ name = getClass().getName();
+ if (name.startsWith("sun.jvm.hotspot.opto.")) {
+ name = name.substring("sun.jvm.hotspot.opto.".length());
+ }
+ }
+ if (name.endsWith("Node")) {
+ return name.substring(0, name.length() - 4);
+ }
+ return name;
+ }
+
+ public void dump(PrintStream out) {
+ out.print(" ");
+ out.print(idx());
+ out.print("\t");
+ out.print(Name());
+ out.print("\t=== ");
+ int i = 0;
+ for (i = 0; i < req(); i++) {
+ Node n = in(i);
+ if (n != null) {
+ out.print(' ');
+ out.print(in(i).idx());
+ } else {
+ out.print("_");
+ }
+ out.print(" ");
+ }
+ if (len() != req()) {
+ int prec = 0;
+ for (; i < len(); i++) {
+ Node n = in(i);
+ if (n != null) {
+ if (prec++ == 0) {
+ out.print("| ");
+ }
+ out.print(in(i).idx());
+ }
+ out.print(" ");
+ }
+ }
+ dumpOut(out);
+ dumpSpec(out);
+ out.println();
+ }
+
+ void dumpOut(PrintStream out) {
+ // Delimit the output edges
+ out.print(" [[");
+ // Dump the output edges
+ for (int i = 0; i < outcnt(); i++) { // For all outputs
+ Node u = rawOut(i);
+ if (u == null) {
+ out.print("_ ");
+ // } else if (NotANode(u)) {
+ // out.print("NotANode ");
+ } else {
+ // out.print("%c%d ", Compile::current()->nodeArena()->contains(u) ? ' ' : 'o', u->_idx);
+ out.print(' ');
+ out.print(u.idx());
+ out.print(' ');
+ }
+ }
+ out.print("]] ");
+ }
+
+ public void dumpSpec(PrintStream out) {
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node_Array.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node_Array.java
new file mode 100644
index 0000000..c4a2734
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node_Array.java
@@ -0,0 +1,64 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Node_Array extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Node_Array");
+ maxField = new CIntField(type.getCIntegerField("_max"), 0);
+ nodesField = type.getAddressField("_nodes");
+ aField = type.getAddressField("_a");
+ }
+
+ private static CIntField maxField;
+ private static AddressField nodesField;
+ private static AddressField aField;
+
+ public Node_Array(Address addr) {
+ super(addr);
+ }
+
+ public int Size() {
+ return (int) maxField.getValue(getAddress());
+ }
+
+ public Node at(int i) {
+ return Node.create(nodesField.getValue(getAddress()).getAddressAt(i * (int)VM.getVM().getAddressSize()));
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node_List.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node_List.java
new file mode 100644
index 0000000..0828bf5
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Node_List.java
@@ -0,0 +1,56 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Node_List extends Node_Array {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Node_List");
+ cntField = new CIntField(type.getCIntegerField("_cnt"), 0);
+ }
+
+ private static CIntField cntField;
+
+ public Node_List(Address addr) {
+ super(addr);
+ }
+
+ public int size() {
+ return (int) cntField.getValue(getAddress());
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Phase.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Phase.java
new file mode 100644
index 0000000..5c010b0
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/Phase.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class Phase extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("Phase");
+ }
+
+
+ public Phase(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java
new file mode 100644
index 0000000..986214f
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseCFG.java
@@ -0,0 +1,69 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import java.io.PrintStream;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class PhaseCFG extends Phase {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("PhaseCFG");
+ numBlocksField = new CIntField(type.getCIntegerField("_num_blocks"), 0);
+ blocksField = type.getAddressField("_blocks");
+ bbsField = type.getAddressField("_bbs");
+ brootField = type.getAddressField("_broot");
+ }
+
+ private static CIntField numBlocksField;
+ private static AddressField blocksField;
+ private static AddressField bbsField;
+ private static AddressField brootField;
+
+ public PhaseCFG(Address addr) {
+ super(addr);
+ }
+
+ public void dump(PrintStream out) {
+ int addressSize = (int)VM.getVM().getAddressSize();
+ int numBlocks = (int)numBlocksField.getValue(getAddress());
+ Block_List blocks = new Block_List(getAddress().addOffsetTo(blocksField.getOffset()));
+ int offset = 0;
+ for (int i = 0; i < numBlocks; i++) {
+ blocks.at(i).dump(out);
+ }
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java
new file mode 100644
index 0000000..c51d952
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhaseRegAlloc.java
@@ -0,0 +1,58 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class PhaseRegAlloc extends Phase {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("PhaseRegAlloc");
+ nodeRegsField = type.getAddressField("_node_regs");
+ nodeRegsMaxIndexField = new CIntField(type.getCIntegerField("_node_regs_max_index"), 0);
+ framesizeField = new CIntField(type.getCIntegerField("_framesize"), 0);
+ maxRegField = new CIntField(type.getCIntegerField("_max_reg"), 0);
+ }
+
+ private static AddressField nodeRegsField;
+ private static CIntField nodeRegsMaxIndexField;
+ private static CIntField framesizeField;
+ private static CIntField maxRegField;
+
+ public PhaseRegAlloc(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhiNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhiNode.java
new file mode 100644
index 0000000..6565e03
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/PhiNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class PhiNode extends TypeNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("PhiNode");
+ }
+
+
+ public PhiNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java
new file mode 100644
index 0000000..6f3e9d4
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/ProjNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class ProjNode extends Node {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("ProjNode");
+ }
+
+
+ public ProjNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/RegionNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/RegionNode.java
new file mode 100644
index 0000000..5aa7763
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/RegionNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class RegionNode extends Node {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("RegionNode");
+ }
+
+
+ public RegionNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java
new file mode 100644
index 0000000..9a050da
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/RootNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class RootNode extends LoopNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("RootNode");
+ }
+
+
+ public RootNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java
new file mode 100644
index 0000000..5158592
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/SafePointNode.java
@@ -0,0 +1,68 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.io.PrintStream;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class SafePointNode extends MultiNode {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("SafePointNode");
+ jvmsField = type.getAddressField("_jvms");
+ }
+
+ private static AddressField jvmsField;
+
+ public SafePointNode(Address addr) {
+ super(addr);
+ }
+
+ public JVMState jvms() {
+ return JVMState.create(jvmsField.getValue(getAddress()));
+ }
+
+ public void dumpSpec(PrintStream out) {
+ JVMState jvms = jvms();
+ if (jvms != null) out.print(" !");
+ while (jvms != null) {
+ Method m = jvms.method().method();
+ int bci = jvms.bci();
+ out.print(" " + m.getMethodHolder().getName().asString().replace('/', '.') + "::" + m.getName().asString() + " @ bci:" + bci);
+ jvms = jvms.caller();
+ }
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/TypeNode.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/TypeNode.java
new file mode 100644
index 0000000..33e423a
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/opto/TypeNode.java
@@ -0,0 +1,50 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.opto;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class TypeNode extends Node {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("TypeNode");
+ }
+
+
+ public TypeNode(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java
new file mode 100644
index 0000000..83602a3
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/prims/JvmtiExport.java
@@ -0,0 +1,66 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.prims;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class JvmtiExport {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("JvmtiExport");
+ // XXX
+ // canAccessLocalVariables = type.getCIntegerField("_can_access_local_variables");
+ // canHotswapOrPostBreakpoint = type.getCIntegerField("_can_hotswap_or_post_breakpoint");
+ // canPostOnExceptions = type.getCIntegerField("_can_post_on_exceptions");
+ }
+
+ private static CIntegerField canAccessLocalVariables;
+ private static CIntegerField canHotswapOrPostBreakpoint;
+ private static CIntegerField canPostOnExceptions;
+
+ public static boolean canAccessLocalVariables() {
+ // return canAccessLocalVariables.getValue() != 0;
+ return false;
+ }
+ public static boolean canHotswapOrPostBreakpoint() {
+ // return canHotswapOrPostBreakpoint.getValue() != 0;
+ return false;
+ }
+ public static boolean canPostOnExceptions() {
+ // return canPostOnExceptions.getValue() != 0;
+ return false;
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java
index d0d9674..ba42e8d 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompiledVFrame.java
@@ -93,6 +93,8 @@ public class CompiledVFrame extends JavaVFrame {
}
public StackValueCollection getLocals() {
+ if (getScope() == null)
+ return new StackValueCollection();
List scvList = getScope().getLocals();
if (scvList == null)
return new StackValueCollection();
@@ -108,6 +110,8 @@ public class CompiledVFrame extends JavaVFrame {
}
public StackValueCollection getExpressions() {
+ if (getScope() == null)
+ return new StackValueCollection();
List scvList = getScope().getExpressions();
if (scvList == null)
return new StackValueCollection();
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
index 7c8defc..7a28c66 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/CompilerThread.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -25,10 +25,40 @@
package sun.jvm.hotspot.runtime;
import java.io.*;
+import java.util.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.ci.*;
public class CompilerThread extends JavaThread {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static AddressField _env_field;
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("CompilerThread");
+
+ _env_field = type.getAddressField("_env");
+ }
+
+ private ciEnv _env;
+
+ public synchronized ciEnv env() {
+ if (_env == null) {
+ Address v = _env_field.getValue(this.getAddress());
+ if (v != null) {
+ _env = new ciEnv(v);
+ }
+ }
+ return _env;
+ }
+
public CompilerThread(Address addr) {
super(addr);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java
index 3b99ec2..70eace5 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Frame.java
@@ -33,6 +33,7 @@ import sun.jvm.hotspot.c1.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.runtime.sparc.SPARCFrame;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
@@ -74,11 +75,19 @@ public abstract class Frame implements Cloneable {
/** Size of constMethodOopDesc for computing BCI from BCP (FIXME: hack) */
private static long constMethodOopDescSize;
+ private static int pcReturnOffset;
+
+ public static int pcReturnOffset() {
+ return pcReturnOffset;
+ }
+
private static synchronized void initialize(TypeDataBase db) {
Type constMethodOopType = db.lookupType("constMethodOopDesc");
// FIXME: not sure whether alignment here is correct or how to
// force it (round up to address size?)
constMethodOopDescSize = constMethodOopType.getSize();
+
+ pcReturnOffset = db.lookupIntConstant("frame::pc_return_offset").intValue();
}
protected int bcpToBci(Address bcp, ConstMethod cm) {
@@ -106,6 +115,10 @@ public abstract class Frame implements Cloneable {
public void setPC(Address newpc) { pc = newpc; }
public boolean isDeoptimized() { return deoptimized; }
+ public CodeBlob cb() {
+ return VM.getVM().getCodeCache().findBlob(getPC());
+ }
+
public abstract Address getSP();
public abstract Address getID();
public abstract Address getFP();
@@ -134,6 +147,12 @@ public abstract class Frame implements Cloneable {
}
}
+ public boolean isRicochetFrame() {
+ CodeBlob cb = VM.getVM().getCodeCache().findBlob(getPC());
+ RicochetBlob rcb = VM.getVM().ricochetBlob();
+ return (cb == rcb && rcb != null && rcb.returnsToBounceAddr(getPC()));
+ }
+
public boolean isCompiledFrame() {
if (Assert.ASSERTS_ENABLED) {
Assert.that(!VM.getVM().isCore(), "noncore builds only");
@@ -142,7 +161,7 @@ public abstract class Frame implements Cloneable {
return (cb != null && cb.isJavaMethod());
}
- public boolean isGlueFrame() {
+ public boolean isRuntimeFrame() {
if (Assert.ASSERTS_ENABLED) {
Assert.that(!VM.getVM().isCore(), "noncore builds only");
}
@@ -197,7 +216,8 @@ public abstract class Frame implements Cloneable {
public Frame realSender(RegisterMap map) {
if (!VM.getVM().isCore()) {
Frame result = sender(map);
- while (result.isGlueFrame()) {
+ while (result.isRuntimeFrame() ||
+ result.isRicochetFrame()) {
result = result.sender(map);
}
return result;
@@ -611,6 +631,9 @@ public abstract class Frame implements Cloneable {
if (Assert.ASSERTS_ENABLED) {
Assert.that(cb != null, "sanity check");
}
+ if (cb == VM.getVM().ricochetBlob()) {
+ oopsRicochetDo(oopVisitor, regMap);
+ }
if (cb.getOopMaps() != null) {
OopMapSet.oopsDo(this, cb, regMap, oopVisitor, VM.getVM().isDebugging());
@@ -627,6 +650,10 @@ public abstract class Frame implements Cloneable {
// }
}
+ private void oopsRicochetDo (AddressVisitor oopVisitor, RegisterMap regMap) {
+ // XXX Empty for now
+ }
+
// FIXME: implement the above routines, plus add
// oops_interpreted_arguments_do and oops_compiled_arguments_do
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java
new file mode 100644
index 0000000..725dfda
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/InstanceConstructor.java
@@ -0,0 +1,64 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.runtime;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.CDebugger;
+import sun.jvm.hotspot.debugger.cdbg.ClosestSymbol;
+import sun.jvm.hotspot.debugger.cdbg.LoadObject;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.HotSpotTypeDataBase;
+
+/** Given a pointer to some memory return an appropriate wrapper.
+ Various subclasses provide different mechanisms for identifying the
+ appropriate wrapper. */
+
+abstract public class InstanceConstructor<T> {
+ /** Instantiate the most-precisely typed wrapper object available
+ for the type of the given Address. If no type in the mapping
+ matched the type of the Address, throws a WrongTypeException.
+ Returns null for a null address (similar behavior to
+ VMObjectFactory). */
+ abstract public T instantiateWrapperFor(Address addr) throws WrongTypeException;
+
+ protected WrongTypeException newWrongTypeException(Address addr) {
+ String message = "No suitable match for type of address " + addr;
+ CDebugger cdbg = VM.getVM().getDebugger().getCDebugger();
+ if (cdbg != null) {
+ // Most common case: V-table pointer is the first field
+ Address vtblPtr = addr.getAddressAt(0);
+ LoadObject lo = cdbg.loadObjectContainingPC(vtblPtr);
+ if (lo != null) {
+ ClosestSymbol symbol = lo.closestSymbolToPC(vtblPtr);
+ if (symbol != null) {
+ message += " (nearest symbol is " + symbol.getName() + ")";
+ }
+ }
+ }
+
+ return new WrongTypeException(message);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java
index 63108f7..a45cbc3 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/JavaVFrame.java
@@ -128,14 +128,14 @@ public abstract class JavaVFrame extends VFrame {
}
// dynamic part - we just compare the frame pointer
- if (! getFrame().getFP().equals(other.getFrame().getFP())) {
+ if (! getFrame().equals(other.getFrame())) {
return false;
}
return true;
}
public int hashCode() {
- return getMethod().hashCode() ^ getBCI() ^ getFrame().getFP().hashCode();
+ return getMethod().hashCode() ^ getBCI() ^ getFrame().hashCode();
}
/** Structural compare */
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java
index 78ba738..5cc5f94 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StackValue.java
@@ -100,7 +100,7 @@ public class StackValue {
public int hashCode() {
if (type == BasicType.getTObject()) {
- return handleValue.hashCode();
+ return handleValue != null ? handleValue.hashCode() : 5;
} else {
// Returns 0 for conflict type
return (int) integerValue;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java
new file mode 100644
index 0000000..c45f524
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/StaticBaseConstructor.java
@@ -0,0 +1,52 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.runtime;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.CDebugger;
+import sun.jvm.hotspot.debugger.cdbg.ClosestSymbol;
+import sun.jvm.hotspot.debugger.cdbg.LoadObject;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.HotSpotTypeDataBase;
+
+/** Instantiate wrappers for statically typed instances. */
+
+public class StaticBaseConstructor<T> extends InstanceConstructor {
+ private Class staticType;
+
+ public StaticBaseConstructor(Class<T> t) {
+ staticType = t;
+ }
+
+ /** Instantiate a wrapper using staticType */
+ public VMObject instantiateWrapperFor(Address addr) throws WrongTypeException {
+ if (addr == null) {
+ return null;
+ }
+
+ return (VMObject) VMObjectFactory.newObject(staticType, addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java
index d90d08b..44ce898 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java
@@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_x86.LinuxX86JavaThreadPDAccess;
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
import sun.jvm.hotspot.runtime.linux_sparc.LinuxSPARCJavaThreadPDAccess;
+import sun.jvm.hotspot.runtime.bsd_x86.BsdX86JavaThreadPDAccess;
+import sun.jvm.hotspot.runtime.bsd_amd64.BsdAMD64JavaThreadPDAccess;
import sun.jvm.hotspot.utilities.*;
public class Threads {
@@ -90,7 +92,12 @@ public class Threads {
} else if (cpu.equals("sparc")) {
access = new LinuxSPARCJavaThreadPDAccess();
}
-
+ } else if (os.equals("bsd")) {
+ if (cpu.equals("x86")) {
+ access = new BsdX86JavaThreadPDAccess();
+ } else if (cpu.equals("amd64")) {
+ access = new BsdAMD64JavaThreadPDAccess();
+ }
}
if (access == null) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VFrame.java
index 98591fd..ea1ec19 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VFrame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VFrame.java
@@ -77,7 +77,7 @@ public class VFrame {
return new CompiledVFrame(f, regMap, thread, scope, mayBeImprecise);
}
- if (f.isGlueFrame()) {
+ if (f.isRuntimeFrame()) {
// This is a conversion frame. Skip this frame and try again.
RegisterMap tempMap = regMap.copy();
Frame s = f.sender(tempMap);
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java
index 4d333ba..5a96a8e 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java
@@ -30,6 +30,7 @@ import java.util.*;
import java.util.regex.*;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.c1.*;
+import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.memory.*;
@@ -85,6 +86,9 @@ public class VM {
private Interpreter interpreter;
private StubRoutines stubRoutines;
private Bytes bytes;
+
+ private RicochetBlob ricochetBlob;
+
/** Flags indicating whether we are attached to a core, C1, or C2 build */
private boolean usingClientCompiler;
private boolean usingServerCompiler;
@@ -131,12 +135,14 @@ public class VM {
private String name;
private Address addr;
private String kind;
+ private int origin;
- private Flag(String type, String name, Address addr, String kind) {
+ private Flag(String type, String name, Address addr, String kind, int origin) {
this.type = type;
this.name = name;
this.addr = addr;
this.kind = kind;
+ this.origin = origin;
}
public String getType() {
@@ -155,6 +161,10 @@ public class VM {
return kind;
}
+ public int getOrigin() {
+ return origin;
+ }
+
public boolean isBool() {
return type.equals("bool");
}
@@ -300,7 +310,7 @@ public class VM {
usingServerCompiler = false;
} else {
// Determine whether C2 is present
- if (type.getField("_interpreter_invocation_count", false, false) != null) {
+ if (db.lookupType("Matcher", false) != null) {
usingServerCompiler = true;
} else {
usingClientCompiler = true;
@@ -618,6 +628,18 @@ public class VM {
return stubRoutines;
}
+ public RicochetBlob ricochetBlob() {
+ if (ricochetBlob == null) {
+ Type ricochetType = db.lookupType("SharedRuntime");
+ AddressField ricochetBlobAddress = ricochetType.getAddressField("_ricochet_blob");
+ Address addr = ricochetBlobAddress.getValue();
+ if (addr != null) {
+ ricochetBlob = new RicochetBlob(addr);
+ }
+ }
+ return ricochetBlob;
+ }
+
public VMRegImpl getVMRegImplInfo() {
if (vmregImpl == null) {
vmregImpl = new VMRegImpl();
@@ -788,42 +810,40 @@ public class VM {
private void readCommandLineFlags() {
// get command line flags
TypeDataBase db = getTypeDataBase();
- try {
- Type flagType = db.lookupType("Flag");
- int numFlags = (int) flagType.getCIntegerField("numFlags").getValue();
- // NOTE: last flag contains null values.
- commandLineFlags = new Flag[numFlags - 1];
-
- Address flagAddr = flagType.getAddressField("flags").getValue();
-
- AddressField typeFld = flagType.getAddressField("type");
- AddressField nameFld = flagType.getAddressField("name");
- AddressField addrFld = flagType.getAddressField("addr");
- AddressField kindFld = flagType.getAddressField("kind");
-
- long flagSize = flagType.getSize(); // sizeof(Flag)
-
- // NOTE: last flag contains null values.
- for (int f = 0; f < numFlags - 1; f++) {
- String type = CStringUtilities.getString(typeFld.getValue(flagAddr));
- String name = CStringUtilities.getString(nameFld.getValue(flagAddr));
- Address addr = addrFld.getValue(flagAddr);
- String kind = CStringUtilities.getString(kindFld.getValue(flagAddr));
- commandLineFlags[f] = new Flag(type, name, addr, kind);
- flagAddr = flagAddr.addOffsetTo(flagSize);
- }
-
- // sort flags by name
- Arrays.sort(commandLineFlags, new Comparator() {
- public int compare(Object o1, Object o2) {
- Flag f1 = (Flag) o1;
- Flag f2 = (Flag) o2;
- return f1.getName().compareTo(f2.getName());
- }
- });
- } catch (Exception exp) {
- // ignore. may be older version. command line flags not available.
- }
+ Type flagType = db.lookupType("Flag");
+ int numFlags = (int) flagType.getCIntegerField("numFlags").getValue();
+ // NOTE: last flag contains null values.
+ commandLineFlags = new Flag[numFlags - 1];
+
+ Address flagAddr = flagType.getAddressField("flags").getValue();
+
+ AddressField typeFld = flagType.getAddressField("type");
+ AddressField nameFld = flagType.getAddressField("name");
+ AddressField addrFld = flagType.getAddressField("addr");
+ AddressField kindFld = flagType.getAddressField("kind");
+ CIntField originFld = new CIntField(flagType.getCIntegerField("origin"), 0);
+
+ long flagSize = flagType.getSize(); // sizeof(Flag)
+
+ // NOTE: last flag contains null values.
+ for (int f = 0; f < numFlags - 1; f++) {
+ String type = CStringUtilities.getString(typeFld.getValue(flagAddr));
+ String name = CStringUtilities.getString(nameFld.getValue(flagAddr));
+ Address addr = addrFld.getValue(flagAddr);
+ String kind = CStringUtilities.getString(kindFld.getValue(flagAddr));
+ int origin = (int)originFld.getValue(flagAddr);
+ commandLineFlags[f] = new Flag(type, name, addr, kind, origin);
+ flagAddr = flagAddr.addOffsetTo(flagSize);
+ }
+
+ // sort flags by name
+ Arrays.sort(commandLineFlags, new Comparator() {
+ public int compare(Object o1, Object o2) {
+ Flag f1 = (Flag) o1;
+ Flag f2 = (Flag) o2;
+ return f1.getName().compareTo(f2.getName());
+ }
+ });
}
public String getSystemProperty(String key) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java
new file mode 100644
index 0000000..a73ce12
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualBaseConstructor.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2000, 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.
+ *
+ */
+
+package sun.jvm.hotspot.runtime;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.cdbg.CDebugger;
+import sun.jvm.hotspot.debugger.cdbg.ClosestSymbol;
+import sun.jvm.hotspot.debugger.cdbg.LoadObject;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.HotSpotTypeDataBase;
+
+/** This provides a factory to create instances where the base virtual
+ * type is know and the expected subclasses are within a particular
+ * package. */
+
+public class VirtualBaseConstructor<T> extends InstanceConstructor {
+ private TypeDataBase db;
+ private HashMap map; // Map<String, Class>
+ private Type baseType;
+ private Class unknownTypeHandler;
+
+ public VirtualBaseConstructor(TypeDataBase db, Type baseType, String packageName, Class unknownTypeHandler) {
+ this.db = (HotSpotTypeDataBase)db;
+ map = new HashMap();
+ this.baseType = baseType;
+ this.unknownTypeHandler = unknownTypeHandler;
+ // Try to find mirror types for each of the types. If there isn't
+ // a direct mirror then try to find an instantiable superclass and
+ // treat it as that.
+ for (Iterator iter = db.getTypes(); iter.hasNext(); ) {
+ Type t = (Type) iter.next();
+ Type superType = t;
+ while (superType != null && superType != baseType) {
+ superType = superType.getSuperclass();
+ }
+ if (superType == baseType) {
+ superType = t;
+ Class c = null;
+ while (c == null && superType != null) {
+ try {
+ c = Class.forName(packageName + "." + superType.getName());
+ } catch (Exception e) {
+ }
+ if (c == null) superType = superType.getSuperclass();
+ }
+ if (c == null) {
+ c = unknownTypeHandler;
+ }
+ map.put(t.getName(), c);
+ }
+ }
+ }
+
+ /** Instantiate the most-precisely typed wrapper object available
+ for the type of the given Address. If no type in the mapping
+ matched the type of the Address, throws a WrongTypeException.
+ Returns null for a null address (similar behavior to
+ VMObjectFactory). */
+ public VMObject instantiateWrapperFor(Address addr) throws WrongTypeException {
+ if (addr == null) {
+ return null;
+ }
+
+ Type type = db.findDynamicTypeForAddress(addr, baseType);
+ if (type != null) {
+ return (VMObject) VMObjectFactory.newObject((Class) map.get(type.getName()), addr);
+ } else if (unknownTypeHandler != null) {
+ return (VMObject) VMObjectFactory.newObject(unknownTypeHandler, addr);
+ }
+
+ throw newWrongTypeException(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java
index 4e45a3c..acca167 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/VirtualConstructor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -26,7 +26,6 @@ package sun.jvm.hotspot.runtime;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.types.*;
/** This class provides generalized "virtual constructor"
@@ -39,7 +38,7 @@ import sun.jvm.hotspot.types.*;
type "DefNewGeneration" to class
sun.jvm.hotspot.memory.DefNewGeneration has been set up. */
-public class VirtualConstructor {
+public class VirtualConstructor extends InstanceConstructor<VMObject> {
private TypeDataBase db;
private Map map; // Map<String, Class>
@@ -78,20 +77,6 @@ public class VirtualConstructor {
}
}
- String message = "No suitable match for type of address " + addr;
- CDebugger cdbg = VM.getVM().getDebugger().getCDebugger();
- if (cdbg != null) {
- // Most common case: V-table pointer is the first field
- Address vtblPtr = addr.getAddressAt(0);
- LoadObject lo = cdbg.loadObjectContainingPC(vtblPtr);
- if (lo != null) {
- ClosestSymbol symbol = lo.closestSymbolToPC(vtblPtr);
- if (symbol != null) {
- message += " (nearest symbol is " + symbol.getName() + ")";
- }
- }
- }
-
- throw new WrongTypeException(message);
+ throw newWrongTypeException(addr);
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
index c5e4e63..6acf0d9 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/amd64/AMD64CurrentFrameGuess.java
@@ -29,6 +29,7 @@ import sun.jvm.hotspot.debugger.amd64.*;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.interpreter.*;
import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.x86.*;
/** <P> Should be able to be used on all amd64 platforms we support
(Linux/amd64) to implement JavaThread's
@@ -123,7 +124,7 @@ public class AMD64CurrentFrameGuess {
offset += vm.getAddressSize()) {
try {
Address curSP = sp.addOffsetTo(offset);
- Frame frame = new AMD64Frame(curSP, null, pc);
+ Frame frame = new X86Frame(curSP, null, pc);
RegisterMap map = thread.newRegisterMap(false);
while (frame != null) {
if (frame.isEntryFrame() && frame.entryFrameIsFirst()) {
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java
new file mode 100644
index 0000000..6887c47
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.bsd;
+
+public class BsdSignals {
+ private static String[] signalNames = {
+ "", /* No signal 0 */
+ "SIGHUP", /* hangup */
+ "SIGINT", /* interrupt */
+ "SIGQUIT", /* quit */
+ "SIGILL", /* illegal instr. (not reset when caught) */
+ "SIGTRAP", /* trace trap (not reset when caught) */
+ "SIGABRT", /* abort() */
+ "SIGEMT", /* EMT instruction */
+ "SIGFPE", /* floating point exception */
+ "SIGKILL", /* kill (cannot be caught or ignored) */
+ "SIGBUS", /* bus error */
+ "SIGSEGV", /* segmentation violation */
+ "SIGSYS", /* non-existent system call invoked */
+ "SIGPIPE", /* write on a pipe with no one to read it */
+ "SIGALRM", /* alarm clock */
+ "SIGTERM", /* software termination signal from kill */
+ "SIGURG", /* urgent condition on IO channel */
+ "SIGSTOP", /* sendable stop signal not from tty */
+ "SIGTSTP", /* stop signal from tty */
+ "SIGCONT", /* continue a stopped process */
+ "SIGCHLD", /* to parent on child stop or exit */
+ "SIGTTIN", /* to readers pgrp upon background tty read */
+ "SIGTTOU", /* like TTIN if (tp->t_local<OSTOP) */
+ "SIGIO", /* input/output possible signal */
+ "SIGXCPU", /* exceeded CPU time limit */
+ "SIGXFSZ", /* exceeded file size limit */
+ "SIGVTALRM", /* virtual time alarm */
+ "SIGPROF", /* profiling time alarm */
+ "SIGWINCH", /* window size changes */
+ "SIGINFO", /* information request */
+ "SIGUSR1", /* user defined signal 1 */
+ "SIGUSR2" /* user defined signal 2 */
+ };
+
+ public static String getSignalName(int sigNum) {
+ if ((sigNum <= 0) || (sigNum >= signalNames.length)) {
+ // Probably best to fail in a non-destructive way
+ return "<Error: Illegal signal number " + sigNum + ">";
+ }
+ return signalNames[sigNum];
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
new file mode 100644
index 0000000..c0de138
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_amd64/BsdAMD64JavaThreadPDAccess.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.bsd_amd64;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.amd64.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.amd64.*;
+import sun.jvm.hotspot.runtime.x86.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+public class BsdAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
+ private static AddressField lastJavaFPField;
+ private static AddressField osThreadField;
+
+ // Field from OSThread
+ private static CIntegerField osThreadThreadIDField;
+
+ // This is currently unneeded but is being kept in case we change
+ // the currentFrameGuess algorithm
+ private static final long GUESS_SCAN_RANGE = 128 * 1024;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("JavaThread");
+ osThreadField = type.getAddressField("_osthread");
+
+ Type anchorType = db.lookupType("JavaFrameAnchor");
+ lastJavaFPField = anchorType.getAddressField("_last_Java_fp");
+
+ Type osThreadType = db.lookupType("OSThread");
+ osThreadThreadIDField = osThreadType.getCIntegerField("_thread_id");
+ }
+
+ public Address getLastJavaFP(Address addr) {
+ return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset()));
+ }
+
+ public Address getLastJavaPC(Address addr) {
+ return null;
+ }
+
+ public Address getBaseOfStackPointer(Address addr) {
+ return null;
+ }
+
+ public Frame getLastFramePD(JavaThread thread, Address addr) {
+ Address fp = thread.getLastJavaFP();
+ if (fp == null) {
+ return null; // no information
+ }
+ return new X86Frame(thread.getLastJavaSP(), fp);
+ }
+
+ public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
+ return new X86RegisterMap(thread, updateMap);
+ }
+
+ public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
+ ThreadProxy t = getThreadProxy(addr);
+ AMD64ThreadContext context = (AMD64ThreadContext) t.getContext();
+ AMD64CurrentFrameGuess guesser = new AMD64CurrentFrameGuess(context, thread);
+ if (!guesser.run(GUESS_SCAN_RANGE)) {
+ return null;
+ }
+ if (guesser.getPC() == null) {
+ return new X86Frame(guesser.getSP(), guesser.getFP());
+ } else {
+ return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+ }
+ }
+
+ public void printThreadIDOn(Address addr, PrintStream tty) {
+ tty.print(getThreadProxy(addr));
+ }
+
+ public void printInfoOn(Address threadAddr, PrintStream tty) {
+ tty.print("Thread id: ");
+ printThreadIDOn(threadAddr, tty);
+// tty.println("\nPostJavaState: " + getPostJavaState(threadAddr));
+ }
+
+ public Address getLastSP(Address addr) {
+ ThreadProxy t = getThreadProxy(addr);
+ AMD64ThreadContext context = (AMD64ThreadContext) t.getContext();
+ return context.getRegisterAsAddress(AMD64ThreadContext.RSP);
+ }
+
+ public ThreadProxy getThreadProxy(Address addr) {
+ // Addr is the address of the JavaThread.
+ // Fetch the OSThread (for now and for simplicity, not making a
+ // separate "OSThread" class in this package)
+ Address osThreadAddr = osThreadField.getValue(addr);
+ // Get the address of the _thread_id from the OSThread
+ Address threadIdAddr = osThreadAddr.addOffsetTo(osThreadThreadIDField.getOffset());
+
+ JVMDebugger debugger = VM.getVM().getDebugger();
+ return debugger.getThreadForIdentifierAddress(threadIdAddr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
new file mode 100644
index 0000000..703a097
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.bsd_x86;
+
+public class BsdSignals {
+ private static String[] signalNames = {
+ "", /* No signal 0 */
+ "SIGHUP", /* hangup */
+ "SIGINT", /* interrupt */
+ "SIGQUIT", /* quit */
+ "SIGILL", /* illegal instr. (not reset when caught) */
+ "SIGTRAP", /* trace trap (not reset when caught) */
+ "SIGABRT", /* abort() */
+ "SIGEMT", /* EMT instruction */
+ "SIGFPE", /* floating point exception */
+ "SIGKILL", /* kill (cannot be caught or ignored) */
+ "SIGBUS", /* bus error */
+ "SIGSEGV", /* segmentation violation */
+ "SIGSYS", /* non-existent system call invoked */
+ "SIGPIPE", /* write on a pipe with no one to read it */
+ "SIGALRM", /* alarm clock */
+ "SIGTERM", /* software termination signal from kill */
+ "SIGURG", /* urgent condition on IO channel */
+ "SIGSTOP", /* sendable stop signal not from tty */
+ "SIGTSTP", /* stop signal from tty */
+ "SIGCONT", /* continue a stopped process */
+ "SIGCHLD", /* to parent on child stop or exit */
+ "SIGTTIN", /* to readers pgrp upon background tty read */
+ "SIGTTOU", /* like TTIN if (tp->t_local<OSTOP) */
+ "SIGIO", /* input/output possible signal */
+ "SIGXCPU", /* exceeded CPU time limit */
+ "SIGXFSZ", /* exceeded file size limit */
+ "SIGVTALRM", /* virtual time alarm */
+ "SIGPROF", /* profiling time alarm */
+ "SIGWINCH", /* window size changes */
+ "SIGINFO", /* information request */
+ "SIGUSR1", /* user defined signal 1 */
+ "SIGUSR2" /* user defined signal 2 */
+ };
+
+ public static String getSignalName(int sigNum) {
+ if ((sigNum <= 0) || (sigNum >= signalNames.length)) {
+ // Probably best to fail in a non-destructive way
+ return "<Error: Illegal signal number " + sigNum + ">";
+ }
+ return signalNames[sigNum];
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java
new file mode 100644
index 0000000..a32f0be
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdX86JavaThreadPDAccess.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.bsd_x86;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.debugger.x86.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.runtime.x86.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+public class BsdX86JavaThreadPDAccess implements JavaThreadPDAccess {
+ private static AddressField lastJavaFPField;
+ private static AddressField osThreadField;
+
+ // Field from OSThread
+ private static CIntegerField osThreadThreadIDField;
+
+ // This is currently unneeded but is being kept in case we change
+ // the currentFrameGuess algorithm
+ private static final long GUESS_SCAN_RANGE = 128 * 1024;
+
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) {
+ Type type = db.lookupType("JavaThread");
+ osThreadField = type.getAddressField("_osthread");
+
+ Type anchorType = db.lookupType("JavaFrameAnchor");
+ lastJavaFPField = anchorType.getAddressField("_last_Java_fp");
+
+ Type osThreadType = db.lookupType("OSThread");
+ osThreadThreadIDField = osThreadType.getCIntegerField("_thread_id");
+ }
+
+ public Address getLastJavaFP(Address addr) {
+ return lastJavaFPField.getValue(addr.addOffsetTo(sun.jvm.hotspot.runtime.JavaThread.getAnchorField().getOffset()));
+ }
+
+ public Address getLastJavaPC(Address addr) {
+ return null;
+ }
+
+ public Address getBaseOfStackPointer(Address addr) {
+ return null;
+ }
+
+ public Frame getLastFramePD(JavaThread thread, Address addr) {
+ Address fp = thread.getLastJavaFP();
+ if (fp == null) {
+ return null; // no information
+ }
+ return new X86Frame(thread.getLastJavaSP(), fp);
+ }
+
+ public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
+ return new X86RegisterMap(thread, updateMap);
+ }
+
+ public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
+ ThreadProxy t = getThreadProxy(addr);
+ X86ThreadContext context = (X86ThreadContext) t.getContext();
+ X86CurrentFrameGuess guesser = new X86CurrentFrameGuess(context, thread);
+ if (!guesser.run(GUESS_SCAN_RANGE)) {
+ return null;
+ }
+ if (guesser.getPC() == null) {
+ return new X86Frame(guesser.getSP(), guesser.getFP());
+ } else {
+ return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+ }
+ }
+
+ public void printThreadIDOn(Address addr, PrintStream tty) {
+ tty.print(getThreadProxy(addr));
+ }
+
+ public void printInfoOn(Address threadAddr, PrintStream tty) {
+ tty.print("Thread id: ");
+ printThreadIDOn(threadAddr, tty);
+// tty.println("\nPostJavaState: " + getPostJavaState(threadAddr));
+ }
+
+ public Address getLastSP(Address addr) {
+ ThreadProxy t = getThreadProxy(addr);
+ X86ThreadContext context = (X86ThreadContext) t.getContext();
+ return context.getRegisterAsAddress(X86ThreadContext.ESP);
+ }
+
+ public ThreadProxy getThreadProxy(Address addr) {
+ // Addr is the address of the JavaThread.
+ // Fetch the OSThread (for now and for simplicity, not making a
+ // separate "OSThread" class in this package)
+ Address osThreadAddr = osThreadField.getValue(addr);
+ // Get the address of the _thread_id from the OSThread
+ Address threadIdAddr = osThreadAddr.addOffsetTo(osThreadThreadIDField.getOffset());
+
+ JVMDebugger debugger = VM.getVM().getDebugger();
+ return debugger.getThreadForIdentifierAddress(threadIdAddr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
index ea025da..89fcb12 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/linux_amd64/LinuxAMD64JavaThreadPDAccess.java
@@ -30,6 +30,7 @@ import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.debugger.amd64.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.runtime.amd64.*;
+import sun.jvm.hotspot.runtime.x86.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
@@ -80,11 +81,11 @@ public class LinuxAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
if (fp == null) {
return null; // no information
}
- return new AMD64Frame(thread.getLastJavaSP(), fp);
+ return new X86Frame(thread.getLastJavaSP(), fp);
}
public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
- return new AMD64RegisterMap(thread, updateMap);
+ return new X86RegisterMap(thread, updateMap);
}
public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
@@ -95,9 +96,9 @@ public class LinuxAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
return null;
}
if (guesser.getPC() == null) {
- return new AMD64Frame(guesser.getSP(), guesser.getFP());
+ return new X86Frame(guesser.getSP(), guesser.getFP());
} else {
- return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+ return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java
index d3c307c..6891040 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/solaris_amd64/SolarisAMD64JavaThreadPDAccess.java
@@ -30,6 +30,7 @@ import sun.jvm.hotspot.debugger.*;
import sun.jvm.hotspot.debugger.amd64.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.runtime.amd64.*;
+import sun.jvm.hotspot.runtime.x86.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
@@ -84,14 +85,14 @@ public class SolarisAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
}
Address pc = thread.getLastJavaPC();
if ( pc != null ) {
- return new AMD64Frame(thread.getLastJavaSP(), fp, pc);
+ return new X86Frame(thread.getLastJavaSP(), fp, pc);
} else {
- return new AMD64Frame(thread.getLastJavaSP(), fp);
+ return new X86Frame(thread.getLastJavaSP(), fp);
}
}
public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
- return new AMD64RegisterMap(thread, updateMap);
+ return new X86RegisterMap(thread, updateMap);
}
public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
@@ -102,9 +103,9 @@ public class SolarisAMD64JavaThreadPDAccess implements JavaThreadPDAccess {
return null;
}
if (guesser.getPC() == null) {
- return new AMD64Frame(guesser.getSP(), guesser.getFP());
+ return new X86Frame(guesser.getSP(), guesser.getFP());
} else {
- return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+ return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java
index 5523f35..3d55dab 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCFrame.java
@@ -236,7 +236,7 @@ public class SPARCFrame extends Frame {
CodeBlob cb = VM.getVM().getCodeCache().findBlob(pc);
if (cb != null && cb.isJavaMethod()) {
NMethod nm = (NMethod) cb;
- if (pc.equals(nm.deoptBegin())) {
+ if (pc.equals(nm.deoptHandlerBegin())) {
// adjust pc if frame is deoptimized.
pc = this.getUnextendedSP().getAddressAt(nm.origPCOffset());
deoptimized = true;
@@ -559,49 +559,46 @@ public class SPARCFrame extends Frame {
}
}
- if (!VM.getVM().isCore()) {
- // Note: The version of this operation on any platform with callee-save
- // registers must update the register map (if not null).
- // In order to do this correctly, the various subtypes of
- // of frame (interpreted, compiled, glue, native),
- // must be distinguished. There is no need on SPARC for
- // such distinctions, because all callee-save registers are
- // preserved for all frames via SPARC-specific mechanisms.
- //
- // *** HOWEVER, *** if and when we make any floating-point
- // registers callee-saved, then we will have to copy over
- // the RegisterMap update logic from the Intel code.
-
-
- // The constructor of the sender must know whether this frame is interpreted so it can set the
- // sender's _interpreter_sp_adjustment field.
- if (VM.getVM().getInterpreter().contains(pc)) {
- isInterpreted = true;
- map.makeIntegerRegsUnsaved();
+ // Note: The version of this operation on any platform with callee-save
+ // registers must update the register map (if not null).
+ // In order to do this correctly, the various subtypes of
+ // of frame (interpreted, compiled, glue, native),
+ // must be distinguished. There is no need on SPARC for
+ // such distinctions, because all callee-save registers are
+ // preserved for all frames via SPARC-specific mechanisms.
+ //
+ // *** HOWEVER, *** if and when we make any floating-point
+ // registers callee-saved, then we will have to copy over
+ // the RegisterMap update logic from the Intel code.
+
+ if (isRicochetFrame()) return senderForRicochetFrame(map);
+
+ // The constructor of the sender must know whether this frame is interpreted so it can set the
+ // sender's _interpreter_sp_adjustment field.
+ if (VM.getVM().getInterpreter().contains(pc)) {
+ isInterpreted = true;
+ map.makeIntegerRegsUnsaved();
+ map.shiftWindow(sp, youngerSP);
+ } else {
+ // Find a CodeBlob containing this frame's pc or elide the lookup and use the
+ // supplied blob which is already known to be associated with this frame.
+ cb = VM.getVM().getCodeCache().findBlob(pc);
+ if (cb != null) {
+ // Update the location of all implicitly saved registers
+ // as the address of these registers in the register save
+ // area (for %o registers we use the address of the %i
+ // register in the next younger frame)
map.shiftWindow(sp, youngerSP);
- } else {
- // Find a CodeBlob containing this frame's pc or elide the lookup and use the
- // supplied blob which is already known to be associated with this frame.
- cb = VM.getVM().getCodeCache().findBlob(pc);
- if (cb != null) {
-
- if (cb.callerMustGCArguments(map.getThread())) {
+ if (map.getUpdateMap()) {
+ if (cb.callerMustGCArguments()) {
map.setIncludeArgumentOops(true);
}
-
- // Update the location of all implicitly saved registers
- // as the address of these registers in the register save
- // area (for %o registers we use the address of the %i
- // register in the next younger frame)
- map.shiftWindow(sp, youngerSP);
- if (map.getUpdateMap()) {
- if (cb.getOopMaps() != null) {
- OopMapSet.updateRegisterMap(this, cb, map, VM.getVM().isDebugging());
- }
+ if (cb.getOopMaps() != null) {
+ OopMapSet.updateRegisterMap(this, cb, map, VM.getVM().isDebugging());
}
}
}
- } // #ifndef CORE
+ }
return new SPARCFrame(biasSP(sp), biasSP(youngerSP), isInterpreted);
}
@@ -948,6 +945,20 @@ public class SPARCFrame extends Frame {
}
+ private Frame senderForRicochetFrame(SPARCRegisterMap map) {
+ if (DEBUG) {
+ System.out.println("senderForRicochetFrame");
+ }
+ //RicochetFrame* f = RicochetFrame::from_frame(fr);
+ // Cf. is_interpreted_frame path of frame::sender
+ Address youngerSP = getSP();
+ Address sp = getSenderSP();
+ map.makeIntegerRegsUnsaved();
+ map.shiftWindow(sp, youngerSP);
+ boolean thisFrameAdjustedStack = true; // I5_savedSP is live in this RF
+ return new SPARCFrame(sp, youngerSP, thisFrameAdjustedStack);
+ }
+
private Frame senderForEntryFrame(RegisterMap regMap) {
SPARCRegisterMap map = (SPARCRegisterMap) regMap;
@@ -965,10 +976,8 @@ public class SPARCFrame extends Frame {
Address lastJavaPC = jcw.getLastJavaPC();
map.clear();
- if (!VM.getVM().isCore()) {
- map.makeIntegerRegsUnsaved();
- map.shiftWindow(lastJavaSP, null);
- }
+ map.makeIntegerRegsUnsaved();
+ map.shiftWindow(lastJavaSP, null);
if (Assert.ASSERTS_ENABLED) {
Assert.that(map.getIncludeArgumentOops(), "should be set by clear");
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java
new file mode 100644
index 0000000..57fa927
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/sparc/SPARCRicochetFrame.java
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.sparc;
+
+import java.util.*;
+import sun.jvm.hotspot.asm.sparc.SPARCRegister;
+import sun.jvm.hotspot.asm.sparc.SPARCRegisters;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+
+public class SPARCRicochetFrame {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private SPARCFrame frame;
+
+ private static void initialize(TypeDataBase db) {
+ // Type type = db.lookupType("MethodHandles::RicochetFrame");
+
+ }
+
+ static SPARCRicochetFrame fromFrame(SPARCFrame f) {
+ return new SPARCRicochetFrame(f);
+ }
+
+ private SPARCRicochetFrame(SPARCFrame f) {
+ frame = f;
+ }
+
+ private Address registerValue(SPARCRegister reg) {
+ return frame.getSP().addOffsetTo(reg.spOffsetInSavedWindow()).getAddressAt(0);
+ }
+
+ public Address savedArgsBase() {
+ return registerValue(SPARCRegisters.L4);
+ }
+ public Address exactSenderSP() {
+ return registerValue(SPARCRegisters.I5);
+ }
+ public Address senderLink() {
+ return frame.getSenderSP();
+ }
+ public Address senderPC() {
+ return frame.getSenderPC();
+ }
+ public Address extendedSenderSP() {
+ return savedArgsBase();
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java
new file mode 100644
index 0000000..650f612
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/vmSymbols.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.runtime;
+
+import java.io.*;
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.memory.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+import sun.jvm.hotspot.utilities.*;
+
+
+public class vmSymbols {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static Address symbolsAddress;
+ private static int FIRST_SID;
+ private static int SID_LIMIT;
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("vmSymbols");
+ symbolsAddress = type.getAddressField("_symbols[0]").getStaticFieldAddress();
+ FIRST_SID = db.lookupIntConstant("vmSymbols::FIRST_SID");
+ SID_LIMIT = db.lookupIntConstant("vmSymbols::SID_LIMIT");
+ }
+
+ public static Symbol symbolAt(int id) {
+ if (id < FIRST_SID || id >= SID_LIMIT) throw new IndexOutOfBoundsException("bad SID " + id);
+ return Symbol.create(symbolsAddress.getAddressAt(id * VM.getVM().getAddressSize()));
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
index 76a686f..e18dd4f 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64/Win32AMD64JavaThreadPDAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -27,10 +27,10 @@ package sun.jvm.hotspot.runtime.win32_amd64;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.win32.*;
import sun.jvm.hotspot.debugger.amd64.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.runtime.amd64.*;
+import sun.jvm.hotspot.runtime.x86.*;
import sun.jvm.hotspot.types.*;
import sun.jvm.hotspot.utilities.*;
@@ -86,14 +86,14 @@ public class Win32AMD64JavaThreadPDAccess implements JavaThreadPDAccess {
}
Address pc = thread.getLastJavaPC();
if ( pc != null ) {
- return new AMD64Frame(thread.getLastJavaSP(), fp, pc);
+ return new X86Frame(thread.getLastJavaSP(), fp, pc);
} else {
- return new AMD64Frame(thread.getLastJavaSP(), fp);
+ return new X86Frame(thread.getLastJavaSP(), fp);
}
}
public RegisterMap newRegisterMap(JavaThread thread, boolean updateMap) {
- return new AMD64RegisterMap(thread, updateMap);
+ return new X86RegisterMap(thread, updateMap);
}
public Frame getCurrentFrameGuess(JavaThread thread, Address addr) {
@@ -104,9 +104,9 @@ public class Win32AMD64JavaThreadPDAccess implements JavaThreadPDAccess {
return null;
}
if (guesser.getPC() == null) {
- return new AMD64Frame(guesser.getSP(), guesser.getFP());
+ return new X86Frame(guesser.getSP(), guesser.getFP());
} else {
- return new AMD64Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
+ return new X86Frame(guesser.getSP(), guesser.getFP(), guesser.getPC());
}
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java
index 0a038e9..dff6615 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86/Win32X86JavaThreadPDAccess.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -27,7 +27,6 @@ package sun.jvm.hotspot.runtime.win32_x86;
import java.io.*;
import java.util.*;
import sun.jvm.hotspot.debugger.*;
-import sun.jvm.hotspot.debugger.win32.*;
import sun.jvm.hotspot.debugger.x86.*;
import sun.jvm.hotspot.runtime.*;
import sun.jvm.hotspot.runtime.x86.*;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java
index f824218..41ef832 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86Frame.java
@@ -25,7 +25,6 @@
package sun.jvm.hotspot.runtime.x86;
import java.util.*;
-import sun.jvm.hotspot.asm.x86.*;
import sun.jvm.hotspot.code.*;
import sun.jvm.hotspot.compiler.*;
import sun.jvm.hotspot.debugger.*;
@@ -62,11 +61,13 @@ public class X86Frame extends Frame {
private static int INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET;
// Entry frames
- private static final int ENTRY_FRAME_CALL_WRAPPER_OFFSET = 2;
+ private static int ENTRY_FRAME_CALL_WRAPPER_OFFSET;
// Native frames
private static final int NATIVE_FRAME_INITIAL_PARAM_OFFSET = 2;
+ private static VMReg rbp;
+
static {
VM.registerVMInitializedObserver(new Observer() {
public void update(Observable o, Object data) {
@@ -76,19 +77,23 @@ public class X86Frame extends Frame {
}
private static synchronized void initialize(TypeDataBase db) {
- if (VM.getVM().isCore()) {
- INTERPRETER_FRAME_CACHE_OFFSET = INTERPRETER_FRAME_METHOD_OFFSET - 1;
- } else {
- INTERPRETER_FRAME_MDX_OFFSET = INTERPRETER_FRAME_METHOD_OFFSET - 1;
- INTERPRETER_FRAME_CACHE_OFFSET = INTERPRETER_FRAME_MDX_OFFSET - 1;
- }
+ INTERPRETER_FRAME_MDX_OFFSET = INTERPRETER_FRAME_METHOD_OFFSET - 1;
+ INTERPRETER_FRAME_CACHE_OFFSET = INTERPRETER_FRAME_MDX_OFFSET - 1;
INTERPRETER_FRAME_LOCALS_OFFSET = INTERPRETER_FRAME_CACHE_OFFSET - 1;
INTERPRETER_FRAME_BCX_OFFSET = INTERPRETER_FRAME_LOCALS_OFFSET - 1;
INTERPRETER_FRAME_INITIAL_SP_OFFSET = INTERPRETER_FRAME_BCX_OFFSET - 1;
INTERPRETER_FRAME_MONITOR_BLOCK_TOP_OFFSET = INTERPRETER_FRAME_INITIAL_SP_OFFSET;
INTERPRETER_FRAME_MONITOR_BLOCK_BOTTOM_OFFSET = INTERPRETER_FRAME_INITIAL_SP_OFFSET;
+
+ ENTRY_FRAME_CALL_WRAPPER_OFFSET = db.lookupIntConstant("frame::entry_frame_call_wrapper_offset");
+ if (VM.getVM().getAddressSize() == 4) {
+ rbp = new VMReg(5);
+ } else {
+ rbp = new VMReg(5 << 1);
+ }
}
+
// an additional field beyond sp and pc:
Address raw_fp; // frame pointer
private Address raw_unextendedSP;
@@ -102,7 +107,7 @@ public class X86Frame extends Frame {
CodeBlob cb = VM.getVM().getCodeCache().findBlob(pc);
if (cb != null && cb.isJavaMethod()) {
NMethod nm = (NMethod) cb;
- if (pc.equals(nm.deoptBegin())) {
+ if (pc.equals(nm.deoptHandlerBegin())) {
if (Assert.ASSERTS_ENABLED) {
Assert.that(this.getUnextendedSP() != null, "null SP in Java frame");
}
@@ -119,6 +124,7 @@ public class X86Frame extends Frame {
this.raw_unextendedSP = raw_sp;
this.raw_fp = raw_fp;
this.pc = pc;
+ adjustUnextendedSP();
// Frame must be fully constructed before this call
adjustForDeopt();
@@ -134,6 +140,7 @@ public class X86Frame extends Frame {
this.raw_unextendedSP = raw_sp;
this.raw_fp = raw_fp;
this.pc = raw_sp.getAddressAt(-1 * VM.getVM().getAddressSize());
+ adjustUnextendedSP();
// Frame must be fully constructed before this call
adjustForDeopt();
@@ -144,24 +151,18 @@ public class X86Frame extends Frame {
}
}
- // This constructor should really take the unextended SP as an arg
- // but then the constructor is ambiguous with constructor that takes
- // a PC so take an int and convert it.
- public X86Frame(Address raw_sp, Address raw_fp, long extension) {
+ public X86Frame(Address raw_sp, Address raw_unextendedSp, Address raw_fp, Address pc) {
this.raw_sp = raw_sp;
- if (raw_sp == null) {
- this.raw_unextendedSP = null;
- } else {
- this.raw_unextendedSP = raw_sp.addOffsetTo(extension);
- }
+ this.raw_unextendedSP = raw_unextendedSp;
this.raw_fp = raw_fp;
- this.pc = raw_sp.getAddressAt(-1 * VM.getVM().getAddressSize());
+ this.pc = pc;
+ adjustUnextendedSP();
// Frame must be fully constructed before this call
adjustForDeopt();
if (DEBUG) {
- System.out.println("X86Frame(sp, fp): " + this);
+ System.out.println("X86Frame(sp, unextendedSP, fp, pc): " + this);
dumpStack();
}
@@ -172,7 +173,6 @@ public class X86Frame extends Frame {
frame.raw_sp = raw_sp;
frame.raw_unextendedSP = raw_unextendedSP;
frame.raw_fp = raw_fp;
- frame.raw_fp = raw_fp;
frame.pc = pc;
frame.deoptimized = deoptimized;
return frame;
@@ -269,19 +269,18 @@ public class X86Frame extends Frame {
if (isEntryFrame()) return senderForEntryFrame(map);
if (isInterpretedFrame()) return senderForInterpreterFrame(map);
+ if (isRicochetFrame()) return senderForRicochetFrame(map);
- if (!VM.getVM().isCore()) {
- if(cb == null) {
- cb = VM.getVM().getCodeCache().findBlob(getPC());
- } else {
- if (Assert.ASSERTS_ENABLED) {
- Assert.that(cb.equals(VM.getVM().getCodeCache().findBlob(getPC())), "Must be the same");
- }
+ if(cb == null) {
+ cb = VM.getVM().getCodeCache().findBlob(getPC());
+ } else {
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(cb.equals(VM.getVM().getCodeCache().findBlob(getPC())), "Must be the same");
}
+ }
- if (cb != null) {
- return senderForCompiledFrame(map, cb);
- }
+ if (cb != null) {
+ return senderForCompiledFrame(map, cb);
}
// Must be native-compiled frame, i.e. the marshaling code for native
@@ -289,7 +288,20 @@ public class X86Frame extends Frame {
return new X86Frame(getSenderSP(), getLink(), getSenderPC());
}
+ private Frame senderForRicochetFrame(X86RegisterMap map) {
+ if (DEBUG) {
+ System.out.println("senderForRicochetFrame");
+ }
+ X86RicochetFrame f = X86RicochetFrame.fromFrame(this);
+ if (map.getUpdateMap())
+ updateMapWithSavedLink(map, f.senderLinkAddress());
+ return new X86Frame(f.extendedSenderSP(), f.exactSenderSP(), f.senderLink(), f.senderPC());
+ }
+
private Frame senderForEntryFrame(X86RegisterMap map) {
+ if (DEBUG) {
+ System.out.println("senderForEntryFrame");
+ }
if (Assert.ASSERTS_ENABLED) {
Assert.that(map != null, "map must be set");
}
@@ -313,7 +325,37 @@ public class X86Frame extends Frame {
return fr;
}
+ //------------------------------------------------------------------------------
+ // frame::adjust_unextended_sp
+ private void adjustUnextendedSP() {
+ // If we are returning to a compiled MethodHandle call site, the
+ // saved_fp will in fact be a saved value of the unextended SP. The
+ // simplest way to tell whether we are returning to such a call site
+ // is as follows:
+
+ CodeBlob cb = cb();
+ NMethod senderNm = (cb == null) ? null : cb.asNMethodOrNull();
+ if (senderNm != null) {
+ // If the sender PC is a deoptimization point, get the original
+ // PC. For MethodHandle call site the unextended_sp is stored in
+ // saved_fp.
+ if (senderNm.isDeoptMhEntry(getPC())) {
+ // DEBUG_ONLY(verifyDeoptMhOriginalPc(senderNm, getFP()));
+ raw_unextendedSP = getFP();
+ }
+ else if (senderNm.isDeoptEntry(getPC())) {
+ // DEBUG_ONLY(verifyDeoptOriginalPc(senderNm, raw_unextendedSp));
+ }
+ else if (senderNm.isMethodHandleReturn(getPC())) {
+ raw_unextendedSP = getFP();
+ }
+ }
+ }
+
private Frame senderForInterpreterFrame(X86RegisterMap map) {
+ if (DEBUG) {
+ System.out.println("senderForInterpreterFrame");
+ }
Address unextendedSP = addressOfStackSlot(INTERPRETER_FRAME_SENDER_SP_OFFSET).getAddressAt(0);
Address sp = addressOfStackSlot(SENDER_SP_OFFSET);
// We do not need to update the callee-save register mapping because above
@@ -323,10 +365,21 @@ public class X86Frame extends Frame {
// However c2 no longer uses callee save register for java calls so there
// are no callee register to find.
- return new X86Frame(sp, getLink(), unextendedSP.minus(sp));
+ if (map.getUpdateMap())
+ updateMapWithSavedLink(map, addressOfStackSlot(LINK_OFFSET));
+
+ return new X86Frame(sp, unextendedSP, getLink(), getSenderPC());
+ }
+
+ private void updateMapWithSavedLink(RegisterMap map, Address savedFPAddr) {
+ map.setLocation(rbp, savedFPAddr);
}
private Frame senderForCompiledFrame(X86RegisterMap map, CodeBlob cb) {
+ if (DEBUG) {
+ System.out.println("senderForCompiledFrame");
+ }
+
//
// NOTE: some of this code is (unfortunately) duplicated in X86CurrentFrameGuess
//
@@ -336,41 +389,35 @@ public class X86Frame extends Frame {
}
// frame owned by optimizing compiler
- Address sender_sp = null;
-
- if (VM.getVM().isClientCompiler()) {
- sender_sp = addressOfStackSlot(SENDER_SP_OFFSET);
- } else {
- if (Assert.ASSERTS_ENABLED) {
- Assert.that(cb.getFrameSize() >= 0, "Compiled by Compiler1: do not use");
- }
- sender_sp = getUnextendedSP().addOffsetTo(cb.getFrameSize());
+ if (Assert.ASSERTS_ENABLED) {
+ Assert.that(cb.getFrameSize() >= 0, "must have non-zero frame size");
}
+ Address senderSP = getUnextendedSP().addOffsetTo(cb.getFrameSize());
// On Intel the return_address is always the word on the stack
- Address sender_pc = sender_sp.getAddressAt(-1 * VM.getVM().getAddressSize());
+ Address senderPC = senderSP.getAddressAt(-1 * VM.getVM().getAddressSize());
- if (map.getUpdateMap() && cb.getOopMaps() != null) {
- OopMapSet.updateRegisterMap(this, cb, map, true);
- }
+ // This is the saved value of EBP which may or may not really be an FP.
+ // It is only an FP if the sender is an interpreter frame (or C1?).
+ Address savedFPAddr = senderSP.addOffsetTo(- SENDER_SP_OFFSET * VM.getVM().getAddressSize());
- if (VM.getVM().isClientCompiler()) {
- // Move this here for C1 and collecting oops in arguments (According to Rene)
- map.setIncludeArgumentOops(cb.callerMustGCArguments(map.getThread()));
- }
+ if (map.getUpdateMap()) {
+ // Tell GC to use argument oopmaps for some runtime stubs that need it.
+ // For C1, the runtime stub might not have oop maps, so set this flag
+ // outside of update_register_map.
+ map.setIncludeArgumentOops(cb.callerMustGCArguments());
- Address saved_fp = null;
- if (VM.getVM().isClientCompiler()) {
- saved_fp = getFP().getAddressAt(0);
- } else if (VM.getVM().isServerCompiler() &&
- (VM.getVM().getInterpreter().contains(sender_pc) ||
- VM.getVM().getStubRoutines().returnsToCallStub(sender_pc))) {
- // C2 prologue saves EBP in the usual place.
- // however only use it if the sender had link infomration in it.
- saved_fp = sender_sp.getAddressAt(-2 * VM.getVM().getAddressSize());
+ if (cb.getOopMaps() != null) {
+ OopMapSet.updateRegisterMap(this, cb, map, true);
+ }
+
+ // Since the prolog does the save and restore of EBP there is no oopmap
+ // for it so we must fill in its location as if there was an oopmap entry
+ // since if our caller was compiled code there could be live jvm state in it.
+ updateMapWithSavedLink(map, savedFPAddr);
}
- return new X86Frame(sender_sp, saved_fp, sender_pc);
+ return new X86Frame(senderSP, savedFPAddr.getAddressAt(0), senderPC);
}
protected boolean hasSenderPD() {
@@ -403,14 +450,6 @@ public class X86Frame extends Frame {
public Address getSenderSP() { return addressOfStackSlot(SENDER_SP_OFFSET); }
- public Address compiledArgumentToLocationPD(VMReg reg, RegisterMap regMap, int argSize) {
- if (VM.getVM().isCore() || VM.getVM().isClientCompiler()) {
- throw new RuntimeException("Should not reach here");
- }
-
- return oopMapRegToLocation(reg, regMap);
- }
-
public Address addressOfInterpreterFrameLocals() {
return addressOfStackSlot(INTERPRETER_FRAME_LOCALS_OFFSET);
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java
new file mode 100644
index 0000000..5d73ac9
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/x86/X86RicochetFrame.java
@@ -0,0 +1,81 @@
+/*
+ * 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.
+ *
+ */
+
+package sun.jvm.hotspot.runtime.x86;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.types.*;
+
+public class X86RicochetFrame extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static void initialize(TypeDataBase db) {
+ Type type = db.lookupType("MethodHandles::RicochetFrame");
+
+ senderLinkField = type.getAddressField("_sender_link");
+ savedArgsBaseField = type.getAddressField("_saved_args_base");
+ exactSenderSPField = type.getAddressField("_exact_sender_sp");
+ senderPCField = type.getAddressField("_sender_pc");
+ }
+
+ private static AddressField senderLinkField;
+ private static AddressField savedArgsBaseField;
+ private static AddressField exactSenderSPField;
+ private static AddressField senderPCField;
+
+ static X86RicochetFrame fromFrame(X86Frame f) {
+ return new X86RicochetFrame(f.getFP().addOffsetTo(- senderLinkField.getOffset()));
+ }
+
+ private X86RicochetFrame(Address addr) {
+ super(addr);
+ }
+
+ public Address senderLink() {
+ return senderLinkField.getValue(addr);
+ }
+ public Address senderLinkAddress() {
+ return addr.addOffsetTo(senderLinkField.getOffset());
+ }
+ public Address savedArgsBase() {
+ return savedArgsBaseField.getValue(addr);
+ }
+ public Address extendedSenderSP() {
+ return savedArgsBase();
+ }
+ public Address exactSenderSP() {
+ return exactSenderSPField.getValue(addr);
+ }
+ public Address senderPC() {
+ return senderPCField.getValue(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
index efa37e6..34ccc10 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassDump.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 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
@@ -25,6 +25,9 @@
package sun.jvm.hotspot.tools.jcore;
import java.io.*;
+import java.util.jar.JarOutputStream;
+import java.util.jar.JarEntry;
+import java.util.jar.Manifest;
import sun.jvm.hotspot.memory.*;
import sun.jvm.hotspot.oops.*;
import sun.jvm.hotspot.debugger.*;
@@ -34,26 +37,32 @@ import sun.jvm.hotspot.tools.*;
public class ClassDump extends Tool {
private ClassFilter classFilter;
private String outputDirectory;
+ private JarOutputStream jarStream;
- public void run() {
- // Ready to go with the database...
- try {
-
- // load class filters
+ public void setClassFilter(ClassFilter cf) {
+ classFilter = cf;
+ }
- String filterClassName = System.getProperty("sun.jvm.hotspot.tools.jcore.filter");
- if (filterClassName != null) {
- try {
- Class filterClass = Class.forName(filterClassName);
- classFilter = (ClassFilter) filterClass.newInstance();
- } catch(Exception exp) {
- System.err.println("Warning: Can not create class filter!");
- }
+ public void setOutputDirectory(String od) {
+ outputDirectory = od;
+ if (jarStream != null) {
+ try {
+ jarStream.close();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
+ }
+ jarStream = null;
+ }
- outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir");
- if (outputDirectory == null)
- outputDirectory = ".";
+ public void setJarOutput(String jarFileName) throws IOException {
+ jarStream = new JarOutputStream(new FileOutputStream(jarFileName), new Manifest());
+ outputDirectory = null;
+ }
+
+ public void run() {
+ // Ready to go with the database...
+ try {
// walk through the system dictionary
SystemDictionary dict = VM.getVM().getSystemDictionary();
@@ -75,6 +84,14 @@ public class ClassDump extends Tool {
+ Long.toHexString(e.getAddress()));
e.printStackTrace();
}
+ if (jarStream != null) {
+ try {
+ jarStream.close();
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
+ }
+ jarStream = null;
+ }
}
public String getName() {
@@ -88,26 +105,33 @@ public class ClassDump extends Tool {
String klassName = kls.getName().asString();
klassName = klassName.replace('/', File.separatorChar);
- int index = klassName.lastIndexOf(File.separatorChar);
- File dir = null;
- if (index != -1) {
- String dirName = klassName.substring(0, index);
- dir = new File(outputDirectory, dirName);
- } else {
- dir = new File(outputDirectory);
- }
-
- dir.mkdirs();
- File f = new File(dir, klassName.substring(klassName.lastIndexOf(File.separatorChar) + 1)
- + ".class");
try {
- f.createNewFile();
- OutputStream os = new BufferedOutputStream(new FileOutputStream(f));
+ OutputStream os = null;
+ if (jarStream != null) {
+ jarStream.putNextEntry(new JarEntry(klassName + ".class"));
+ os = jarStream;
+ } else {
+ int index = klassName.lastIndexOf(File.separatorChar);
+ File dir = null;
+ if (index != -1) {
+ String dirName = klassName.substring(0, index);
+ dir = new File(outputDirectory, dirName);
+ } else {
+ dir = new File(outputDirectory);
+ }
+
+ dir.mkdirs();
+ File f = new File(dir, klassName.substring(index + 1) + ".class");
+ f.createNewFile();
+ os = new BufferedOutputStream(new FileOutputStream(f));
+ }
try {
ClassWriter cw = new ClassWriter(kls, os);
cw.write();
} finally {
- os.close();
+ if (os != jarStream) {
+ os.close();
+ }
}
} catch(IOException exp) {
exp.printStackTrace();
@@ -115,7 +139,26 @@ public class ClassDump extends Tool {
}
public static void main(String[] args) {
+ // load class filters
+ ClassFilter classFilter = null;
+ String filterClassName = System.getProperty("sun.jvm.hotspot.tools.jcore.filter");
+ if (filterClassName != null) {
+ try {
+ Class filterClass = Class.forName(filterClassName);
+ classFilter = (ClassFilter) filterClass.newInstance();
+ } catch(Exception exp) {
+ System.err.println("Warning: Can not create class filter!");
+ }
+ }
+
+ String outputDirectory = System.getProperty("sun.jvm.hotspot.tools.jcore.outputDir");
+ if (outputDirectory == null)
+ outputDirectory = ".";
+
+
ClassDump cd = new ClassDump();
+ cd.setClassFilter(classFilter);
+ cd.setOutputDirectory(outputDirectory);
cd.start(args);
cd.stop();
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
index 91739ef..f4e3d7c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/jcore/ClassWriter.java
@@ -379,23 +379,21 @@ public class ClassWriter implements /* imports */ ClassConstants
}
protected void writeFields() throws IOException {
- TypeArray fields = klass.getFields();
- final int length = (int) fields.getLength();
+ final int length = klass.getJavaFieldsCount();
// write number of fields
- dos.writeShort((short) (length / InstanceKlass.NEXT_OFFSET) );
+ dos.writeShort((short) length);
- if (DEBUG) debugMessage("number of fields = "
- + length/InstanceKlass.NEXT_OFFSET);
+ if (DEBUG) debugMessage("number of fields = " + length);
- for (int index = 0; index < length; index += InstanceKlass.NEXT_OFFSET) {
- short accessFlags = fields.getShortAt(index + InstanceKlass.ACCESS_FLAGS_OFFSET);
+ for (int index = 0; index < length; index++) {
+ short accessFlags = klass.getFieldAccessFlags(index);
dos.writeShort(accessFlags & (short) JVM_RECOGNIZED_FIELD_MODIFIERS);
- short nameIndex = fields.getShortAt(index + InstanceKlass.NAME_INDEX_OFFSET);
+ short nameIndex = klass.getFieldNameIndex(index);
dos.writeShort(nameIndex);
- short signatureIndex = fields.getShortAt(index + InstanceKlass.SIGNATURE_INDEX_OFFSET);
+ short signatureIndex = klass.getFieldSignatureIndex(index);
dos.writeShort(signatureIndex);
if (DEBUG) debugMessage("\tfield name = " + nameIndex + ", signature = " + signatureIndex);
@@ -404,11 +402,11 @@ public class ClassWriter implements /* imports */ ClassConstants
if (hasSyn)
fieldAttributeCount++;
- short initvalIndex = fields.getShortAt(index + InstanceKlass.INITVAL_INDEX_OFFSET);
+ short initvalIndex = klass.getFieldInitialValueIndex(index);
if (initvalIndex != 0)
fieldAttributeCount++;
- short genSigIndex = fields.getShortAt(index + InstanceKlass.GENERIC_SIGNATURE_INDEX_OFFSET);
+ short genSigIndex = klass.getFieldGenericSignatureIndex(index);
if (genSigIndex != 0)
fieldAttributeCount++;
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java
index e197635..77537dd 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/tools/soql/SOQL.java
@@ -150,16 +150,13 @@ public class SOQL extends Tool {
}
// list immediate fields only
- TypeArray fields = klass.getFields();
- int numFields = (int) fields.getLength();
+ int numFields = klass.getJavaFieldsCount();
ConstantPool cp = klass.getConstants();
out.println("fields");
if (numFields != 0) {
- for (int f = 0; f < numFields; f += InstanceKlass.NEXT_OFFSET) {
- int nameIndex = fields.getShortAt(f + InstanceKlass.NAME_INDEX_OFFSET);
- int sigIndex = fields.getShortAt(f + InstanceKlass.SIGNATURE_INDEX_OFFSET);
- Symbol f_name = cp.getSymbolAt(nameIndex);
- Symbol f_sig = cp.getSymbolAt(sigIndex);
+ for (int f = 0; f < numFields; f++){
+ Symbol f_name = klass.getFieldName(f);
+ Symbol f_sig = klass.getFieldSignature(f);
StringBuffer sigBuf = new StringBuffer();
new SignatureConverter(f_sig, sigBuf).dispatchField();
out.print('\t');
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java
index 76c145c..6eb9e37 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/TypeDataBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -120,6 +120,11 @@ public interface TypeDataBase {
found. */
public Type guessTypeForAddress(Address addr);
+ /** Helper routine for guessing the most derived type of a
+ polymorphic C++ object. Requires a baseType that must be virtual
+ so that lookup can be performed without false positives */
+ public Type findDynamicTypeForAddress(Address addr, Type baseType);
+
/** Returns an Iterator over the Types in the database. */
public Iterator getTypes();
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java
index 92b0301..f88335c 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -150,6 +150,19 @@ public class BasicTypeDataBase implements TypeDataBase {
return VM.getVM().getOopSize();
}
+ static HashMap typeToVtbl = new HashMap();
+
+ private Address vtblForType(Type type) {
+ Address vtblAddr = (Address)typeToVtbl.get(type);
+ if (vtblAddr == null) {
+ vtblAddr = vtblAccess.getVtblForType(type);
+ if (vtblAddr != null) {
+ typeToVtbl.put(type, vtblAddr);
+ }
+ }
+ return vtblAddr;
+ }
+
public boolean addressTypeIsEqualToType(Address addr, Type type) {
if (addr == null) {
return false;
@@ -158,7 +171,7 @@ public class BasicTypeDataBase implements TypeDataBase {
// This implementation should be suitably platform-independent; we
// search nearby memory for the vtbl value of the given type.
- Address vtblAddr = vtblAccess.getVtblForType(type);
+ Address vtblAddr = vtblForType(type);
if (vtblAddr == null) {
// Type was not polymorphic, or an error occurred during lookup
@@ -251,6 +264,78 @@ public class BasicTypeDataBase implements TypeDataBase {
return false;
}
+ public Type findDynamicTypeForAddress(Address addr, Type baseType) {
+ // This implementation should be suitably platform-independent; we
+ // search nearby memory for the vtbl value of the given type.
+
+ if (vtblForType(baseType) == null) {
+ // Type was not polymorphic which is an error of some sort
+ throw new InternalError(baseType + " does not appear to be polymorphic");
+ }
+
+ // This is a more restricted version of guessTypeForAddress since
+ // that function has some limitations since it doesn't really know
+ // where in the hierarchy a virtual type starts and just poking
+ // around in memory is likely to trip over some vtable address,
+ // resulting in false positives. Eventually all uses should
+ // switch to this logic but in the interests of stability it will
+ // be separate for the moment.
+
+ // Assuming that the base type is truly the first polymorphic type
+ // then the vtbl for all subclasss should be at several defined
+ // locations so only those locations will be checked. It's also
+ // required that the caller knows that the static type is at least
+ // baseType. See the notes in guessTypeForAddress for the logic of
+ // the locations searched.
+
+ Address loc1 = addr.getAddressAt(0);
+ Address loc2 = null;
+ Address loc3 = null;
+ long offset2 = baseType.getSize();
+ // I don't think this should be misaligned under any
+ // circumstances, but I'm not sure (FIXME: also not sure which
+ // way to go here, up or down -- assuming down)
+ offset2 = offset2 - (offset2 % getAddressSize()) - getAddressSize();
+ if (offset2 > 0) {
+ loc2 = addr.getAddressAt(offset2);
+ }
+ long offset3 = offset2 - getAddressSize();
+ if (offset3 > 0) {
+ loc3 = addr.getAddressAt(offset3);
+ }
+
+ Type loc2Match = null;
+ Type loc3Match = null;
+ for (Iterator iter = getTypes(); iter.hasNext(); ) {
+ Type type = (Type) iter.next();
+ Type superClass = type;
+ while (superClass != baseType && superClass != null) {
+ superClass = superClass.getSuperclass();
+ }
+ if (superClass == null) continue;
+ Address vtblAddr = vtblForType(type);
+ if (vtblAddr == null) {
+ // This occurs sometimes for intermediate types that are never
+ // instantiated.
+ if (DEBUG) {
+ System.err.println("null vtbl for " + type);
+ }
+ continue;
+ }
+ // Prefer loc1 match
+ if (vtblAddr.equals(loc1)) return type;
+ if (loc2 != null && loc2Match == null && vtblAddr.equals(loc2)) {
+ loc2Match = type;
+ }
+ if (loc3 != null && loc3Match == null && vtblAddr.equals(loc3)) {
+ loc3Match = type;
+ }
+ }
+ if (loc2Match != null) return loc2Match;
+ if (loc3Match != null) return loc3Match;
+ return null;
+ }
+
public Type guessTypeForAddress(Address addr) {
for (Iterator iter = getTypes(); iter.hasNext(); ) {
Type t = (Type) iter.next();
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java
index 1dd159a..8b4acae 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/CommandProcessorPanel.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -88,7 +88,7 @@ public class CommandProcessorPanel extends JPanel {
public void run() {
beginUpdate();
try {
- commands.executeCommand(ln);
+ commands.executeCommand(ln, true);
commands.printPrompt();
Document d = editor.getDocument();
try {
@@ -149,7 +149,7 @@ public class CommandProcessorPanel extends JPanel {
public void clear() {
EditableAtEndDocument d = (EditableAtEndDocument) editor.getDocument();
d.clear();
- commands.executeCommand("");
+ commands.executeCommand("", false);
setMark();
editor.requestFocus();
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
index 8e3cbb7..210bed7 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java
@@ -1116,20 +1116,15 @@ public class HTMLGenerator implements /* imports */ ClassConstants {
InstanceKlass kls = (InstanceKlass) obj;
buf.append(" " + kls.getName().asString() + "={");
int flen = ov.fieldsSize();
-
- TypeArray klfields = kls.getFields();
- int klen = (int) klfields.getLength();
-
- ConstantPool cp = kls.getConstants();
+ int klen = kls.getJavaFieldsCount();
int findex = 0;
- for (int index = 0; index < klen; index += kls.NEXT_OFFSET) {
- int accsFlags = klfields.getShortAt(index + kls.ACCESS_FLAGS_OFFSET);
- int nameIndex = klfields.getShortAt(index + kls.NAME_INDEX_OFFSET);
+ for (int index = 0; index < klen; index++) {
+ int accsFlags = kls.getFieldAccessFlags(index);
+ Symbol f_name = kls.getFieldName(index);
AccessFlags access = new AccessFlags(accsFlags);
if (!access.isStatic()) {
ScopeValue svf = ov.getFieldAt(findex++);
String fstr = scopeValueAsString(sd, svf);
- Symbol f_name = cp.getSymbolAt(nameIndex);
buf.append(" [" + f_name.asString() + " :"+ index + "]=(#" + fstr + ")");
}
}
@@ -1819,13 +1814,11 @@ public class HTMLGenerator implements /* imports */ ClassConstants {
protected String genHTMLListForFields(InstanceKlass klass) {
Formatter buf = new Formatter(genHTML);
- TypeArray fields = klass.getFields();
- int numFields = (int) fields.getLength();
- ConstantPool cp = klass.getConstants();
+ int numFields = klass.getJavaFieldsCount();
if (numFields != 0) {
buf.h3("Fields");
buf.beginList();
- for (int f = 0; f < numFields; f += InstanceKlass.NEXT_OFFSET) {
+ for (int f = 0; f < numFields; f++) {
sun.jvm.hotspot.oops.Field field = klass.getFieldByIndex(f);
String f_name = ((NamedFieldIdentifier)field.getID()).getName();
Symbol f_sig = field.getSignature();
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java
index 60a2172..df200bc 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/ConstantTag.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -24,31 +24,33 @@
package sun.jvm.hotspot.utilities;
+import sun.jvm.hotspot.runtime.BasicType;
+
public class ConstantTag {
// These replicated from the VM to save space
- private static int JVM_CONSTANT_Utf8 = 1;
- private static int JVM_CONSTANT_Unicode = 2; // unused
- private static int JVM_CONSTANT_Integer = 3;
- private static int JVM_CONSTANT_Float = 4;
- private static int JVM_CONSTANT_Long = 5;
- private static int JVM_CONSTANT_Double = 6;
- private static int JVM_CONSTANT_Class = 7;
- private static int JVM_CONSTANT_String = 8;
- private static int JVM_CONSTANT_Fieldref = 9;
- private static int JVM_CONSTANT_Methodref = 10;
- private static int JVM_CONSTANT_InterfaceMethodref = 11;
- private static int JVM_CONSTANT_NameAndType = 12;
- private static int JVM_CONSTANT_MethodHandle = 15; // JSR 292
- private static int JVM_CONSTANT_MethodType = 16; // JSR 292
- // static int JVM_CONSTANT_(unused) = 17; // JSR 292 early drafts only
- private static int JVM_CONSTANT_InvokeDynamic = 18; // JSR 292
- private static int JVM_CONSTANT_Invalid = 0; // For bad value initialization
- private static int JVM_CONSTANT_UnresolvedClass = 100; // Temporary tag until actual use
- private static int JVM_CONSTANT_ClassIndex = 101; // Temporary tag while constructing constant pool
- private static int JVM_CONSTANT_UnresolvedString = 102; // Temporary tag until actual use
- private static int JVM_CONSTANT_StringIndex = 103; // Temporary tag while constructing constant pool
- private static int JVM_CONSTANT_UnresolvedClassInError = 104; // Resolution failed
- private static int JVM_CONSTANT_Object = 105; // Required for BoundMethodHandle arguments.
+ private static final int JVM_CONSTANT_Utf8 = 1;
+ private static final int JVM_CONSTANT_Unicode = 2; // unused
+ private static final int JVM_CONSTANT_Integer = 3;
+ private static final int JVM_CONSTANT_Float = 4;
+ private static final int JVM_CONSTANT_Long = 5;
+ private static final int JVM_CONSTANT_Double = 6;
+ private static final int JVM_CONSTANT_Class = 7;
+ private static final int JVM_CONSTANT_String = 8;
+ private static final int JVM_CONSTANT_Fieldref = 9;
+ private static final int JVM_CONSTANT_Methodref = 10;
+ private static final int JVM_CONSTANT_InterfaceMethodref = 11;
+ private static final int JVM_CONSTANT_NameAndType = 12;
+ private static final int JVM_CONSTANT_MethodHandle = 15; // JSR 292
+ private static final int JVM_CONSTANT_MethodType = 16; // JSR 292
+ // static final int JVM_CONSTANT_(unused) = 17; // JSR 292 early drafts only
+ private static final int JVM_CONSTANT_InvokeDynamic = 18; // JSR 292
+ private static final int JVM_CONSTANT_Invalid = 0; // For bad value initialization
+ private static final int JVM_CONSTANT_UnresolvedClass = 100; // Temporary tag until actual use
+ private static final int JVM_CONSTANT_ClassIndex = 101; // Temporary tag while constructing constant pool
+ private static final int JVM_CONSTANT_UnresolvedString = 102; // Temporary tag until actual use
+ private static final int JVM_CONSTANT_StringIndex = 103; // Temporary tag while constructing constant pool
+ private static final int JVM_CONSTANT_UnresolvedClassInError = 104; // Resolution failed
+ private static final int JVM_CONSTANT_Object = 105; // Required for BoundMethodHandle arguments.
// JVM_CONSTANT_MethodHandle subtypes //FIXME: connect these to data structure
private static int JVM_REF_getField = 1;
@@ -99,4 +101,31 @@ public class ConstantTag {
public boolean isKlassReference() { return isKlassIndex() || isUnresolvedKlass(); }
public boolean isFieldOrMethod() { return isField() || isMethod() || isInterfaceMethod(); }
public boolean isSymbol() { return isUtf8(); }
+
+ public BasicType basicType() {
+ switch (tag) {
+ case JVM_CONSTANT_Integer :
+ return BasicType.T_INT;
+ case JVM_CONSTANT_Float :
+ return BasicType.T_FLOAT;
+ case JVM_CONSTANT_Long :
+ return BasicType.T_LONG;
+ case JVM_CONSTANT_Double :
+ return BasicType.T_DOUBLE;
+
+ case JVM_CONSTANT_Class :
+ case JVM_CONSTANT_String :
+ case JVM_CONSTANT_UnresolvedClass :
+ case JVM_CONSTANT_UnresolvedClassInError :
+ case JVM_CONSTANT_ClassIndex :
+ case JVM_CONSTANT_UnresolvedString :
+ case JVM_CONSTANT_StringIndex :
+ case JVM_CONSTANT_MethodHandle :
+ case JVM_CONSTANT_MethodType :
+ case JVM_CONSTANT_Object :
+ return BasicType.T_OBJECT;
+ default:
+ throw new InternalError("unexpected tag: " + tag);
+ }
+ }
}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java
new file mode 100644
index 0000000..a0fcac8
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/GenericGrowableArray.java
@@ -0,0 +1,64 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.utilities;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class GenericGrowableArray extends VMObject {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("GenericGrowableArray");
+ _arena_field = type.getAddressField("_arena");
+ _max_field = new CIntField(type.getCIntegerField("_max"), 0);
+ _len_field = new CIntField(type.getCIntegerField("_len"), 0);
+ }
+
+ private static AddressField _arena_field;
+ private static CIntField _max_field;
+ private static CIntField _len_field;
+
+ public int max() {
+ return (int)_max_field.getValue(getAddress());
+ }
+
+ public int length() {
+ return (int)_len_field.getValue(getAddress());
+ }
+
+ public GenericGrowableArray(Address addr) {
+ super(addr);
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java
new file mode 100644
index 0000000..4a6f1af
--- /dev/null
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/GrowableArray.java
@@ -0,0 +1,68 @@
+/*
+ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+package sun.jvm.hotspot.utilities;
+
+import java.util.*;
+import sun.jvm.hotspot.debugger.*;
+import sun.jvm.hotspot.runtime.*;
+import sun.jvm.hotspot.oops.*;
+import sun.jvm.hotspot.types.*;
+
+public class GrowableArray<T> extends GenericGrowableArray {
+ static {
+ VM.registerVMInitializedObserver(new Observer() {
+ public void update(Observable o, Object data) {
+ initialize(VM.getVM().getTypeDataBase());
+ }
+ });
+ }
+
+ private static synchronized void initialize(TypeDataBase db) throws WrongTypeException {
+ Type type = db.lookupType("GrowableArray<int>");
+ dataField = type.getAddressField("_data");
+ }
+
+ private static AddressField dataField;
+
+ private InstanceConstructor<T> virtualConstructor;
+
+ public static <S> GrowableArray<S> create(Address addr, InstanceConstructor<S> v) {
+ if (addr == null) return null;
+ return new GrowableArray<S>(addr, v);
+ }
+
+ public T at(int i) {
+ if (i < 0 || i >= length()) throw new ArrayIndexOutOfBoundsException(i);
+ Address data = dataField.getValue(getAddress());
+ Address addr = data.getAddressAt(i * VM.getVM().getAddressSize());
+ if (addr == null) return null;
+ return (T) virtualConstructor.instantiateWrapperFor(addr);
+ }
+
+ private GrowableArray(Address addr, InstanceConstructor<T> v) {
+ super(addr);
+ virtualConstructor = v;
+ }
+}
diff --git a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
index 5e749b3..baec86b 100644
--- a/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
+++ b/hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java
@@ -37,6 +37,14 @@ public class PlatformInfo {
return "solaris";
} else if (os.equals("Linux")) {
return "linux";
+ } else if (os.equals("FreeBSD")) {
+ return "bsd";
+ } else if (os.equals("NetBSD")) {
+ return "bsd";
+ } else if (os.equals("OpenBSD")) {
+ return "bsd";
+ } else if (os.equals("Darwin")) {
+ return "bsd";
} else if (os.startsWith("Windows")) {
return "win32";
} else {
diff --git a/hotspot/agent/test/jdi/sasanity.sh b/hotspot/agent/test/jdi/sasanity.sh
index 4b033fa..19580aa 100644
--- a/hotspot/agent/test/jdi/sasanity.sh
+++ b/hotspot/agent/test/jdi/sasanity.sh
@@ -76,5 +76,5 @@ while [ ! -s $tmp ] ; do
sleep 2
done
-$jdk/bin/java -showversion ${OPTIONS} -classpath $javacp SASanityChecker $pid
+$jdk/bin/java -showversion ${OPTIONS} -classpath $javacp $* SASanityChecker $pid
kill -9 $pid
diff --git a/hotspot/make/Makefile b/hotspot/make/Makefile
index 64f9f0b..325ca89 100644
--- a/hotspot/make/Makefile
+++ b/hotspot/make/Makefile
@@ -323,28 +323,42 @@ endif
ifneq ($(OSNAME),windows)
ifeq ($(ZERO_BUILD), true)
ifeq ($(SHARK_BUILD), true)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(SHARK_DIR)/%.so
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_SERVER_DIR)/%.so: $(SHARK_DIR)/%.so
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
else
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(ZERO_DIR)/%.so
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_SERVER_DIR)/%.so: $(ZERO_DIR)/%.so
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(ZERO_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
endif
else
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C1_DIR)/%.so
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_JRE_LIB_ARCH_DIR)/%.so: $(C2_DIR)/%.so
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_CLIENT_DIR)/%.so: $(C1_DIR)/%.so
+$(EXPORT_CLIENT_DIR)/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_CLIENT_DIR)/64/%.so: $(C1_DIR)/%.so
+$(EXPORT_CLIENT_DIR)/64/%.$(LIBRARY_SUFFIX): $(C1_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_SERVER_DIR)/%.so: $(C2_DIR)/%.so
+$(EXPORT_SERVER_DIR)/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
$(install-file)
-$(EXPORT_SERVER_DIR)/64/%.so: $(C2_DIR)/%.so
+$(EXPORT_SERVER_DIR)/64/%.$(LIBRARY_SUFFIX): $(C2_DIR)/%.$(LIBRARY_SUFFIX)
+ $(install-file)
+
+# Debug info for shared library
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+$(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+$(EXPORT_CLIENT_DIR)/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+$(EXPORT_CLIENT_DIR)/64/%.debuginfo: $(C1_DIR)/%.debuginfo
+ $(install-file)
+$(EXPORT_SERVER_DIR)/%.debuginfo: $(C2_DIR)/%.debuginfo
+ $(install-file)
+$(EXPORT_SERVER_DIR)/64/%.debuginfo: $(C2_DIR)/%.debuginfo
$(install-file)
endif
endif
diff --git a/hotspot/make/bsd/Makefile b/hotspot/make/bsd/Makefile
new file mode 100644
index 0000000..cef9d7c
--- /dev/null
+++ b/hotspot/make/bsd/Makefile
@@ -0,0 +1,371 @@
+#
+# Copyright (c) 1999, 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.
+#
+#
+
+# This makefile creates a build tree and lights off a build.
+# You can go back into the build tree and perform rebuilds or
+# incremental builds as desired. Be sure to reestablish
+# environment variable settings for LD_LIBRARY_PATH and JAVA_HOME.
+
+# The make process now relies on java and javac. These can be
+# specified either implicitly on the PATH, by setting the
+# (JDK-inherited) ALT_BOOTDIR environment variable to full path to a
+# JDK in which bin/java and bin/javac are present and working (e.g.,
+# /usr/local/java/jdk1.3/solaris), or via the (JDK-inherited)
+# default BOOTDIR path value. Note that one of ALT_BOOTDIR
+# or BOOTDIR has to be set. We do *not* search javac, javah, rmic etc.
+# from the PATH.
+#
+# One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on
+# an architecture that differs from the target architecture, as long
+# as the bootstrap jdk runs under the same flavor of OS as the target
+# (i.e., if the target is linux, point to a jdk that runs on a linux
+# box). In order to use such a bootstrap jdk, set the make variable
+# REMOTE to the desired remote command mechanism, e.g.,
+#
+# make REMOTE="rsh -l me myotherlinuxbox"
+
+# Along with VM, Serviceability Agent (SA) is built for SA/JDI binding.
+# JDI binding on SA produces two binaries:
+# 1. sa-jdi.jar - This is build before building libjvm[_g].so
+# Please refer to ./makefiles/sa.make
+# 2. libsa[_g].so - Native library for SA - This is built after
+# libjsig[_g].so (signal interposition library)
+# Please refer to ./makefiles/vm.make
+# If $(GAMMADIR)/agent dir is not present, SA components are not built.
+
+ifeq ($(GAMMADIR),)
+include ../../make/defs.make
+else
+include $(GAMMADIR)/make/defs.make
+endif
+include $(GAMMADIR)/make/$(OSNAME)/makefiles/rules.make
+
+ifndef CC_INTERP
+ ifndef FORCE_TIERED
+ FORCE_TIERED=1
+ endif
+endif
+
+ifdef LP64
+ ifeq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
+ _JUNK_ := $(shell echo >&2 \
+ $(OSNAME) $(ARCH) "*** ERROR: this platform does not support 64-bit compilers!")
+ @exit 1
+ endif
+endif
+
+# we need to set up LP64 correctly to satisfy sanity checks in adlc
+ifneq ("$(filter $(LP64_ARCH),$(BUILDARCH))","")
+ MFLAGS += " LP64=1 "
+endif
+
+# pass USE_SUNCC further, through MFLAGS
+ifdef USE_SUNCC
+ MFLAGS += " USE_SUNCC=1 "
+endif
+
+# The following renders pathnames in generated Makefiles valid on
+# machines other than the machine containing the build tree.
+#
+# For example, let's say my build tree lives on /files12 on
+# exact.east.sun.com. This logic will cause GAMMADIR to begin with
+# /net/exact/files12/...
+#
+# We only do this on SunOS variants, for a couple of reasons:
+# * It is extremely rare that source trees exist on other systems
+# * It has been claimed that the Linux automounter is flakey, so
+# changing GAMMADIR in a way that exercises the automounter could
+# prove to be a source of unreliability in the build process.
+# Obviously, this Makefile is only relevant on SunOS boxes to begin
+# with, but the SunOS conditionalization will make it easier to
+# combine Makefiles in the future (assuming we ever do that).
+
+ifeq ($(OSNAME),solaris)
+
+ # prepend current directory to relative pathnames.
+ NEW_GAMMADIR := \
+ $(shell echo $(GAMMADIR) | \
+ sed -e "s=^\([^/].*\)=$(shell pwd)/\1=" \
+ )
+ unexport NEW_GAMMADIR
+
+ # If NEW_GAMMADIR doesn't already start with "/net/":
+ ifeq ($(strip $(filter /net/%,$(NEW_GAMMADIR))),)
+ # prepend /net/$(HOST)
+ # remove /net/$(HOST) if name already began with /home/
+ # remove /net/$(HOST) if name already began with /java/
+ # remove /net/$(HOST) if name already began with /lab/
+ NEW_GAMMADIR := \
+ $(shell echo $(NEW_GAMMADIR) | \
+ sed -e "s=^\(.*\)=/net/$(HOST)\1=" \
+ -e "s=^/net/$(HOST)/home/=/home/=" \
+ -e "s=^/net/$(HOST)/java/=/java/=" \
+ -e "s=^/net/$(HOST)/lab/=/lab/=" \
+ )
+ # Don't use the new value for GAMMADIR unless a file with the new
+ # name actually exists.
+ ifneq ($(wildcard $(NEW_GAMMADIR)),)
+ GAMMADIR := $(NEW_GAMMADIR)
+ endif
+ endif
+
+endif
+
+# BUILDARCH is set to "zero" for Zero builds. VARIANTARCH
+# is used to give the build directories meaningful names.
+VARIANTARCH = $(subst i386,i486,$(ZERO_LIBARCH))
+
+# There is a (semi-) regular correspondence between make targets and actions:
+#
+# Target Tree Type Build Dir
+#
+# debug compiler2 <os>_<arch>_compiler2/debug
+# fastdebug compiler2 <os>_<arch>_compiler2/fastdebug
+# jvmg compiler2 <os>_<arch>_compiler2/jvmg
+# optimized compiler2 <os>_<arch>_compiler2/optimized
+# profiled compiler2 <os>_<arch>_compiler2/profiled
+# product compiler2 <os>_<arch>_compiler2/product
+#
+# debug1 compiler1 <os>_<arch>_compiler1/debug
+# fastdebug1 compiler1 <os>_<arch>_compiler1/fastdebug
+# jvmg1 compiler1 <os>_<arch>_compiler1/jvmg
+# optimized1 compiler1 <os>_<arch>_compiler1/optimized
+# profiled1 compiler1 <os>_<arch>_compiler1/profiled
+# product1 compiler1 <os>_<arch>_compiler1/product
+#
+# debugcore core <os>_<arch>_core/debug
+# fastdebugcore core <os>_<arch>_core/fastdebug
+# jvmgcore core <os>_<arch>_core/jvmg
+# optimizedcore core <os>_<arch>_core/optimized
+# profiledcore core <os>_<arch>_core/profiled
+# productcore core <os>_<arch>_core/product
+#
+# debugzero zero <os>_<arch>_zero/debug
+# fastdebugzero zero <os>_<arch>_zero/fastdebug
+# jvmgzero zero <os>_<arch>_zero/jvmg
+# optimizedzero zero <os>_<arch>_zero/optimized
+# profiledzero zero <os>_<arch>_zero/profiled
+# productzero zero <os>_<arch>_zero/product
+#
+# debugshark shark <os>_<arch>_shark/debug
+# fastdebugshark shark <os>_<arch>_shark/fastdebug
+# jvmgshark shark <os>_<arch>_shark/jvmg
+# optimizedshark shark <os>_<arch>_shark/optimized
+# profiledshark shark <os>_<arch>_shark/profiled
+# productshark shark <os>_<arch>_shark/product
+#
+# What you get with each target:
+#
+# debug* - "thin" libjvm_g - debug info linked into the gamma_g launcher
+# fastdebug* - optimized compile, but with asserts enabled
+# jvmg* - "fat" libjvm_g - debug info linked into libjvm_g.so
+# optimized* - optimized compile, no asserts
+# profiled* - gprof
+# product* - the shippable thing: optimized compile, no asserts, -DPRODUCT
+
+# This target list needs to be coordinated with the usage message
+# in the build.sh script:
+TARGETS = debug jvmg fastdebug optimized profiled product
+
+ifeq ($(ZERO_BUILD), true)
+ SUBDIR_DOCS = $(OSNAME)_$(VARIANTARCH)_docs
+else
+ SUBDIR_DOCS = $(OSNAME)_$(BUILDARCH)_docs
+endif
+SUBDIRS_C1 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler1/,$(TARGETS))
+SUBDIRS_C2 = $(addprefix $(OSNAME)_$(BUILDARCH)_compiler2/,$(TARGETS))
+SUBDIRS_TIERED = $(addprefix $(OSNAME)_$(BUILDARCH)_tiered/,$(TARGETS))
+SUBDIRS_CORE = $(addprefix $(OSNAME)_$(BUILDARCH)_core/,$(TARGETS))
+SUBDIRS_ZERO = $(addprefix $(OSNAME)_$(VARIANTARCH)_zero/,$(TARGETS))
+SUBDIRS_SHARK = $(addprefix $(OSNAME)_$(VARIANTARCH)_shark/,$(TARGETS))
+
+TARGETS_C2 = $(TARGETS)
+TARGETS_C1 = $(addsuffix 1,$(TARGETS))
+TARGETS_TIERED = $(addsuffix tiered,$(TARGETS))
+TARGETS_CORE = $(addsuffix core,$(TARGETS))
+TARGETS_ZERO = $(addsuffix zero,$(TARGETS))
+TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
+
+BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
+BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
+BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+
+BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
+
+#-------------------------------------------------------------------------------
+
+# Could make everything by default, but that would take a while.
+all:
+ @echo "Try '$(MAKE) <target> ...' where <target> is one or more of"
+ @echo " $(TARGETS_C2)"
+ @echo " $(TARGETS_C1)"
+ @echo " $(TARGETS_CORE)"
+ @echo " $(TARGETS_ZERO)"
+ @echo " $(TARGETS_SHARK)"
+
+checks: check_os_version check_j2se_version
+
+# We do not want people accidentally building on old systems (e.g. Linux 2.2.x,
+# Solaris 2.5.1, 2.6).
+# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+
+#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+DISABLE_HOTSPOT_OS_VERSION_CHECK = ok
+OS_VERSION := $(shell uname -r)
+EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+
+check_os_version:
+ifeq ($(DISABLE_HOTSPOT_OS_VERSION_CHECK)$(EMPTY_IF_NOT_SUPPORTED),)
+ $(QUIETLY) >&2 echo "*** This OS is not supported:" `uname -a`; exit 1;
+endif
+
+# jvmti.make requires XSLT (J2SE 1.4.x or newer):
+XSLT_CHECK = $(REMOTE) $(RUN.JAVAP) javax.xml.transform.TransformerFactory
+# If not found then fail fast.
+check_j2se_version:
+ $(QUIETLY) $(XSLT_CHECK) > /dev/null 2>&1; \
+ if [ $$? -ne 0 ]; then \
+ $(REMOTE) $(RUN.JAVA) -version; \
+ echo "*** An XSLT processor (J2SE 1.4.x or newer) is required" \
+ "to bootstrap this build" 1>&2; \
+ exit 1; \
+ fi
+
+$(SUBDIRS_TIERED): $(BUILDTREE_MAKE)
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=tiered
+
+$(SUBDIRS_C2): $(BUILDTREE_MAKE)
+ifeq ($(FORCE_TIERED),1)
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=tiered FORCE_TIERED=1
+else
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=compiler2
+endif
+
+$(SUBDIRS_C1): $(BUILDTREE_MAKE)
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=compiler1
+
+$(SUBDIRS_CORE): $(BUILDTREE_MAKE)
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=core
+
+$(SUBDIRS_ZERO): $(BUILDTREE_MAKE) platform_zero
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=zero VARIANTARCH=$(VARIANTARCH)
+
+$(SUBDIRS_SHARK): $(BUILDTREE_MAKE) platform_zero
+ $(QUIETLY) $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/Makefile checks
+ $(BUILDTREE) VARIANT=shark VARIANTARCH=$(VARIANTARCH)
+
+platform_zero: $(GAMMADIR)/make/$(OSNAME)/platform_zero.in
+ $(SED) 's/@ZERO_ARCHDEF@/$(ZERO_ARCHDEF)/g;s/@ZERO_LIBARCH@/$(ZERO_LIBARCH)/g;' < $< > $@
+
+# Define INSTALL=y at command line to automatically copy JVM into JAVA_HOME
+
+$(TARGETS_C2): $(SUBDIRS_C2)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && ./test_gamma
+ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS) install
+endif
+
+$(TARGETS_TIERED): $(SUBDIRS_TIERED)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS)
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && ./test_gamma
+ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_tiered/$(patsubst %tiered,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
+$(TARGETS_C1): $(SUBDIRS_C1)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS)
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && ./test_gamma
+ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_compiler1/$(patsubst %1,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
+$(TARGETS_CORE): $(SUBDIRS_CORE)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS)
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && ./test_gamma
+ifdef INSTALL
+ cd $(OSNAME)_$(BUILDARCH)_core/$(patsubst %core,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
+$(TARGETS_ZERO): $(SUBDIRS_ZERO)
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS)
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && ./test_gamma
+ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
+$(TARGETS_SHARK): $(SUBDIRS_SHARK)
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ifdef INSTALL
+ cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+endif
+
+# Just build the tree, and nothing else:
+tree: $(SUBDIRS_C2)
+tree1: $(SUBDIRS_C1)
+treecore: $(SUBDIRS_CORE)
+treezero: $(SUBDIRS_ZERO)
+treeshark: $(SUBDIRS_SHARK)
+
+# Doc target. This is the same for all build options.
+# Hence create a docs directory beside ...$(ARCH)_[...]
+docs: checks
+ $(QUIETLY) mkdir -p $(SUBDIR_DOCS)
+ $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs
+
+# Synonyms for win32-like targets.
+compiler2: jvmg product
+
+compiler1: jvmg1 product1
+
+core: jvmgcore productcore
+
+zero: jvmgzero productzero
+
+shark: jvmgshark productshark
+
+clean_docs:
+ rm -rf $(SUBDIR_DOCS)
+
+clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark:
+ rm -rf $(OSNAME)_$(BUILDARCH)_$(subst clean_,,$@)
+
+clean: clean_compiler2 clean_compiler1 clean_core clean_zero clean_shark clean_docs
+
+include $(GAMMADIR)/make/cscope.make
+
+#-------------------------------------------------------------------------------
+
+.PHONY: $(TARGETS_C2) $(TARGETS_C1) $(TARGETS_CORE) $(TARGETS_ZERO) $(TARGETS_SHARK)
+.PHONY: tree tree1 treecore treezero treeshark
+.PHONY: all compiler1 compiler2 core zero shark
+.PHONY: clean clean_compiler1 clean_compiler2 clean_core clean_zero clean_shark docs clean_docs
+.PHONY: checks check_os_version check_j2se_version
diff --git a/hotspot/make/linux/README b/hotspot/make/bsd/README
similarity index 100%
copy from hotspot/make/linux/README
copy to hotspot/make/bsd/README
diff --git a/hotspot/make/linux/adlc_updater b/hotspot/make/bsd/adlc_updater
similarity index 100%
copy from hotspot/make/linux/adlc_updater
copy to hotspot/make/bsd/adlc_updater
diff --git a/hotspot/make/bsd/build.sh b/hotspot/make/bsd/build.sh
new file mode 100644
index 0000000..ddb07e5
--- /dev/null
+++ b/hotspot/make/bsd/build.sh
@@ -0,0 +1,95 @@
+#! /bin/sh
+#
+# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Make sure the variable JAVA_HOME is set before running this script.
+
+set -u
+
+
+if [ $# != 2 ]; then
+ echo "Usage : $0 Build_Options Location"
+ echo "Build Options : debug or optimized or basicdebug or basic or clean"
+ echo "Location : specify any workspace which has gamma sources"
+ exit 1
+fi
+
+# Just in case:
+case ${JAVA_HOME} in
+/*) true;;
+?*) JAVA_HOME=`( cd $JAVA_HOME; pwd )`;;
+esac
+
+case `uname -m` in
+ i386|i486|i586|i686)
+ mach=i386
+ ;;
+ *)
+ echo "Unsupported machine: " `uname -m`
+ exit 1
+ ;;
+esac
+
+if [ "${JAVA_HOME}" = "" -o ! -d "${JAVA_HOME}" -o ! -d ${JAVA_HOME}/jre/lib/${mach} ]; then
+ echo "JAVA_HOME needs to be set to a valid JDK path"
+ echo "ksh : export JAVA_HOME=/net/tetrasparc/export/gobi/JDK1.2_fcs_V/bsd"
+ echo "csh : setenv JAVA_HOME /net/tetrasparc/export/gobi/JDK1.2_fcs_V/bsd"
+ exit 1
+fi
+
+
+LD_LIBRARY_PATH=${JAVA_HOME}/jre/lib/`uname -p`:\
+${JAVA_HOME}/jre/lib/`uname -p`/native_threads:${LD_LIBRARY_PATH-.}
+
+# This is necessary as long as we are using the old launcher
+# with the new distribution format:
+CLASSPATH=${JAVA_HOME}/jre/lib/rt.jar:${CLASSPATH-.}
+
+
+for gm in gmake gnumake
+do
+ if [ "${GNUMAKE-}" != "" ]; then break; fi
+ ($gm --version >/dev/null) 2>/dev/null && GNUMAKE=$gm
+done
+: ${GNUMAKE:?'Cannot locate the gnumake program. Stop.'}
+
+
+echo "### ENVIRONMENT SETTINGS:"
+export JAVA_HOME ; echo "JAVA_HOME=$JAVA_HOME"
+export LD_LIBRARY_PATH ; echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
+export CLASSPATH ; echo "CLASSPATH=$CLASSPATH"
+export GNUMAKE ; echo "GNUMAKE=$GNUMAKE"
+echo "###"
+
+Build_Options=$1
+Location=$2
+
+case ${Location} in
+/*) true;;
+?*) Location=`(cd ${Location}; pwd)`;;
+esac
+
+echo \
+${GNUMAKE} -f ${Location}/make/bsd/Makefile $Build_Options GAMMADIR=${Location}
+${GNUMAKE} -f ${Location}/make/bsd/Makefile $Build_Options GAMMADIR=${Location}
diff --git a/hotspot/make/linux/makefiles/adjust-mflags.sh b/hotspot/make/bsd/makefiles/adjust-mflags.sh
similarity index 100%
copy from hotspot/make/linux/makefiles/adjust-mflags.sh
copy to hotspot/make/bsd/makefiles/adjust-mflags.sh
diff --git a/hotspot/make/linux/makefiles/adlc.make b/hotspot/make/bsd/makefiles/adlc.make
similarity index 100%
copy from hotspot/make/linux/makefiles/adlc.make
copy to hotspot/make/bsd/makefiles/adlc.make
diff --git a/hotspot/make/linux/makefiles/amd64.make b/hotspot/make/bsd/makefiles/amd64.make
similarity index 100%
copy from hotspot/make/linux/makefiles/amd64.make
copy to hotspot/make/bsd/makefiles/amd64.make
diff --git a/hotspot/make/bsd/makefiles/arm.make b/hotspot/make/bsd/makefiles/arm.make
new file mode 100644
index 0000000..e22d5c3
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/arm.make
@@ -0,0 +1,29 @@
+#
+# Copyright (c) 2008, 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.
+#
+#
+
+Obj_Files += bsd_arm.o
+
+LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a
+
+CFLAGS += -DVM_LITTLE_ENDIAN
diff --git a/hotspot/make/linux/makefiles/build_vm_def.sh b/hotspot/make/bsd/makefiles/build_vm_def.sh
similarity index 100%
copy from hotspot/make/linux/makefiles/build_vm_def.sh
copy to hotspot/make/bsd/makefiles/build_vm_def.sh
diff --git a/hotspot/make/bsd/makefiles/buildtree.make b/hotspot/make/bsd/makefiles/buildtree.make
new file mode 100644
index 0000000..a62f69a
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/buildtree.make
@@ -0,0 +1,409 @@
+#
+# Copyright (c) 2005, 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.
+#
+#
+
+# Usage:
+#
+# $(MAKE) -f buildtree.make SRCARCH=srcarch BUILDARCH=buildarch LIBARCH=libarch
+# GAMMADIR=dir OS_FAMILY=os VARIANT=variant
+#
+# The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the
+# environment or on the command-line:
+#
+# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory
+# BUILDARCH - build directory
+# LIBARCH - the corresponding directory in JDK/JRE
+# GAMMADIR - top of workspace
+# OS_FAMILY - operating system
+# VARIANT - core, compiler1, compiler2, or tiered
+# HOTSPOT_RELEASE_VERSION - <major>.<minor>-b<nn> (11.0-b07)
+# HOTSPOT_BUILD_VERSION - internal, internal-$(USER_RELEASE_SUFFIX) or empty
+# JRE_RELEASE_VERSION - <major>.<minor>.<micro> (1.7.0)
+#
+# Builds the directory trees with makefiles plus some convenience files in
+# each directory:
+#
+# Makefile - for "make foo"
+# flags.make - with macro settings
+# vm.make - to support making "$(MAKE) -v vm.make" in makefiles
+# adlc.make -
+# jvmti.make - generate JVMTI bindings from the spec (JSR-163)
+# sa.make - generate SA jar file and natives
+# env.[ck]sh - environment settings
+# test_gamma - script to run the Queens program
+#
+# The makefiles are split this way so that "make foo" will run faster by not
+# having to read the dependency files for the vm.
+
+include $(GAMMADIR)/make/scm.make
+include $(GAMMADIR)/make/altsrc.make
+
+
+# 'gmake MAKE_VERBOSE=y' or 'gmake QUIETLY=' gives all the gory details.
+QUIETLY$(MAKE_VERBOSE) = @
+
+# For now, until the compiler is less wobbly:
+TESTFLAGS = -Xbatch -showversion
+
+ifeq ($(ZERO_BUILD), true)
+ PLATFORM_FILE = $(shell dirname $(shell dirname $(shell pwd)))/platform_zero
+else
+ ifdef USE_SUNCC
+ PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH).suncc
+ else
+ PLATFORM_FILE = $(GAMMADIR)/make/$(OS_FAMILY)/platform_$(BUILDARCH)
+ endif
+endif
+
+# Allow overriding of the arch part of the directory but default
+# to BUILDARCH if nothing is specified
+ifeq ($(VARIANTARCH),)
+ VARIANTARCH=$(BUILDARCH)
+endif
+
+ifdef FORCE_TIERED
+ifeq ($(VARIANT),tiered)
+PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_compiler2
+else
+PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
+endif
+else
+PLATFORM_DIR = $(OS_FAMILY)_$(VARIANTARCH)_$(VARIANT)
+endif
+
+#
+# We do two levels of exclusion in the shared directory.
+# TOPLEVEL excludes are pruned, they are not recursively searched,
+# but lower level directories can be named without fear of collision.
+# ALWAYS excludes are excluded at any level in the directory tree.
+#
+
+ALWAYS_EXCLUDE_DIRS = $(SCM_DIRS)
+
+ifeq ($(VARIANT),tiered)
+TOPLEVEL_EXCLUDE_DIRS = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name agent
+else
+ifeq ($(VARIANT),compiler2)
+TOPLEVEL_EXCLUDE_DIRS = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name c1 -o -name agent
+else
+# compiler1 and core use the same exclude list
+TOPLEVEL_EXCLUDE_DIRS = $(ALWAYS_EXCLUDE_DIRS) -o -name adlc -o -name opto -o -name libadt -o -name agent
+endif
+endif
+
+# Get things from the platform file.
+COMPILER = $(shell sed -n 's/^compiler[ ]*=[ ]*//p' $(PLATFORM_FILE))
+
+SIMPLE_DIRS = \
+ $(PLATFORM_DIR)/generated/dependencies \
+ $(PLATFORM_DIR)/generated/adfiles \
+ $(PLATFORM_DIR)/generated/jvmtifiles
+
+TARGETS = debug fastdebug jvmg optimized product profiled
+SUBMAKE_DIRS = $(addprefix $(PLATFORM_DIR)/,$(TARGETS))
+
+# For dependencies and recursive makes.
+BUILDTREE_MAKE = $(GAMMADIR)/make/$(OS_FAMILY)/makefiles/buildtree.make
+
+BUILDTREE_TARGETS = Makefile flags.make flags_vm.make vm.make adlc.make jvmti.make sa.make \
+ env.sh env.csh jdkpath.sh .dbxrc test_gamma
+
+BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OS_FAMILY) \
+ SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) VARIANT=$(VARIANT)
+
+# Define variables to be set in flags.make.
+# Default values are set in make/defs.make.
+ifeq ($(HOTSPOT_BUILD_VERSION),)
+ HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)
+else
+ HS_BUILD_VER=$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)
+endif
+# Set BUILD_USER from system-dependent hints: $LOGNAME, $(whoami)
+ifndef HOTSPOT_BUILD_USER
+ HOTSPOT_BUILD_USER := $(shell echo $$LOGNAME)
+endif
+ifndef HOTSPOT_BUILD_USER
+ HOTSPOT_BUILD_USER := $(shell whoami)
+endif
+# Define HOTSPOT_VM_DISTRO based on settings in make/openjdk_distro
+# or make/hotspot_distro.
+ifndef HOTSPOT_VM_DISTRO
+ ifeq ($(call if-has-altsrc,$(HS_COMMON_SRC)/,true,false),true)
+ include $(GAMMADIR)/make/hotspot_distro
+ else
+ include $(GAMMADIR)/make/openjdk_distro
+ endif
+endif
+
+BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HS_BUILD_VER) HOTSPOT_BUILD_VERSION= JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+
+BUILDTREE = \
+ $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_TARGETS) $(BUILDTREE_VARS)
+
+BUILDTREE_COMMENT = echo "\# Generated by $(BUILDTREE_MAKE)"
+
+all: $(SUBMAKE_DIRS)
+
+# Run make in each subdirectory recursively.
+$(SUBMAKE_DIRS): $(SIMPLE_DIRS) FORCE
+ $(QUIETLY) [ -d $@ ] || { mkdir -p $@; }
+ $(QUIETLY) cd $@ && $(BUILDTREE) TARGET=$(@F)
+ $(QUIETLY) touch $@
+
+$(SIMPLE_DIRS):
+ $(QUIETLY) mkdir -p $@
+
+# Convenience macro which takes a source relative path, applies $(1) to the
+# absolute path, and then replaces $(GAMMADIR) in the result with a
+# literal "$(GAMMADIR)/" suitable for inclusion in a Makefile.
+gamma-path=$(subst $(GAMMADIR),\$$(GAMMADIR),$(call $(1),$(HS_COMMON_SRC)/$(2)))
+
+flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo "Platform_file = $(PLATFORM_FILE)" | sed 's|$(GAMMADIR)|$$(GAMMADIR)|'; \
+ sed -n '/=/s/^ */Platform_/p' < $(PLATFORM_FILE); \
+ echo; \
+ echo "GAMMADIR = $(GAMMADIR)"; \
+ echo "SYSDEFS = \$$(Platform_sysdefs)"; \
+ echo "SRCARCH = $(SRCARCH)"; \
+ echo "BUILDARCH = $(BUILDARCH)"; \
+ echo "LIBARCH = $(LIBARCH)"; \
+ echo "TARGET = $(TARGET)"; \
+ echo "HS_BUILD_VER = $(HS_BUILD_VER)"; \
+ echo "JRE_RELEASE_VER = $(JRE_RELEASE_VERSION)"; \
+ echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
+ echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
+ echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+ echo; \
+ echo "# Used for platform dispatching"; \
+ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
+ echo "TARGET_DEFINES += -DTARGET_ARCH_\$$(Platform_arch)"; \
+ echo "TARGET_DEFINES += -DTARGET_ARCH_MODEL_\$$(Platform_arch_model)"; \
+ echo "TARGET_DEFINES += -DTARGET_OS_ARCH_\$$(Platform_os_arch)"; \
+ echo "TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_\$$(Platform_os_arch_model)"; \
+ echo "TARGET_DEFINES += -DTARGET_COMPILER_\$$(Platform_compiler)"; \
+ echo "CFLAGS += \$$(TARGET_DEFINES)"; \
+ echo; \
+ echo "Src_Dirs_V = \\"; \
+ sed 's/$$/ \\/;s|$(GAMMADIR)|$$(GAMMADIR)|' ../shared_dirs.lst; \
+ echo "$(call gamma-path,altsrc,cpu/$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,cpu/$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,altsrc,os/$(OS_FAMILY)/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,os/$(OS_FAMILY)/vm) \\"; \
+ echo "$(call gamma-path,altsrc,os/posix/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
+ echo; \
+ echo "Src_Dirs_I = \\"; \
+ echo "$(call gamma-path,altsrc,share/vm/prims) \\"; \
+ echo "$(call gamma-path,commonsrc,share/vm/prims) \\"; \
+ echo "$(call gamma-path,altsrc,share/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,share/vm) \\"; \
+ echo "$(call gamma-path,altsrc,cpu/$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,cpu/$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,altsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,os_cpu/$(OS_FAMILY)_$(SRCARCH)/vm) \\"; \
+ echo "$(call gamma-path,altsrc,os/$(OS_FAMILY)/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,os/$(OS_FAMILY)/vm) \\"; \
+ echo "$(call gamma-path,altsrc,os/posix/vm) \\"; \
+ echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
+ [ -n "$(CFLAGS_BROWSE)" ] && \
+ echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
+ [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
+ echo && \
+ echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
+ echo "SYSDEFS += \$$(HOTSPOT_EXTRA_SYSDEFS)"; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(VARIANT).make"; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(COMPILER).make"; \
+ ) > $@
+
+flags_vm.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ [ "$(TARGET)" = profiled ] && \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/optimized.make"; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(TARGET).make"; \
+ ) > $@
+
+../shared_dirs.lst: $(BUILDTREE_MAKE) $(GAMMADIR)/src/share/vm
+ @echo Creating directory list $@
+ $(QUIETLY) if [ -d $(HS_ALT_SRC)/share/vm ]; then \
+ find $(HS_ALT_SRC)/share/vm/* -prune \
+ -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
+ \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; > $@; \
+ fi;
+ $(QUIETLY) find $(HS_COMMON_SRC)/share/vm/* -prune \
+ -type d \! \( $(TOPLEVEL_EXCLUDE_DIRS) \) -exec find {} \
+ \( $(ALWAYS_EXCLUDE_DIRS) \) -prune -o -type d -print \; >> $@
+
+Makefile: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo include flags.make; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/top.make"; \
+ ) > $@
+
+vm.make: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo include flags.make; \
+ echo include flags_vm.make; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
+ ) > $@
+
+adlc.make: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo include flags.make; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
+ ) > $@
+
+jvmti.make: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo include flags.make; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
+ ) > $@
+
+sa.make: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo; \
+ echo include flags.make; \
+ echo; \
+ echo "include \$$(GAMMADIR)/make/$(OS_FAMILY)/makefiles/$(@F)"; \
+ ) > $@
+
+env.sh: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
+ { \
+ echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo "DYLD_LIBRARY_PATH=.:$${DYLD_LIBRARY_PATH:+$$DYLD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
+ echo "CLASSPATH=$${CLASSPATH:+$$CLASSPATH:}.:\$${JAVA_HOME}/jre/lib/rt.jar:\$${JAVA_HOME}/jre/lib/i18n.jar"; \
+ } | sed s:$${JAVA_HOME:--------}:\$${JAVA_HOME}:g; \
+ echo "HOTSPOT_BUILD_USER=\"$${LOGNAME:-$$USER} in `basename $(GAMMADIR)`\""; \
+ echo "export JAVA_HOME LD_LIBRARY_PATH DYLD_LIBRARY_PATH CLASSPATH HOTSPOT_BUILD_USER"; \
+ ) > $@
+
+env.csh: env.sh
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ [ -n "$$JAVA_HOME" ] && \
+ { echo "if (! \$$?JAVA_HOME) setenv JAVA_HOME \"$$JAVA_HOME\""; }; \
+ sed -n 's/^\([A-Za-z_][A-Za-z0-9_]*\)=/setenv \1 /p' $?; \
+ ) > $@
+
+jdkpath.sh: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ $(BUILDTREE_COMMENT); \
+ echo "JDK=${JAVA_HOME}"; \
+ ) > $@
+
+.dbxrc: $(BUILDTREE_MAKE)
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ echo "echo '# Loading $(PLATFORM_DIR)/$(TARGET)/.dbxrc'"; \
+ echo "if [ -f \"\$${HOTSPOT_DBXWARE}\" ]"; \
+ echo "then"; \
+ echo " source \"\$${HOTSPOT_DBXWARE}\""; \
+ echo "elif [ -f \"\$$HOME/.dbxrc\" ]"; \
+ echo "then"; \
+ echo " source \"\$$HOME/.dbxrc\""; \
+ echo "fi"; \
+ ) > $@
+
+# Skip the test for product builds (which only work when installed in a JDK), to
+# avoid exiting with an error and causing make to halt.
+NO_TEST_MSG = \
+ echo "$@: skipping the test--this build must be tested in a JDK."
+
+NO_JAVA_HOME_MSG = \
+ echo "JAVA_HOME must be set to run this test."
+
+DATA_MODE = $(DATA_MODE/$(BUILDARCH))
+JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE))
+
+DATA_MODE/i486 = 32
+DATA_MODE/sparc = 32
+DATA_MODE/sparcv9 = 64
+DATA_MODE/amd64 = 64
+DATA_MODE/ia64 = 64
+DATA_MODE/zero = $(ARCH_DATA_MODEL)
+
+JAVA_FLAG/32 = -d32
+JAVA_FLAG/64 = -d64
+
+WRONG_DATA_MODE_MSG = \
+ echo "JAVA_HOME must point to $(DATA_MODE)bit JDK."
+
+CROSS_COMPILING_MSG = \
+ echo "Cross compiling for ARCH $(CROSS_COMPILE_ARCH), skipping gamma run."
+
+test_gamma: $(BUILDTREE_MAKE) $(GAMMADIR)/make/test/Queens.java
+ @echo Creating $@ ...
+ $(QUIETLY) ( \
+ echo '#!/bin/sh'; \
+ $(BUILDTREE_COMMENT); \
+ echo '. ./env.sh'; \
+ echo "exit 0;"; \
+ echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
+ echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
+ echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
+ echo "then"; \
+ echo " $(WRONG_DATA_MODE_MSG); exit 0;"; \
+ echo "fi"; \
+ echo "rm -f Queens.class"; \
+ echo "\$${JAVA_HOME}/bin/javac -d . $(GAMMADIR)/make/test/Queens.java"; \
+ echo '[ -f gamma_g ] && { gamma=gamma_g; }'; \
+ echo './$${gamma:-gamma} $(TESTFLAGS) Queens < /dev/null'; \
+ ) > $@
+ $(QUIETLY) chmod +x $@
+
+FORCE:
+
+.PHONY: all FORCE
diff --git a/hotspot/make/linux/makefiles/compiler1.make b/hotspot/make/bsd/makefiles/compiler1.make
similarity index 100%
copy from hotspot/make/linux/makefiles/compiler1.make
copy to hotspot/make/bsd/makefiles/compiler1.make
diff --git a/hotspot/make/linux/makefiles/compiler2.make b/hotspot/make/bsd/makefiles/compiler2.make
similarity index 100%
copy from hotspot/make/linux/makefiles/compiler2.make
copy to hotspot/make/bsd/makefiles/compiler2.make
diff --git a/hotspot/make/linux/makefiles/core.make b/hotspot/make/bsd/makefiles/core.make
similarity index 100%
copy from hotspot/make/linux/makefiles/core.make
copy to hotspot/make/bsd/makefiles/core.make
diff --git a/hotspot/make/bsd/makefiles/cscope.make b/hotspot/make/bsd/makefiles/cscope.make
new file mode 100644
index 0000000..7a12b3b
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/cscope.make
@@ -0,0 +1,160 @@
+#
+# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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 cscope.out file is made in the current directory and spans the entire
+# source tree.
+#
+# Things to note:
+# 1. We use relative names for cscope.
+# 2. We *don't* remove the old cscope.out file, because cscope is smart
+# enough to only build what has changed. It can be confused, however,
+# if files are renamed or removed, so it may be necessary to manually
+# remove cscope.out if a lot of reorganization has occurred.
+#
+
+include $(GAMMADIR)/make/scm.make
+
+NAWK = awk
+RM = rm -f
+HG = hg
+CS_TOP = ../..
+
+CSDIRS = $(CS_TOP)/src $(CS_TOP)/build
+CSINCS = $(CSDIRS:%=-I%)
+
+CSCOPE = cscope
+CSCOPE_FLAGS = -b
+
+# Allow .java files to be added from the environment (CSCLASSES=yes).
+ifdef CSCLASSES
+ADDCLASSES= -o -name '*.java'
+endif
+
+# Adding CClassHeaders also pushes the file count of a full workspace up about
+# 200 files (these files also don't exist in a new workspace, and thus will
+# cause the recreation of the database as they get created, which might seem
+# a little confusing). Thus allow these files to be added from the environment
+# (CSHEADERS=yes).
+ifndef CSHEADERS
+RMCCHEADERS= -o -name CClassHeaders
+endif
+
+# Use CS_GENERATED=x to include auto-generated files in the build directories.
+ifdef CS_GENERATED
+CS_ADD_GENERATED = -o -name '*.incl'
+else
+CS_PRUNE_GENERATED = -o -name '${OS}_*_core' -o -name '${OS}_*_compiler?'
+endif
+
+# OS-specific files for other systems are excluded by default. Use CS_OS=yes
+# to include platform-specific files for other platforms.
+ifndef CS_OS
+CS_OS = linux macos solaris win32 bsd
+CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
+endif
+
+# Processor-specific files for other processors are excluded by default. Use
+# CS_CPU=x to include platform-specific files for other platforms.
+ifndef CS_CPU
+CS_CPU = i486 sparc amd64 ia64
+CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU}))
+endif
+
+# What files should we include? A simple rule might be just those files under
+# SCCS control, however this would miss files we create like the opcodes and
+# CClassHeaders. The following attempts to find everything that is *useful*.
+# (.del files are created by sccsrm, demo directories contain many .java files
+# that probably aren't useful for development, and the pkgarchive may contain
+# duplicates of files within the source hierarchy).
+
+# Directories to exclude.
+CS_PRUNE_STD = $(SCM_DIRS) \
+ -o -name '.del-*' \
+ -o -name '*demo' \
+ -o -name pkgarchive
+
+CS_PRUNE = $(CS_PRUNE_STD) \
+ $(CS_PRUNE_OS) \
+ $(CS_PRUNE_CPU) \
+ $(CS_PRUNE_GENERATED) \
+ $(RMCCHEADERS)
+
+# File names to include.
+CSFILENAMES = -name '*.[ch]pp' \
+ -o -name '*.[Ccshlxy]' \
+ $(CS_ADD_GENERATED) \
+ -o -name '*.il' \
+ -o -name '*.cc' \
+ -o -name '*[Mm]akefile*' \
+ -o -name '*.gmk' \
+ -o -name '*.make' \
+ -o -name '*.ad' \
+ $(ADDCLASSES)
+
+.PRECIOUS: cscope.out
+
+cscope cscope.out: cscope.files FORCE
+ $(CSCOPE) $(CSCOPE_FLAGS)
+
+# The .raw file is reordered here in an attempt to make cscope display the most
+# relevant files first.
+cscope.files: .cscope.files.raw
+ echo "$(CSINCS)" > $@
+ -egrep -v "\.java|\/make\/" $< >> $@
+ -fgrep ".java" $< >> $@
+ -fgrep "/make/" $< >> $@
+
+.cscope.files.raw: .nametable.files
+ -find $(CSDIRS) -type d \( $(CS_PRUNE) \) -prune -o \
+ -type f \( $(CSFILENAMES) \) -print > $@
+
+cscope.clean: nametable.clean
+ -$(RM) cscope.out cscope.files .cscope.files.raw
+
+TAGS: cscope.files FORCE
+ egrep -v '^-|^$$' $< | etags --members -
+
+TAGS.clean: nametable.clean
+ -$(RM) TAGS
+
+# .nametable.files and .nametable.files.tmp are used to determine if any files
+# were added to/deleted from/renamed in the workspace. If not, then there's
+# normally no need to rebuild the cscope database. To force a rebuild of
+# the cscope database: gmake nametable.clean.
+.nametable.files: .nametable.files.tmp
+ ( cmp -s $@ $< ) || ( cp $< $@ )
+ -$(RM) $<
+
+# `hg status' is slightly faster than `hg fstatus'. Both are
+# quite a bit slower on an NFS mounted file system, so this is
+# really geared towards repos on local file systems.
+.nametable.files.tmp:
+ -$(HG) fstatus -acmn > $@
+nametable.clean:
+ -$(RM) .nametable.files .nametable.files.tmp
+
+FORCE:
+
+.PHONY: cscope cscope.clean TAGS.clean nametable.clean FORCE
diff --git a/hotspot/make/bsd/makefiles/debug.make b/hotspot/make/bsd/makefiles/debug.make
new file mode 100644
index 0000000..f0aec17
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/debug.make
@@ -0,0 +1,44 @@
+#
+# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Sets make macros for making debug version of VM
+
+# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
+DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
+DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
+CFLAGS += $(DEBUG_CFLAGS/BYFILE)
+
+# Linker mapfile
+MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
+
+_JUNK_ := $(shell echo -e >&2 ""\
+ "----------------------------------------------------------------------\n" \
+ "WARNING: 'make debug' is deprecated. It will be removed in the future.\n" \
+ "Please use 'make jvmg' to build debug JVM. \n" \
+ "----------------------------------------------------------------------\n")
+
+G_SUFFIX = _g
+VERSION = debug
+SYSDEFS += -DASSERT -DDEBUG
+PICFLAGS = DEFAULT
diff --git a/hotspot/make/bsd/makefiles/defs.make b/hotspot/make/bsd/makefiles/defs.make
new file mode 100644
index 0000000..7911365
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/defs.make
@@ -0,0 +1,170 @@
+#
+# Copyright (c) 2006, 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.
+#
+#
+
+# The common definitions for hotspot bsd builds.
+# Include the top level defs.make under make directory instead of this one.
+# This file is included into make/defs.make.
+
+SLASH_JAVA ?= /java
+
+# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+ARCH:=$(shell uname -m)
+PATH_SEP = :
+ifeq ($(LP64), 1)
+ ARCH_DATA_MODEL ?= 64
+else
+ ARCH_DATA_MODEL ?= 32
+endif
+
+# zero
+ifeq ($(ZERO_BUILD), true)
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ MAKE_ARGS += LP64=1
+ endif
+ PLATFORM = bsd-zero
+ VM_PLATFORM = bsd_$(subst i386,i486,$(ZERO_LIBARCH))
+ HS_ARCH = zero
+ ARCH = zero
+endif
+
+# ia64
+ifeq ($(ARCH), ia64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+ PLATFORM = bsd-ia64
+ VM_PLATFORM = bsd_ia64
+ HS_ARCH = ia64
+endif
+
+# sparc
+ifeq ($(ARCH), sparc64)
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+ PLATFORM = bsd-sparcv9
+ VM_PLATFORM = bsd_sparcv9
+ else
+ ARCH_DATA_MODEL = 32
+ PLATFORM = bsd-sparc
+ VM_PLATFORM = bsd_sparc
+ endif
+ HS_ARCH = sparc
+endif
+
+# amd64
+ifneq (,$(findstring $(ARCH), amd64 x86_64))
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+ PLATFORM = bsd-amd64
+ VM_PLATFORM = bsd_amd64
+ HS_ARCH = x86
+ else
+ ARCH_DATA_MODEL = 32
+ PLATFORM = bsd-i586
+ VM_PLATFORM = bsd_i486
+ HS_ARCH = x86
+ # We have to reset ARCH to i386 since SRCARCH relies on it
+ ARCH = i386
+ endif
+endif
+
+# i386
+ifeq ($(ARCH), i386)
+ ifeq ($(ARCH_DATA_MODEL), 64)
+ ARCH_DATA_MODEL = 64
+ MAKE_ARGS += LP64=1
+ PLATFORM = bsd-amd64
+ VM_PLATFORM = bsd_amd64
+ HS_ARCH = x86
+ # We have to reset ARCH to amd64 since SRCARCH relies on it
+ ARCH = amd64
+ else
+ ARCH_DATA_MODEL = 32
+ PLATFORM = bsd-i586
+ VM_PLATFORM = bsd_i486
+ HS_ARCH = x86
+ endif
+endif
+
+# ARM
+ifeq ($(ARCH), arm)
+ ARCH_DATA_MODEL = 32
+ PLATFORM = bsd-arm
+ VM_PLATFORM = bsd_arm
+ HS_ARCH = arm
+endif
+
+# PPC
+ifeq ($(ARCH), ppc)
+ ARCH_DATA_MODEL = 32
+ PLATFORM = bsd-ppc
+ VM_PLATFORM = bsd_ppc
+ HS_ARCH = ppc
+endif
+
+JDK_INCLUDE_SUBDIR=bsd
+
+# Library suffix
+OS_VENDOR:=$(shell uname -s)
+ifeq ($(OS_VENDOR),Darwin)
+ LIBRARY_SUFFIX=dylib
+else
+ LIBRARY_SUFFIX=so
+endif
+
+# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
+VM_DEBUG=jvmg
+
+EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+
+# client and server subdirectories have symbolic links to ../libjsig.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
+EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+
+ifndef BUILD_CLIENT_ONLY
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+endif
+
+ifneq ($(ZERO_BUILD), true)
+ ifeq ($(ARCH_DATA_MODEL), 32)
+ EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ endif
+endif
+
+# Serviceability Binaries
+# No SA Support for PPC, IA64, ARM or zero
+ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
+ $(EXPORT_LIB_DIR)/sa-jdi.jar
+ADD_SA_BINARIES/ppc =
+ADD_SA_BINARIES/ia64 =
+ADD_SA_BINARIES/arm =
+ADD_SA_BINARIES/zero =
+
+EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
diff --git a/hotspot/make/bsd/makefiles/dtrace.make b/hotspot/make/bsd/makefiles/dtrace.make
new file mode 100644
index 0000000..6ee23a3
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/dtrace.make
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Bsd does not build jvm_db
+LIBJVM_DB =
+
diff --git a/hotspot/make/bsd/makefiles/fastdebug.make b/hotspot/make/bsd/makefiles/fastdebug.make
new file mode 100644
index 0000000..c550d9b
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/fastdebug.make
@@ -0,0 +1,64 @@
+#
+# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Sets make macros for making debug version of VM
+
+# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
+
+# (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
+
+ifeq ($(BUILDARCH), ia64)
+ # Bug in GCC, causes hang. -O1 will override the -O3 specified earlier
+ OPT_CFLAGS/callGenerator.o += -O1
+ OPT_CFLAGS/ciTypeFlow.o += -O1
+ OPT_CFLAGS/compile.o += -O1
+ OPT_CFLAGS/concurrentMarkSweepGeneration.o += -O1
+ OPT_CFLAGS/doCall.o += -O1
+ OPT_CFLAGS/generateOopMap.o += -O1
+ OPT_CFLAGS/generateOptoStub.o += -O1
+ OPT_CFLAGS/graphKit.o += -O1
+ OPT_CFLAGS/instanceKlass.o += -O1
+ OPT_CFLAGS/interpreterRT_ia64.o += -O1
+ OPT_CFLAGS/output.o += -O1
+ OPT_CFLAGS/parse1.o += -O1
+ OPT_CFLAGS/runtime.o += -O1
+ OPT_CFLAGS/synchronizer.o += -O1
+endif
+
+
+# If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings
+CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
+
+# Linker mapfile
+MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
+
+G_SUFFIX = _g
+VERSION = optimized
+SYSDEFS += -DASSERT -DFASTDEBUG
+PICFLAGS = DEFAULT
diff --git a/hotspot/make/bsd/makefiles/gcc.make b/hotspot/make/bsd/makefiles/gcc.make
new file mode 100644
index 0000000..3b340dc
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/gcc.make
@@ -0,0 +1,267 @@
+#
+# Copyright (c) 1999, 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.
+#
+#
+
+OS_VENDOR = $(shell uname -s)
+
+#------------------------------------------------------------------------
+# CC, CPP & AS
+
+# When cross-compiling the ALT_COMPILER_PATH points
+# to the cross-compilation toolset
+ifdef CROSS_COMPILE_ARCH
+CXX = $(ALT_COMPILER_PATH)/g++
+CPP = $(ALT_COMPILER_PATH)/g++
+CC = $(ALT_COMPILER_PATH)/gcc
+HOSTCPP = g++
+HOSTCC = gcc
+else
+CXX ?= g++
+CPP = $(CXX)
+CC ?= gcc
+HOSTCPP = $(CPP)
+HOSTCC = $(CPP)
+endif
+
+AS = $(CC) -c -x assembler-with-cpp
+
+# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
+# prints the numbers (e.g. "2.95", "3.2.1")
+CC_VER_MAJOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f1)
+CC_VER_MINOR := $(shell $(CC) -dumpversion | sed 's/egcs-//' | cut -d'.' -f2)
+
+# check for precompiled headers support
+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 3 \) \| \( \( $(CC_VER_MAJOR) = 3 \) \& \( $(CC_VER_MINOR) \>= 4 \) \))" "0"
+# Allow the user to turn off precompiled headers from the command line.
+ifneq ($(USE_PRECOMPILED_HEADER),0)
+USE_PRECOMPILED_HEADER=1
+PRECOMPILED_HEADER_DIR=.
+PRECOMPILED_HEADER_SRC=$(GAMMADIR)/src/share/vm/precompiled.hpp
+PRECOMPILED_HEADER=$(PRECOMPILED_HEADER_DIR)/precompiled.hpp.gch
+endif
+endif
+
+
+#------------------------------------------------------------------------
+# Compiler flags
+
+# position-independent code
+PICFLAG = -fPIC
+
+VM_PICFLAG/LIBJVM = $(PICFLAG)
+VM_PICFLAG/AOUT =
+VM_PICFLAG = $(VM_PICFLAG/$(LINK_INTO))
+
+ifeq ($(ZERO_BUILD), true)
+CFLAGS += $(LIBFFI_CFLAGS)
+endif
+ifeq ($(SHARK_BUILD), true)
+CFLAGS += $(LLVM_CFLAGS)
+endif
+CFLAGS += $(VM_PICFLAG)
+CFLAGS += -fno-rtti
+CFLAGS += -fno-exceptions
+CFLAGS += -pthread
+CFLAGS += -fcheck-new
+# version 4 and above support fvisibility=hidden (matches jni_x86.h file)
+# except 4.1.2 gives pointless warnings that can't be disabled (afaik)
+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+CFLAGS += -fvisibility=hidden
+endif
+
+ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
+ARCHFLAG/i486 = -m32 -march=i586
+ARCHFLAG/amd64 = -m64
+ARCHFLAG/ia64 =
+ARCHFLAG/sparc = -m32 -mcpu=v9
+ARCHFLAG/sparcv9 = -m64 -mcpu=v9
+ARCHFLAG/zero = $(ZERO_ARCHFLAG)
+
+# Darwin-specific build flags
+ifeq ($(OS_VENDOR), Darwin)
+ # Ineffecient 16-byte stack re-alignment on Darwin/IA32
+ ARCHFLAG/i486 += -mstackrealign
+endif
+
+CFLAGS += $(ARCHFLAG)
+AOUT_FLAGS += $(ARCHFLAG)
+LFLAGS += $(ARCHFLAG)
+ASFLAGS += $(ARCHFLAG)
+
+ifdef E500V2
+CFLAGS += -DE500V2
+endif
+
+# Use C++ Interpreter
+ifdef CC_INTERP
+ CFLAGS += -DCC_INTERP
+endif
+
+# Build for embedded targets
+ifdef JAVASE_EMBEDDED
+ CFLAGS += -DJAVASE_EMBEDDED
+endif
+
+# Keep temporary files (.ii, .s)
+ifdef NEED_ASM
+ CFLAGS += -save-temps
+else
+ CFLAGS += -pipe
+endif
+
+# Compiler warnings are treated as errors
+WARNINGS_ARE_ERRORS = -Werror
+
+# Except for a few acceptable ones
+# Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
+# conversions which might affect the values. To avoid that, we need to turn
+# it off explicitly.
+ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
+ACCEPTABLE_WARNINGS = -Wpointer-arith -Wsign-compare
+else
+ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
+endif
+
+CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
+# Special cases
+CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
+# XXXDARWIN: for _dyld_bind_fully_image_containing_address
+ifeq ($(OS_VENDOR), Darwin)
+ CFLAGS_WARN/os_bsd.o = $(CFLAGS_WARN/DEFAULT) -Wno-deprecated-declarations
+endif
+
+
+# The flags to use for an Optimized g++ build
+OPT_CFLAGS += -O3
+
+# Hotspot uses very unstrict aliasing turn this optimization off
+OPT_CFLAGS += -fno-strict-aliasing
+
+# The gcc compiler segv's on ia64 when compiling bytecodeInterpreter.cpp
+# if we use expensive-optimizations
+ifeq ($(BUILDARCH), ia64)
+OPT_CFLAGS += -fno-expensive-optimizations
+endif
+
+OPT_CFLAGS/NOOPT=-O0
+
+# 6835796. Problem in GCC 4.3.0 with mulnode.o optimized compilation.
+ifneq "$(shell expr \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) = 3 \) \))" "0"
+OPT_CFLAGS/mulnode.o += -O0
+endif
+
+# Flags for generating make dependency flags.
+ifneq ("${CC_VER_MAJOR}", "2")
+DEPFLAGS = -MMD -MP -MF $(DEP_DIR)/$(@:%=%.d)
+endif
+
+# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
+ifneq ($(USE_PRECOMPILED_HEADER),1)
+CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
+endif
+
+#------------------------------------------------------------------------
+# Linker flags
+
+# statically link libstdc++.so, work with gcc but ignored by g++
+STATIC_STDCXX = -Wl,-Bstatic -lstdc++ -Wl,-Bdynamic
+
+# statically link libgcc and/or libgcc_s, libgcc does not exist before gcc-3.x.
+ifneq ("${CC_VER_MAJOR}", "2")
+STATIC_LIBGCC += -static-libgcc
+endif
+
+ifeq ($(BUILDARCH), ia64)
+LFLAGS += -Wl,-relax
+endif
+
+# Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
+MAPFLAG = -Xlinker --version-script=FILENAME
+
+#
+# Shared Library
+#
+ifeq ($(OS_VENDOR), Darwin)
+ # Standard linker flags
+ LFLAGS +=
+
+ # Darwin doesn't use ELF and doesn't support version scripts
+ LDNOMAP = true
+
+ # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
+ SONAMEFLAG =
+
+ # Build shared library
+ SHARED_FLAG = -dynamiclib $(VM_PICFLAG)
+
+ # Keep symbols even they are not used
+ #AOUT_FLAGS += -Xlinker -export-dynamic
+else
+ # Enable linker optimization
+ LFLAGS += -Xlinker -O1
+
+ # Use $(SONAMEFLAG:SONAME=soname) to specify the intrinsic name of a shared obj
+ SONAMEFLAG = -Xlinker -soname=SONAME
+
+ # Build shared library
+ SHARED_FLAG = -shared $(VM_PICFLAG)
+
+ # Keep symbols even they are not used
+ AOUT_FLAGS += -Xlinker -export-dynamic
+endif
+
+#------------------------------------------------------------------------
+# Debug flags
+
+# Use the stabs format for debugging information (this is the default
+# on gcc-2.91). It's good enough, has all the information about line
+# numbers and local variables, and libjvm_g.so is only about 16M.
+# Change this back to "-g" if you want the most expressive format.
+# (warning: that could easily inflate libjvm_g.so to 150M!)
+# Note: The Itanium gcc compiler crashes when using -gstabs.
+DEBUG_CFLAGS/ia64 = -g
+DEBUG_CFLAGS/amd64 = -g
+DEBUG_CFLAGS/arm = -g
+DEBUG_CFLAGS/ppc = -g
+DEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
+ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
+DEBUG_CFLAGS += -gstabs
+endif
+
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ DEBUG_CFLAGS = -g
+ CFLAGS += $(DEBUG_CFLAGS)
+endif
+
+# If we are building HEADLESS, pass on to VM
+# so it can set the java.awt.headless property
+ifdef HEADLESS
+CFLAGS += -DHEADLESS
+endif
+
+# We are building Embedded for a small device
+# favor code space over speed
+ifdef MINIMIZE_RAM_USAGE
+CFLAGS += -DMINIMIZE_RAM_USAGE
+endif
diff --git a/hotspot/make/linux/makefiles/hp.make b/hotspot/make/bsd/makefiles/hp.make
similarity index 100%
copy from hotspot/make/linux/makefiles/hp.make
copy to hotspot/make/bsd/makefiles/hp.make
diff --git a/hotspot/make/linux/makefiles/hp1.make b/hotspot/make/bsd/makefiles/hp1.make
similarity index 100%
copy from hotspot/make/linux/makefiles/hp1.make
copy to hotspot/make/bsd/makefiles/hp1.make
diff --git a/hotspot/make/linux/makefiles/i486.make b/hotspot/make/bsd/makefiles/i486.make
similarity index 100%
copy from hotspot/make/linux/makefiles/i486.make
copy to hotspot/make/bsd/makefiles/i486.make
diff --git a/hotspot/make/linux/makefiles/ia64.make b/hotspot/make/bsd/makefiles/ia64.make
similarity index 100%
copy from hotspot/make/linux/makefiles/ia64.make
copy to hotspot/make/bsd/makefiles/ia64.make
diff --git a/hotspot/make/bsd/makefiles/jsig.make b/hotspot/make/bsd/makefiles/jsig.make
new file mode 100644
index 0000000..80be208
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/jsig.make
@@ -0,0 +1,67 @@
+#
+# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+#
+
+# Rules to build signal interposition library, used by vm.make
+
+# libjsig[_g].so: signal interposition library
+JSIG = jsig
+JSIG_G = $(JSIG)$(G_SUFFIX)
+
+ifeq ($(OS_VENDOR), Darwin)
+ LIBJSIG = lib$(JSIG).dylib
+ LIBJSIG_G = lib$(JSIG_G).dylib
+else
+ LIBJSIG = lib$(JSIG).so
+ LIBJSIG_G = lib$(JSIG_G).so
+endif
+
+JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
+
+DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+
+LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
+
+# On Bsd we really dont want a mapfile, as this library is small
+# and preloaded using LD_PRELOAD, making functions private will
+# cause problems with interposing. See CR: 6466665
+# LFLAGS_JSIG += $(MAPFLAG:FILENAME=$(LIBJSIG_MAPFILE))
+
+LFLAGS_JSIG += -D_GNU_SOURCE -pthread $(LDFLAGS_HASH_STYLE)
+
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ JSIG_DEBUG_CFLAGS = -g
+endif
+
+$(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
+ @echo Making signal interposition lib...
+ $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
+ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
+
+install_jsig: $(LIBJSIG)
+ @echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
+ $(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
+
+.PHONY: install_jsig
diff --git a/hotspot/make/bsd/makefiles/jvmg.make b/hotspot/make/bsd/makefiles/jvmg.make
new file mode 100644
index 0000000..8c56368
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/jvmg.make
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Sets make macros for making debug version of VM
+
+# Compiler specific DEBUG_CFLAGS are passed in from gcc.make, sparcWorks.make
+DEBUG_CFLAGS/DEFAULT= $(DEBUG_CFLAGS)
+DEBUG_CFLAGS/BYFILE = $(DEBUG_CFLAGS/$@)$(DEBUG_CFLAGS/DEFAULT$(DEBUG_CFLAGS/$@))
+CFLAGS += $(DEBUG_CFLAGS/BYFILE)
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
+
+# Linker mapfile
+MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
+
+G_SUFFIX = _g
+VERSION = debug
+SYSDEFS += -DASSERT -DDEBUG
+PICFLAGS = DEFAULT
diff --git a/hotspot/make/bsd/makefiles/jvmti.make b/hotspot/make/bsd/makefiles/jvmti.make
new file mode 100644
index 0000000..ee3cc1e
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/jvmti.make
@@ -0,0 +1,117 @@
+#
+# Copyright (c) 2003, 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.
+#
+#
+
+# This makefile (jvmti.make) is included from the jvmti.make in the
+# build directories.
+#
+# It knows how to build and run the tools to generate jvmti.
+
+include $(GAMMADIR)/make/bsd/makefiles/rules.make
+
+# #########################################################################
+
+TOPDIR = $(shell echo `pwd`)
+GENERATED = $(TOPDIR)/../generated
+JvmtiOutDir = $(GENERATED)/jvmtifiles
+
+JvmtiSrcDir = $(GAMMADIR)/src/share/vm/prims
+InterpreterSrcDir = $(GAMMADIR)/src/share/vm/interpreter
+
+# set VPATH so make knows where to look for source files
+Src_Dirs_V += $(JvmtiSrcDir)
+VPATH += $(Src_Dirs_V:%=%:)
+
+JvmtiGeneratedNames = \
+ jvmtiEnv.hpp \
+ jvmtiEnter.cpp \
+ jvmtiEnterTrace.cpp \
+ jvmtiEnvRecommended.cpp \
+ bytecodeInterpreterWithChecks.cpp \
+ jvmti.h \
+
+JvmtiEnvFillSource = $(JvmtiSrcDir)/jvmtiEnvFill.java
+JvmtiEnvFillClass = $(JvmtiOutDir)/jvmtiEnvFill.class
+
+JvmtiGenSource = $(JvmtiSrcDir)/jvmtiGen.java
+JvmtiGenClass = $(JvmtiOutDir)/jvmtiGen.class
+
+JvmtiGeneratedFiles = $(JvmtiGeneratedNames:%=$(JvmtiOutDir)/%)
+
+XSLT = $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiGen
+
+.PHONY: all jvmtidocs clean cleanall
+
+# #########################################################################
+
+all: $(JvmtiGeneratedFiles)
+
+both = $(JvmtiGenClass) $(JvmtiSrcDir)/jvmti.xml $(JvmtiSrcDir)/jvmtiLib.xsl
+
+$(JvmtiGenClass): $(JvmtiGenSource)
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiGenSource)
+
+$(JvmtiEnvFillClass): $(JvmtiEnvFillSource)
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -d $(JvmtiOutDir) $(JvmtiEnvFillSource)
+
+$(JvmtiOutDir)/jvmtiEnter.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnter.cpp -PARAM interface jvmti
+
+$(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp: $(JvmtiGenClass) $(InterpreterSrcDir)/bytecodeInterpreter.cpp $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xml -XSL $(InterpreterSrcDir)/bytecodeInterpreterWithChecks.xsl -OUT $(JvmtiOutDir)/bytecodeInterpreterWithChecks.cpp
+
+$(JvmtiOutDir)/jvmtiEnterTrace.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnter.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnter.xsl -OUT $(JvmtiOutDir)/jvmtiEnterTrace.cpp -PARAM interface jvmti -PARAM trace Trace
+
+$(JvmtiOutDir)/jvmtiEnvRecommended.cpp: $(both) $(JvmtiSrcDir)/jvmtiEnv.xsl $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiEnvFillClass)
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiEnv.xsl -OUT $(JvmtiOutDir)/jvmtiEnvStub.cpp
+ $(QUIETLY) $(REMOTE) $(RUN.JAVA) -classpath $(JvmtiOutDir) jvmtiEnvFill $(JvmtiSrcDir)/jvmtiEnv.cpp $(JvmtiOutDir)/jvmtiEnvStub.cpp $(JvmtiOutDir)/jvmtiEnvRecommended.cpp
+
+$(JvmtiOutDir)/jvmtiEnv.hpp: $(both) $(JvmtiSrcDir)/jvmtiHpp.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiHpp.xsl -OUT $(JvmtiOutDir)/jvmtiEnv.hpp
+
+$(JvmtiOutDir)/jvmti.h: $(both) $(JvmtiSrcDir)/jvmtiH.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmtiH.xsl -OUT $(JvmtiOutDir)/jvmti.h
+
+jvmtidocs: $(JvmtiOutDir)/jvmti.html
+
+$(JvmtiOutDir)/jvmti.html: $(both) $(JvmtiSrcDir)/jvmti.xsl
+ @echo Generating $@
+ $(XSLT) -IN $(JvmtiSrcDir)/jvmti.xml -XSL $(JvmtiSrcDir)/jvmti.xsl -OUT $(JvmtiOutDir)/jvmti.html
+
+# #########################################################################
+
+clean :
+ rm $(JvmtiGenClass) $(JvmtiEnvFillClass) $(JvmtiGeneratedFiles)
+
+cleanall :
+ rm $(JvmtiGenClass) $(JvmtiEnvFillClass) $(JvmtiGeneratedFiles)
+
+# #########################################################################
+
diff --git a/hotspot/make/bsd/makefiles/launcher.make b/hotspot/make/bsd/makefiles/launcher.make
new file mode 100644
index 0000000..b405fbc
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/launcher.make
@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2005, 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.
+#
+#
+
+# Rules to build gamma launcher, used by vm.make
+
+
+LAUNCHER_SCRIPT = hotspot
+LAUNCHER = gamma
+
+LAUNCHERDIR := $(GAMMADIR)/src/os/posix/launcher
+LAUNCHERDIR_SHARE := $(GAMMADIR)/src/share/tools/launcher
+LAUNCHERFLAGS := $(ARCHFLAG) \
+ -I$(LAUNCHERDIR) -I$(GAMMADIR)/src/share/vm/prims \
+ -I$(LAUNCHERDIR_SHARE) \
+ -DFULL_VERSION=\"$(HOTSPOT_RELEASE_VERSION)\" \
+ -DJDK_MAJOR_VERSION=\"$(JDK_MAJOR_VERSION)\" \
+ -DJDK_MINOR_VERSION=\"$(JDK_MINOR_VERSION)\" \
+ -DARCH=\"$(LIBARCH)\" \
+ -DGAMMA \
+ -DLAUNCHER_TYPE=\"gamma\" \
+ -DLINK_INTO_$(LINK_INTO) \
+ $(TARGET_DEFINES)
+
+ifeq ($(LINK_INTO),AOUT)
+ LAUNCHER.o = launcher.o $(JVM_OBJ_FILES)
+ LAUNCHER_MAPFILE = mapfile_reorder
+ LFLAGS_LAUNCHER$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LAUNCHER_MAPFILE))
+ LFLAGS_LAUNCHER += $(SONAMEFLAG:SONAME=$(LIBJVM)) $(STATIC_LIBGCC)
+ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
+else
+ LAUNCHER.o = launcher.o
+ LFLAGS_LAUNCHER += -L`pwd`
+ LIBS_LAUNCHER += -l$(JVM) $(LIBS)
+endif
+
+LINK_LAUNCHER = $(LINK.c)
+
+LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK)
+LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
+
+LAUNCHER_OUT = launcher
+
+SUFFIXES += .d
+
+SOURCES := $(shell find $(LAUNCHERDIR) -name "*.c")
+SOURCES_SHARE := $(shell find $(LAUNCHERDIR_SHARE) -name "*.c")
+
+OBJS := $(patsubst $(LAUNCHERDIR)/%.c,$(LAUNCHER_OUT)/%.o,$(SOURCES)) $(patsubst $(LAUNCHERDIR_SHARE)/%.c,$(LAUNCHER_OUT)/%.o,$(SOURCES_SHARE))
+
+DEPFILES := $(patsubst %.o,%.d,$(OBJS))
+-include $(DEPFILES)
+
+$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR_SHARE)/%.c
+ $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+
+$(LAUNCHER_OUT)/%.o: $(LAUNCHERDIR)/%.c
+ $(QUIETLY) [ -d $(LAUNCHER_OUT) ] || { mkdir -p $(LAUNCHER_OUT); }
+ $(QUIETLY) $(CC) -g -o $@ -c $< -MMD $(LAUNCHERFLAGS) $(CPPFLAGS)
+
+$(LAUNCHER): $(OBJS) $(LIBJVM) $(LAUNCHER_MAPFILE)
+ $(QUIETLY) echo Linking launcher...
+ $(QUIETLY) $(LINK_LAUNCHER/PRE_HOOK)
+ $(QUIETLY) $(LINK_LAUNCHER) $(LFLAGS_LAUNCHER) -o $@ $(OBJS) $(LIBS_LAUNCHER)
+ $(QUIETLY) $(LINK_LAUNCHER/POST_HOOK)
+
+$(LAUNCHER): $(LAUNCHER_SCRIPT)
+
+$(LAUNCHER_SCRIPT): $(LAUNCHERDIR)/launcher.script
+ $(QUIETLY) sed -e 's/@@LIBARCH@@/$(LIBARCH)/g' $< > $@
+ $(QUIETLY) chmod +x $@
+
diff --git a/hotspot/make/bsd/makefiles/mapfile-vers-debug b/hotspot/make/bsd/makefiles/mapfile-vers-debug
new file mode 100644
index 0000000..9a2d42f
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-debug
@@ -0,0 +1,291 @@
+#
+# @(#)mapfile-vers-debug 1.18 07/10/25 16:47:35
+#
+
+#
+# Copyright (c) 2002, 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.
+#
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+ global:
+ # JNI
+ JNI_CreateJavaVM;
+ JNI_GetCreatedJavaVMs;
+ JNI_GetDefaultJavaVMInitArgs;
+
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
+ JVM_AllocateNewArray;
+ JVM_AllocateNewObject;
+ JVM_ArrayCopy;
+ JVM_AssertionStatusDirectives;
+ JVM_Available;
+ JVM_Bind;
+ JVM_ClassDepth;
+ JVM_ClassLoaderDepth;
+ JVM_Clone;
+ JVM_Close;
+ JVM_CX8Field;
+ JVM_CompileClass;
+ JVM_CompileClasses;
+ JVM_CompilerCommand;
+ JVM_Connect;
+ JVM_ConstantPoolGetClassAt;
+ JVM_ConstantPoolGetClassAtIfLoaded;
+ JVM_ConstantPoolGetDoubleAt;
+ JVM_ConstantPoolGetFieldAt;
+ JVM_ConstantPoolGetFieldAtIfLoaded;
+ JVM_ConstantPoolGetFloatAt;
+ JVM_ConstantPoolGetIntAt;
+ JVM_ConstantPoolGetLongAt;
+ JVM_ConstantPoolGetMethodAt;
+ JVM_ConstantPoolGetMethodAtIfLoaded;
+ JVM_ConstantPoolGetMemberRefInfoAt;
+ JVM_ConstantPoolGetSize;
+ JVM_ConstantPoolGetStringAt;
+ JVM_ConstantPoolGetUTF8At;
+ JVM_CountStackFrames;
+ JVM_CurrentClassLoader;
+ JVM_CurrentLoadedClass;
+ JVM_CurrentThread;
+ JVM_CurrentTimeMillis;
+ JVM_DefineClass;
+ JVM_DefineClassWithSource;
+ JVM_DefineClassWithSourceCond;
+ JVM_DesiredAssertionStatus;
+ JVM_DisableCompiler;
+ JVM_DoPrivileged;
+ JVM_DTraceGetVersion;
+ JVM_DTraceActivate;
+ JVM_DTraceIsProbeEnabled;
+ JVM_DTraceIsSupported;
+ JVM_DTraceDispose;
+ JVM_DumpAllStacks;
+ JVM_DumpThreads;
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+ JVM_FindLibraryEntry;
+ JVM_FindLoadedClass;
+ JVM_FindPrimitiveClass;
+ JVM_FindSignal;
+ JVM_FreeMemory;
+ JVM_GC;
+ JVM_GetAllThreads;
+ JVM_GetArrayElement;
+ JVM_GetArrayLength;
+ JVM_GetCPClassNameUTF;
+ JVM_GetCPFieldClassNameUTF;
+ JVM_GetCPFieldModifiers;
+ JVM_GetCPFieldNameUTF;
+ JVM_GetCPFieldSignatureUTF;
+ JVM_GetCPMethodClassNameUTF;
+ JVM_GetCPMethodModifiers;
+ JVM_GetCPMethodNameUTF;
+ JVM_GetCPMethodSignatureUTF;
+ JVM_GetCallerClass;
+ JVM_GetClassAccessFlags;
+ JVM_GetClassAnnotations;
+ JVM_GetClassCPEntriesCount;
+ JVM_GetClassCPTypes;
+ JVM_GetClassConstantPool;
+ JVM_GetClassContext;
+ JVM_GetClassDeclaredConstructors;
+ JVM_GetClassDeclaredFields;
+ JVM_GetClassDeclaredMethods;
+ JVM_GetClassFieldsCount;
+ JVM_GetClassInterfaces;
+ JVM_GetClassLoader;
+ JVM_GetClassMethodsCount;
+ JVM_GetClassModifiers;
+ JVM_GetClassName;
+ JVM_GetClassNameUTF;
+ JVM_GetClassSignature;
+ JVM_GetClassSigners;
+ JVM_GetComponentType;
+ JVM_GetDeclaredClasses;
+ JVM_GetDeclaringClass;
+ JVM_GetEnclosingMethodInfo;
+ JVM_GetFieldAnnotations;
+ JVM_GetFieldIxModifiers;
+ JVM_GetHostName;
+ JVM_GetInheritedAccessControlContext;
+ JVM_GetInterfaceVersion;
+ JVM_GetLastErrorString;
+ JVM_GetManagement;
+ JVM_GetMethodAnnotations;
+ JVM_GetMethodDefaultAnnotationValue;
+ JVM_GetMethodIxArgsSize;
+ JVM_GetMethodIxByteCode;
+ JVM_GetMethodIxByteCodeLength;
+ JVM_GetMethodIxExceptionIndexes;
+ JVM_GetMethodIxExceptionTableEntry;
+ JVM_GetMethodIxExceptionTableLength;
+ JVM_GetMethodIxExceptionsCount;
+ JVM_GetMethodIxLocalsCount;
+ JVM_GetMethodIxMaxStack;
+ JVM_GetMethodIxModifiers;
+ JVM_GetMethodIxNameUTF;
+ JVM_GetMethodIxSignatureUTF;
+ JVM_GetMethodParameterAnnotations;
+ JVM_GetPrimitiveArrayElement;
+ JVM_GetProtectionDomain;
+ JVM_GetSockName;
+ JVM_GetSockOpt;
+ JVM_GetStackAccessControlContext;
+ JVM_GetStackTraceDepth;
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+ JVM_Halt;
+ JVM_HoldsLock;
+ JVM_IHashCode;
+ JVM_InitAgentProperties;
+ JVM_InitProperties;
+ JVM_InitializeCompiler;
+ JVM_InitializeSocketLibrary;
+ JVM_InternString;
+ JVM_Interrupt;
+ JVM_InvokeMethod;
+ JVM_IsArrayClass;
+ JVM_IsConstructorIx;
+ JVM_IsInterface;
+ JVM_IsInterrupted;
+ JVM_IsNaN;
+ JVM_IsPrimitiveClass;
+ JVM_IsSameClassPackage;
+ JVM_IsSilentCompiler;
+ JVM_IsSupportedJNIVersion;
+ JVM_IsThreadAlive;
+ JVM_LatestUserDefinedLoader;
+ JVM_Listen;
+ JVM_LoadClass0;
+ JVM_LoadLibrary;
+ JVM_Lseek;
+ JVM_MaxObjectInspectionAge;
+ JVM_MaxMemory;
+ JVM_MonitorNotify;
+ JVM_MonitorNotifyAll;
+ JVM_MonitorWait;
+ JVM_NanoTime;
+ JVM_NativePath;
+ JVM_NewArray;
+ JVM_NewInstanceFromConstructor;
+ JVM_NewMultiArray;
+ JVM_OnExit;
+ JVM_Open;
+ JVM_PrintStackTrace;
+ JVM_RaiseSignal;
+ JVM_RawMonitorCreate;
+ JVM_RawMonitorDestroy;
+ JVM_RawMonitorEnter;
+ JVM_RawMonitorExit;
+ JVM_Read;
+ JVM_Recv;
+ JVM_RecvFrom;
+ JVM_RegisterSignal;
+ JVM_ReleaseUTF;
+ JVM_ResolveClass;
+ JVM_ResumeThread;
+ JVM_Send;
+ JVM_SendTo;
+ JVM_SetArrayElement;
+ JVM_SetClassSigners;
+ JVM_SetLength;
+ JVM_SetPrimitiveArrayElement;
+ JVM_SetProtectionDomain;
+ JVM_SetSockOpt;
+ JVM_SetThreadPriority;
+ JVM_Sleep;
+ JVM_Socket;
+ JVM_SocketAvailable;
+ JVM_SocketClose;
+ JVM_SocketShutdown;
+ JVM_StartThread;
+ JVM_StopThread;
+ JVM_SuspendThread;
+ JVM_SupportsCX8;
+ JVM_Sync;
+ JVM_Timeout;
+ JVM_TotalMemory;
+ JVM_TraceInstructions;
+ JVM_TraceMethodCalls;
+ JVM_UnloadLibrary;
+ JVM_Write;
+ JVM_Yield;
+ JVM_handle_bsd_signal;
+
+ # Old reflection routines
+ # These do not need to be present in the product build in JDK 1.4
+ # but their code has not been removed yet because there will not
+ # be a substantial code savings until JVM_InvokeMethod and
+ # JVM_NewInstanceFromConstructor can also be removed; see
+ # reflectionCompat.hpp.
+ JVM_GetClassConstructor;
+ JVM_GetClassConstructors;
+ JVM_GetClassField;
+ JVM_GetClassFields;
+ JVM_GetClassMethod;
+ JVM_GetClassMethods;
+ JVM_GetField;
+ JVM_GetPrimitiveField;
+ JVM_NewInstance;
+ JVM_SetField;
+ JVM_SetPrimitiveField;
+
+ # debug JVM
+ JVM_AccessVMBooleanFlag;
+ JVM_AccessVMIntFlag;
+ JVM_VMBreakPoint;
+
+ # miscellaneous functions
+ jio_fprintf;
+ jio_printf;
+ jio_snprintf;
+ jio_vfprintf;
+ jio_vsnprintf;
+ fork1;
+ numa_warn;
+ numa_error;
+
+ # Needed because there is no JVM interface for this.
+ sysThreadAvailableStackWithSlack;
+
+ # This is for Forte Analyzer profiling support.
+ AsyncGetCallTrace;
+
+ # INSERT VTABLE SYMBOLS HERE
+
+ local:
+ *;
+};
+
diff --git a/hotspot/make/linux/makefiles/mapfile-vers-jsig b/hotspot/make/bsd/makefiles/mapfile-vers-jsig
similarity index 100%
copy from hotspot/make/linux/makefiles/mapfile-vers-jsig
copy to hotspot/make/bsd/makefiles/mapfile-vers-jsig
diff --git a/hotspot/make/bsd/makefiles/mapfile-vers-product b/hotspot/make/bsd/makefiles/mapfile-vers-product
new file mode 100644
index 0000000..7a5d7c7
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/mapfile-vers-product
@@ -0,0 +1,286 @@
+#
+# @(#)mapfile-vers-product 1.19 08/02/12 10:56:37
+#
+
+#
+# Copyright (c) 2002, 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.
+#
+#
+
+# Define public interface.
+
+SUNWprivate_1.1 {
+ global:
+ # JNI
+ JNI_CreateJavaVM;
+ JNI_GetCreatedJavaVMs;
+ JNI_GetDefaultJavaVMInitArgs;
+
+ # JVM
+ JVM_Accept;
+ JVM_ActiveProcessorCount;
+ JVM_AllocateNewArray;
+ JVM_AllocateNewObject;
+ JVM_ArrayCopy;
+ JVM_AssertionStatusDirectives;
+ JVM_Available;
+ JVM_Bind;
+ JVM_ClassDepth;
+ JVM_ClassLoaderDepth;
+ JVM_Clone;
+ JVM_Close;
+ JVM_CX8Field;
+ JVM_CompileClass;
+ JVM_CompileClasses;
+ JVM_CompilerCommand;
+ JVM_Connect;
+ JVM_ConstantPoolGetClassAt;
+ JVM_ConstantPoolGetClassAtIfLoaded;
+ JVM_ConstantPoolGetDoubleAt;
+ JVM_ConstantPoolGetFieldAt;
+ JVM_ConstantPoolGetFieldAtIfLoaded;
+ JVM_ConstantPoolGetFloatAt;
+ JVM_ConstantPoolGetIntAt;
+ JVM_ConstantPoolGetLongAt;
+ JVM_ConstantPoolGetMethodAt;
+ JVM_ConstantPoolGetMethodAtIfLoaded;
+ JVM_ConstantPoolGetMemberRefInfoAt;
+ JVM_ConstantPoolGetSize;
+ JVM_ConstantPoolGetStringAt;
+ JVM_ConstantPoolGetUTF8At;
+ JVM_CountStackFrames;
+ JVM_CurrentClassLoader;
+ JVM_CurrentLoadedClass;
+ JVM_CurrentThread;
+ JVM_CurrentTimeMillis;
+ JVM_DefineClass;
+ JVM_DefineClassWithSource;
+ JVM_DefineClassWithSourceCond;
+ JVM_DesiredAssertionStatus;
+ JVM_DisableCompiler;
+ JVM_DoPrivileged;
+ JVM_DTraceGetVersion;
+ JVM_DTraceActivate;
+ JVM_DTraceIsProbeEnabled;
+ JVM_DTraceIsSupported;
+ JVM_DTraceDispose;
+ JVM_DumpAllStacks;
+ JVM_DumpThreads;
+ JVM_EnableCompiler;
+ JVM_Exit;
+ JVM_FillInStackTrace;
+ JVM_FindClassFromClass;
+ JVM_FindClassFromClassLoader;
+ JVM_FindClassFromBootLoader;
+ JVM_FindLibraryEntry;
+ JVM_FindLoadedClass;
+ JVM_FindPrimitiveClass;
+ JVM_FindSignal;
+ JVM_FreeMemory;
+ JVM_GC;
+ JVM_GetAllThreads;
+ JVM_GetArrayElement;
+ JVM_GetArrayLength;
+ JVM_GetCPClassNameUTF;
+ JVM_GetCPFieldClassNameUTF;
+ JVM_GetCPFieldModifiers;
+ JVM_GetCPFieldNameUTF;
+ JVM_GetCPFieldSignatureUTF;
+ JVM_GetCPMethodClassNameUTF;
+ JVM_GetCPMethodModifiers;
+ JVM_GetCPMethodNameUTF;
+ JVM_GetCPMethodSignatureUTF;
+ JVM_GetCallerClass;
+ JVM_GetClassAccessFlags;
+ JVM_GetClassAnnotations;
+ JVM_GetClassCPEntriesCount;
+ JVM_GetClassCPTypes;
+ JVM_GetClassConstantPool;
+ JVM_GetClassContext;
+ JVM_GetClassDeclaredConstructors;
+ JVM_GetClassDeclaredFields;
+ JVM_GetClassDeclaredMethods;
+ JVM_GetClassFieldsCount;
+ JVM_GetClassInterfaces;
+ JVM_GetClassLoader;
+ JVM_GetClassMethodsCount;
+ JVM_GetClassModifiers;
+ JVM_GetClassName;
+ JVM_GetClassNameUTF;
+ JVM_GetClassSignature;
+ JVM_GetClassSigners;
+ JVM_GetComponentType;
+ JVM_GetDeclaredClasses;
+ JVM_GetDeclaringClass;
+ JVM_GetEnclosingMethodInfo;
+ JVM_GetFieldAnnotations;
+ JVM_GetFieldIxModifiers;
+ JVM_GetHostName;
+ JVM_GetInheritedAccessControlContext;
+ JVM_GetInterfaceVersion;
+ JVM_GetLastErrorString;
+ JVM_GetManagement;
+ JVM_GetMethodAnnotations;
+ JVM_GetMethodDefaultAnnotationValue;
+ JVM_GetMethodIxArgsSize;
+ JVM_GetMethodIxByteCode;
+ JVM_GetMethodIxByteCodeLength;
+ JVM_GetMethodIxExceptionIndexes;
+ JVM_GetMethodIxExceptionTableEntry;
+ JVM_GetMethodIxExceptionTableLength;
+ JVM_GetMethodIxExceptionsCount;
+ JVM_GetMethodIxLocalsCount;
+ JVM_GetMethodIxMaxStack;
+ JVM_GetMethodIxModifiers;
+ JVM_GetMethodIxNameUTF;
+ JVM_GetMethodIxSignatureUTF;
+ JVM_GetMethodParameterAnnotations;
+ JVM_GetPrimitiveArrayElement;
+ JVM_GetProtectionDomain;
+ JVM_GetSockName;
+ JVM_GetSockOpt;
+ JVM_GetStackAccessControlContext;
+ JVM_GetStackTraceDepth;
+ JVM_GetStackTraceElement;
+ JVM_GetSystemPackage;
+ JVM_GetSystemPackages;
+ JVM_GetThreadStateNames;
+ JVM_GetThreadStateValues;
+ JVM_GetVersionInfo;
+ JVM_Halt;
+ JVM_HoldsLock;
+ JVM_IHashCode;
+ JVM_InitAgentProperties;
+ JVM_InitProperties;
+ JVM_InitializeCompiler;
+ JVM_InitializeSocketLibrary;
+ JVM_InternString;
+ JVM_Interrupt;
+ JVM_InvokeMethod;
+ JVM_IsArrayClass;
+ JVM_IsConstructorIx;
+ JVM_IsInterface;
+ JVM_IsInterrupted;
+ JVM_IsNaN;
+ JVM_IsPrimitiveClass;
+ JVM_IsSameClassPackage;
+ JVM_IsSilentCompiler;
+ JVM_IsSupportedJNIVersion;
+ JVM_IsThreadAlive;
+ JVM_LatestUserDefinedLoader;
+ JVM_Listen;
+ JVM_LoadClass0;
+ JVM_LoadLibrary;
+ JVM_Lseek;
+ JVM_MaxObjectInspectionAge;
+ JVM_MaxMemory;
+ JVM_MonitorNotify;
+ JVM_MonitorNotifyAll;
+ JVM_MonitorWait;
+ JVM_NanoTime;
+ JVM_NativePath;
+ JVM_NewArray;
+ JVM_NewInstanceFromConstructor;
+ JVM_NewMultiArray;
+ JVM_OnExit;
+ JVM_Open;
+ JVM_PrintStackTrace;
+ JVM_RaiseSignal;
+ JVM_RawMonitorCreate;
+ JVM_RawMonitorDestroy;
+ JVM_RawMonitorEnter;
+ JVM_RawMonitorExit;
+ JVM_Read;
+ JVM_Recv;
+ JVM_RecvFrom;
+ JVM_RegisterSignal;
+ JVM_ReleaseUTF;
+ JVM_ResolveClass;
+ JVM_ResumeThread;
+ JVM_Send;
+ JVM_SendTo;
+ JVM_SetArrayElement;
+ JVM_SetClassSigners;
+ JVM_SetLength;
+ JVM_SetPrimitiveArrayElement;
+ JVM_SetProtectionDomain;
+ JVM_SetSockOpt;
+ JVM_SetThreadPriority;
+ JVM_Sleep;
+ JVM_Socket;
+ JVM_SocketAvailable;
+ JVM_SocketClose;
+ JVM_SocketShutdown;
+ JVM_StartThread;
+ JVM_StopThread;
+ JVM_SuspendThread;
+ JVM_SupportsCX8;
+ JVM_Sync;
+ JVM_Timeout;
+ JVM_TotalMemory;
+ JVM_TraceInstructions;
+ JVM_TraceMethodCalls;
+ JVM_UnloadLibrary;
+ JVM_Write;
+ JVM_Yield;
+ JVM_handle_bsd_signal;
+
+ # Old reflection routines
+ # These do not need to be present in the product build in JDK 1.4
+ # but their code has not been removed yet because there will not
+ # be a substantial code savings until JVM_InvokeMethod and
+ # JVM_NewInstanceFromConstructor can also be removed; see
+ # reflectionCompat.hpp.
+ JVM_GetClassConstructor;
+ JVM_GetClassConstructors;
+ JVM_GetClassField;
+ JVM_GetClassFields;
+ JVM_GetClassMethod;
+ JVM_GetClassMethods;
+ JVM_GetField;
+ JVM_GetPrimitiveField;
+ JVM_NewInstance;
+ JVM_SetField;
+ JVM_SetPrimitiveField;
+
+ # miscellaneous functions
+ jio_fprintf;
+ jio_printf;
+ jio_snprintf;
+ jio_vfprintf;
+ jio_vsnprintf;
+ fork1;
+ numa_warn;
+ numa_error;
+
+ # Needed because there is no JVM interface for this.
+ sysThreadAvailableStackWithSlack;
+
+ # This is for Forte Analyzer profiling support.
+ AsyncGetCallTrace;
+
+ # INSERT VTABLE SYMBOLS HERE
+
+ local:
+ *;
+};
+
diff --git a/hotspot/make/bsd/makefiles/optimized.make b/hotspot/make/bsd/makefiles/optimized.make
new file mode 100644
index 0000000..6090c97
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/optimized.make
@@ -0,0 +1,44 @@
+#
+# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Sets make macros for making optimized version of Gamma VM
+# (This is the "product", not the "release" version.)
+
+# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
+
+# (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
+
+# If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings
+CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
+
+# Linker mapfile
+MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-debug
+
+G_SUFFIX =
+VERSION = optimized
diff --git a/hotspot/make/bsd/makefiles/ppc.make b/hotspot/make/bsd/makefiles/ppc.make
new file mode 100644
index 0000000..92957f9
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/ppc.make
@@ -0,0 +1,30 @@
+#
+# 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.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please 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 copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+
+# Must also specify if CPU is big endian
+CFLAGS += -DVM_BIG_ENDIAN
+
diff --git a/hotspot/make/bsd/makefiles/product.make b/hotspot/make/bsd/makefiles/product.make
new file mode 100644
index 0000000..1b8acbb
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/product.make
@@ -0,0 +1,58 @@
+#
+# Copyright (c) 1999, 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.
+#
+#
+
+# Sets make macros for making optimized version of Gamma VM
+# (This is the "product", not the "release" version.)
+
+# Compiler specific OPT_CFLAGS are passed in from gcc.make, sparcWorks.make
+OPT_CFLAGS/DEFAULT= $(OPT_CFLAGS)
+OPT_CFLAGS/BYFILE = $(OPT_CFLAGS/$@)$(OPT_CFLAGS/DEFAULT$(OPT_CFLAGS/$@))
+
+# (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
+
+# If you set HOTSPARC_GENERIC=yes, you disable all OPT_CFLAGS settings
+CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
+
+# Set the environment variable HOTSPARC_GENERIC to "true"
+# to inhibit the effect of the previous line on CFLAGS.
+
+# Linker mapfile
+MAPFILE = $(GAMMADIR)/make/bsd/makefiles/mapfile-vers-product
+
+G_SUFFIX =
+SYSDEFS += -DPRODUCT
+VERSION = optimized
+
+# use -g to strip library as -x will discard its symbol table; -x is fine for
+# executables.
+ifdef CROSS_COMPILE_ARCH
+ STRIP = $(ALT_COMPILER_PATH)/strip
+else
+ STRIP = strip
+endif
+STRIP_LIBJVM = $(STRIP) -g $@ || exit 1;
+STRIP_AOUT = $(STRIP) -x $@ || exit 1;
+
+# Don't strip in VM build; JDK build will strip libraries later
+# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO))
diff --git a/hotspot/make/linux/makefiles/profiled.make b/hotspot/make/bsd/makefiles/profiled.make
similarity index 100%
copy from hotspot/make/linux/makefiles/profiled.make
copy to hotspot/make/bsd/makefiles/profiled.make
diff --git a/hotspot/make/linux/makefiles/rules.make b/hotspot/make/bsd/makefiles/rules.make
similarity index 100%
copy from hotspot/make/linux/makefiles/rules.make
copy to hotspot/make/bsd/makefiles/rules.make
diff --git a/hotspot/make/bsd/makefiles/sa.make b/hotspot/make/bsd/makefiles/sa.make
new file mode 100644
index 0000000..4e6a00e
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/sa.make
@@ -0,0 +1,121 @@
+#
+# Copyright (c) 2003, 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.
+#
+#
+
+# This makefile (sa.make) is included from the sa.make in the
+# build directories.
+
+# This makefile is used to build Serviceability Agent java code
+# and generate JNI header file for native methods.
+
+include $(GAMMADIR)/make/bsd/makefiles/rules.make
+
+AGENT_DIR = $(GAMMADIR)/agent
+
+include $(GAMMADIR)/make/sa.files
+
+TOPDIR = $(shell echo `pwd`)
+GENERATED = $(TOPDIR)/../generated
+
+# tools.jar is needed by the JDI - SA binding
+SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
+
+# TODO: if it's a modules image, check if SA module is installed.
+MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
+
+# gnumake 3.78.1 does not accept the *s that
+# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
+AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
+AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
+
+AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
+AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
+
+SA_CLASSDIR = $(GENERATED)/saclasses
+
+SA_BUILD_VERSION_PROP = "sun.jvm.hotspot.runtime.VM.saBuildVersion=$(SA_BUILD_VERSION)"
+
+SA_PROPERTIES = $(SA_CLASSDIR)/sa.properties
+
+# if $(AGENT_DIR) does not exist, we don't build SA
+# also, we don't build SA on Itanium, PowerPC, ARM or zero.
+
+all:
+ if [ -d $(AGENT_DIR) -a "$(SRCARCH)" != "ia64" \
+ -a "$(SRCARCH)" != "arm" \
+ -a "$(SRCARCH)" != "ppc" \
+ -a "$(SRCARCH)" != "zero" ] ; then \
+ $(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
+ fi
+
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
+ $(QUIETLY) echo "Making $@"
+ $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
+ echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
+ exit 1; \
+ fi
+ $(QUIETLY) if [ ! -f $(SA_CLASSPATH) -a ! -d $(MODULELIB_PATH) ] ; then \
+ echo "Missing $(SA_CLASSPATH) file. Use 1.6.0 or later version of JDK";\
+ echo ""; \
+ exit 1; \
+ fi
+ $(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
+ mkdir -p $(SA_CLASSDIR); \
+ fi
+
+# Note: When indented, make tries to execute the '$(shell' comment.
+# In some environments, cmd processors have limited line length.
+# To prevent the javac invocation in the next block from using
+# a very long cmd line, we use javac's @file-list option. We
+# generate the file lists using make's built-in 'foreach' control
+# flow which also avoids cmd processor line length issues. Since
+# the 'foreach' is done as part of make's macro expansion phase,
+# the initialization of the lists is also done in the same phase
+# using '$(shell rm ...' instead of using the more traditional
+# 'rm ...' rule.
+ $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
+ $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
+ $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
+
+ $(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
+ $(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
+ $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
+ $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/utilities/soql/sa.js $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql
+ $(QUIETLY) mkdir -p $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
+ $(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/*
+ $(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources/
+ $(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)/
+ $(QUIETLY) $(REMOTE) $(RUN.JAR) cf $@ -C $(SA_CLASSDIR)/ .
+ $(QUIETLY) $(REMOTE) $(RUN.JAR) uf $@ -C $(AGENT_SRC_DIR) META-INF/services/com.sun.jdi.connect.Connector
+ $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
+ $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.ia64.IA64ThreadContext
+ $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.amd64.AMD64ThreadContext
+ $(QUIETLY) $(REMOTE) $(RUN.JAVAH) -classpath $(SA_CLASSDIR) -d $(GENERATED) -jni sun.jvm.hotspot.debugger.sparc.SPARCThreadContext
+
+clean:
+ rm -rf $(SA_CLASSDIR)
+ rm -rf $(GENERATED)/sa-jdi.jar
+ rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
diff --git a/hotspot/make/bsd/makefiles/saproc.make b/hotspot/make/bsd/makefiles/saproc.make
new file mode 100644
index 0000000..6303b1b
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/saproc.make
@@ -0,0 +1,107 @@
+#
+# Copyright (c) 2005, 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.
+#
+#
+
+# Rules to build serviceability agent library, used by vm.make
+
+# libsaproc[_g].so: serviceability agent
+SAPROC = saproc
+SAPROC_G = $(SAPROC)$(G_SUFFIX)
+
+ifeq ($(OS_VENDOR), Darwin)
+ LIBSAPROC = lib$(SAPROC).dylib
+ LIBSAPROC_G = lib$(SAPROC_G).dylib
+else
+ LIBSAPROC = lib$(SAPROC).so
+ LIBSAPROC_G = lib$(SAPROC_G).so
+endif
+
+AGENT_DIR = $(GAMMADIR)/agent
+
+SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
+
+# disable building saproc until hsearch_r license issues are resolved
+#ifeq ($(OS_VENDOR), FreeBSD)
+#SASRCFILES = $(SASRCDIR)/salibelf.c \
+# $(SASRCDIR)/symtab.c \
+# $(SASRCDIR)/libproc_impl.c \
+# $(SASRCDIR)/ps_proc.c \
+# $(SASRCDIR)/ps_core.c \
+# $(SASRCDIR)/hsearch_r.c \
+# $(SASRCDIR)/BsdDebuggerLocal.c
+#SALIBS = -lutil -lthread_db
+#else
+SASRCFILES = $(SASRCDIR)/StubDebuggerLocal.c
+SALIBS =
+#endif
+
+SAMAPFILE = $(SASRCDIR)/mapfile
+
+DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ SA_DEBUG_CFLAGS = -g
+endif
+
+# if $(AGENT_DIR) does not exist, we don't build SA
+# also, we don't build SA on Itanium, PPC, ARM or zero.
+
+ifneq ($(wildcard $(AGENT_DIR)),)
+ifneq ($(filter-out ia64 arm ppc zero,$(SRCARCH)),)
+ BUILDLIBSAPROC = $(LIBSAPROC)
+endif
+endif
+
+
+ifneq ($(OS_VENDOR), Darwin)
+SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE))
+endif
+SA_LFLAGS += $(LDFLAGS_HASH_STYLE)
+
+$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
+ $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
+ echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
+ exit 1; \
+ fi
+ @echo Making SA debugger back-end...
+ $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE \
+ $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
+ -I$(SASRCDIR) \
+ -I$(GENERATED) \
+ -I$(BOOT_JAVA_HOME)/include \
+ -I$(BOOT_JAVA_HOME)/include/$(shell uname -s | tr "[:upper:]" "[:lower:]") \
+ $(SASRCFILES) \
+ $(SA_LFLAGS) \
+ $(SA_DEBUG_CFLAGS) \
+ -o $@ \
+ $(SALIBS)
+ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
+
+install_saproc: $(BUILDLIBSAPROC)
+ $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \
+ echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \
+ cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
+ fi
+
+.PHONY: install_saproc
diff --git a/hotspot/make/linux/makefiles/shark.make b/hotspot/make/bsd/makefiles/shark.make
similarity index 100%
copy from hotspot/make/linux/makefiles/shark.make
copy to hotspot/make/bsd/makefiles/shark.make
diff --git a/hotspot/make/linux/makefiles/sparc.make b/hotspot/make/bsd/makefiles/sparc.make
similarity index 100%
copy from hotspot/make/linux/makefiles/sparc.make
copy to hotspot/make/bsd/makefiles/sparc.make
diff --git a/hotspot/make/linux/makefiles/sparcWorks.make b/hotspot/make/bsd/makefiles/sparcWorks.make
similarity index 100%
copy from hotspot/make/linux/makefiles/sparcWorks.make
copy to hotspot/make/bsd/makefiles/sparcWorks.make
diff --git a/hotspot/make/linux/makefiles/sparcv9.make b/hotspot/make/bsd/makefiles/sparcv9.make
similarity index 100%
copy from hotspot/make/linux/makefiles/sparcv9.make
copy to hotspot/make/bsd/makefiles/sparcv9.make
diff --git a/hotspot/make/linux/makefiles/tiered.make b/hotspot/make/bsd/makefiles/tiered.make
similarity index 100%
copy from hotspot/make/linux/makefiles/tiered.make
copy to hotspot/make/bsd/makefiles/tiered.make
diff --git a/hotspot/make/linux/makefiles/top.make b/hotspot/make/bsd/makefiles/top.make
similarity index 100%
copy from hotspot/make/linux/makefiles/top.make
copy to hotspot/make/bsd/makefiles/top.make
diff --git a/hotspot/make/bsd/makefiles/vm.make b/hotspot/make/bsd/makefiles/vm.make
new file mode 100644
index 0000000..bced094
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/vm.make
@@ -0,0 +1,329 @@
+#
+# Copyright (c) 1999, 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.
+#
+#
+
+# Rules to build JVM and related libraries, included from vm.make in the build
+# directory.
+
+# Common build rules.
+MAKEFILES_DIR=$(GAMMADIR)/make/$(Platform_os_family)/makefiles
+include $(MAKEFILES_DIR)/rules.make
+include $(GAMMADIR)/make/altsrc.make
+
+default: build
+
+#----------------------------------------------------------------------
+# Defs
+
+GENERATED = ../generated
+DEP_DIR = $(GENERATED)/dependencies
+
+# reads the generated files defining the set of .o's and the .o .h dependencies
+-include $(DEP_DIR)/*.d
+
+# read machine-specific adjustments (%%% should do this via buildtree.make?)
+ifeq ($(ZERO_BUILD), true)
+ include $(MAKEFILES_DIR)/zeroshark.make
+else
+ include $(MAKEFILES_DIR)/$(BUILDARCH).make
+endif
+
+# set VPATH so make knows where to look for source files
+# Src_Dirs_V is everything in src/share/vm/*, plus the right os/*/vm and cpu/*/vm
+# The adfiles directory contains ad_<arch>.[ch]pp.
+# The jvmtifiles directory contains jvmti*.[ch]pp
+Src_Dirs_V += $(GENERATED)/adfiles $(GENERATED)/jvmtifiles
+VPATH += $(Src_Dirs_V:%=%:)
+
+# set INCLUDES for C preprocessor.
+Src_Dirs_I += $(GENERATED)
+# The order is important for the precompiled headers to work.
+INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
+
+ifeq (${VERSION}, debug)
+ SYMFLAG = -g
+else
+ SYMFLAG =
+endif
+
+# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
+# in $(GAMMADIR)/make/defs.make
+ifeq ($(HOTSPOT_BUILD_VERSION),)
+ BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)\""
+else
+ BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HOTSPOT_RELEASE_VERSION)-$(HOTSPOT_BUILD_VERSION)\""
+endif
+
+# The following variables are defined in the generated flags.make file.
+BUILD_VERSION = -DHOTSPOT_RELEASE_VERSION="\"$(HS_BUILD_VER)\""
+JRE_VERSION = -DJRE_RELEASE_VERSION="\"$(JRE_RELEASE_VER)\""
+HS_LIB_ARCH = -DHOTSPOT_LIB_ARCH=\"$(LIBARCH)\"
+BUILD_TARGET = -DHOTSPOT_BUILD_TARGET="\"$(TARGET)\""
+BUILD_USER = -DHOTSPOT_BUILD_USER="\"$(HOTSPOT_BUILD_USER)\""
+VM_DISTRO = -DHOTSPOT_VM_DISTRO="\"$(HOTSPOT_VM_DISTRO)\""
+
+CPPFLAGS = \
+ ${SYSDEFS} \
+ ${INCLUDES} \
+ ${BUILD_VERSION} \
+ ${BUILD_TARGET} \
+ ${BUILD_USER} \
+ ${HS_LIB_ARCH} \
+ ${JRE_VERSION} \
+ ${VM_DISTRO}
+
+ifdef DEFAULT_LIBPATH
+CPPFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\""
+endif
+
+# CFLAGS_WARN holds compiler options to suppress/enable warnings.
+CFLAGS += $(CFLAGS_WARN/BYFILE)
+
+# Do not use C++ exception handling
+CFLAGS += $(CFLAGS/NOEX)
+
+# Extra flags from gnumake's invocation or environment
+CFLAGS += $(EXTRA_CFLAGS)
+LFLAGS += $(EXTRA_CFLAGS)
+
+# Don't set excutable bit on stack segment
+# the same could be done by separate execstack command
+ifneq ($(OS_VENDOR), Darwin)
+LFLAGS += -Xlinker -z -Xlinker noexecstack
+endif
+
+LIBS += -lm -pthread
+
+# By default, link the *.o into the library, not the executable.
+LINK_INTO$(LINK_INTO) = LIBJVM
+
+JDK_LIBDIR = $(JAVA_HOME)/jre/lib/$(LIBARCH)
+
+#----------------------------------------------------------------------
+# jvm_db & dtrace
+include $(MAKEFILES_DIR)/dtrace.make
+
+#----------------------------------------------------------------------
+# JVM
+
+JVM = jvm
+ifeq ($(OS_VENDOR), Darwin)
+ LIBJVM = lib$(JVM).dylib
+ LIBJVM_G = lib$(JVM)$(G_SUFFIX).dylib
+ CFLAGS += -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE
+else
+ LIBJVM = lib$(JVM).so
+ LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
+endif
+
+SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
+
+SOURCE_PATHS=\
+ $(shell find $(HS_COMMON_SRC)/share/vm/* -type d \! \
+ \( -name DUMMY $(foreach dir,$(SPECIAL_PATHS),-o -name $(dir)) \))
+SOURCE_PATHS+=$(HS_COMMON_SRC)/os/$(Platform_os_family)/vm
+SOURCE_PATHS+=$(HS_COMMON_SRC)/os/posix/vm
+SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm
+SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm
+
+CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path))
+CORE_PATHS+=$(GENERATED)/jvmtifiles
+
+COMPILER1_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/c1)
+COMPILER1_PATHS += $(HS_COMMON_SRC)/share/vm/c1
+
+COMPILER2_PATHS := $(call altsrc,$(HS_COMMON_SRC)/share/vm/opto)
+COMPILER2_PATHS += $(call altsrc,$(HS_COMMON_SRC)/share/vm/libadt)
+COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/opto
+COMPILER2_PATHS += $(HS_COMMON_SRC)/share/vm/libadt
+COMPILER2_PATHS += $(GENERATED)/adfiles
+
+SHARK_PATHS := $(GAMMADIR)/src/share/vm/shark
+
+# Include dirs per type.
+Src_Dirs/CORE := $(CORE_PATHS)
+Src_Dirs/COMPILER1 := $(CORE_PATHS) $(COMPILER1_PATHS)
+Src_Dirs/COMPILER2 := $(CORE_PATHS) $(COMPILER2_PATHS)
+Src_Dirs/TIERED := $(CORE_PATHS) $(COMPILER1_PATHS) $(COMPILER2_PATHS)
+Src_Dirs/ZERO := $(CORE_PATHS)
+Src_Dirs/SHARK := $(CORE_PATHS) $(SHARK_PATHS)
+Src_Dirs := $(Src_Dirs/$(TYPE))
+
+COMPILER2_SPECIFIC_FILES := opto libadt bcEscapeAnalyzer.cpp chaitin\* c2_\* runtime_\*
+COMPILER1_SPECIFIC_FILES := c1_\*
+SHARK_SPECIFIC_FILES := shark
+ZERO_SPECIFIC_FILES := zero
+
+# Always exclude these.
+Src_Files_EXCLUDE := jsig.c jvmtiEnvRecommended.cpp jvmtiEnvStub.cpp
+
+# Exclude per type.
+Src_Files_EXCLUDE/CORE := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
+Src_Files_EXCLUDE/COMPILER1 := $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
+Src_Files_EXCLUDE/COMPILER2 := $(COMPILER1_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
+Src_Files_EXCLUDE/TIERED := $(ZERO_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES)
+Src_Files_EXCLUDE/ZERO := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(SHARK_SPECIFIC_FILES) ciTypeFlow.cpp
+Src_Files_EXCLUDE/SHARK := $(COMPILER1_SPECIFIC_FILES) $(COMPILER2_SPECIFIC_FILES) $(ZERO_SPECIFIC_FILES)
+
+Src_Files_EXCLUDE += $(Src_Files_EXCLUDE/$(TYPE))
+
+# Special handling of arch model.
+ifeq ($(Platform_arch_model), x86_32)
+Src_Files_EXCLUDE += \*x86_64\*
+endif
+ifeq ($(Platform_arch_model), x86_64)
+Src_Files_EXCLUDE += \*x86_32\*
+endif
+
+# Locate all source files in the given directory, excluding files in Src_Files_EXCLUDE.
+define findsrc
+ $(notdir $(shell find $(1)/. ! -name . -prune \
+ -a \( -name \*.c -o -name \*.cpp -o -name \*.s \) \
+ -a ! \( -name DUMMY $(addprefix -o -name ,$(Src_Files_EXCLUDE)) \)))
+endef
+
+Src_Files := $(foreach e,$(Src_Dirs),$(call findsrc,$(e)))
+
+Obj_Files = $(sort $(addsuffix .o,$(basename $(Src_Files))))
+
+JVM_OBJ_FILES = $(Obj_Files)
+
+vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
+
+mapfile : $(MAPFILE) vm.def
+ rm -f $@
+ awk '{ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") \
+ { system ("cat vm.def"); } \
+ else \
+ { print $$0 } \
+ }' > $@ < $(MAPFILE)
+
+mapfile_reorder : mapfile $(REORDERFILE)
+ rm -f $@
+ cat $^ > $@
+
+vm.def: $(Res_Files) $(Obj_Files)
+ sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@
+
+STATIC_CXX = false
+
+ifeq ($(LINK_INTO),AOUT)
+ LIBJVM.o =
+ LIBJVM_MAPFILE =
+ LIBS_VM = $(LIBS)
+else
+ LIBJVM.o = $(JVM_OBJ_FILES)
+ LIBJVM_MAPFILE$(LDNOMAP) = mapfile_reorder
+ LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
+ LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
+
+ ifeq ($(OS_VENDOR), Darwin)
+ LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/.
+ LFLAGS_VM += -Xlinker -rpath -Xlinker @loader_path/..
+ LFLAGS_VM += -Xlinker -install_name -Xlinker @rpath/$(@F)
+ endif
+
+ # JVM is statically linked with libgcc[_s] and libstdc++; this is needed to
+ # get around library dependency and compatibility issues. Must use gcc not
+ # g++ to link.
+ ifeq ($(STATIC_CXX), true)
+ LFLAGS_VM += $(STATIC_LIBGCC)
+ LIBS_VM += $(STATIC_STDCXX)
+ LINK_VM = $(LINK_LIB.c)
+ else
+ LINK_VM = $(LINK_LIB.CC)
+ endif
+
+ LIBS_VM += $(LIBS)
+endif
+ifeq ($(ZERO_BUILD), true)
+ LIBS_VM += $(LIBFFI_LIBS)
+endif
+ifeq ($(SHARK_BUILD), true)
+ LFLAGS_VM += $(LLVM_LDFLAGS)
+ LIBS_VM += $(LLVM_LIBS)
+endif
+
+
+# rule for building precompiled header
+$(PRECOMPILED_HEADER):
+ $(QUIETLY) echo Generating precompiled header $@
+ $(QUIETLY) mkdir -p $(PRECOMPILED_HEADER_DIR)
+ $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -x c++-header $(PRECOMPILED_HEADER_SRC) -o $@ $(COMPILE_DONE)
+
+# making the library:
+
+ifneq ($(JVM_BASE_ADDR),)
+# By default shared library is linked at base address == 0. Modify the
+# linker script if JVM prefers a different base location. It can also be
+# implemented with 'prelink -r'. But 'prelink' is not (yet) available on
+# our build platform (AS-2.1).
+LD_SCRIPT = libjvm.so.lds
+$(LD_SCRIPT): $(LIBJVM_MAPFILE)
+ $(QUIETLY) { \
+ rm -rf $@; \
+ $(LINK_VM) -Wl,--verbose $(LFLAGS_VM) 2>&1 | \
+ sed -e '/^======/,/^======/!d' \
+ -e '/^======/d' \
+ -e 's/0\( + SIZEOF_HEADERS\)/$(JVM_BASE_ADDR)\1/' \
+ > $@; \
+ }
+LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
+endif
+
+$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
+ $(QUIETLY) { \
+ echo Linking vm...; \
+ $(LINK_LIB.CC/PRE_HOOK) \
+ $(LINK_VM) $(LD_SCRIPT_FLAG) \
+ $(LFLAGS_VM) -o $@ $(LIBJVM.o) $(LIBS_VM); \
+ $(LINK_LIB.CC/POST_HOOK) \
+ rm -f $@.1; ln -s $@ $@.1; \
+ [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
+ }
+
+DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
+
+install_jvm: $(LIBJVM)
+ @echo "Copying $(LIBJVM) to $(DEST_JVM)"
+ $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
+
+#----------------------------------------------------------------------
+# Other files
+
+# Gamma launcher
+include $(MAKEFILES_DIR)/launcher.make
+
+# Signal interposition library
+include $(MAKEFILES_DIR)/jsig.make
+
+# Serviceability agent
+include $(MAKEFILES_DIR)/saproc.make
+
+#----------------------------------------------------------------------
+
+build: $(LIBJVM) $(LAUNCHER) $(LIBJSIG) $(LIBJVM_DB) $(BUILDLIBSAPROC)
+
+install: install_jvm install_jsig install_saproc
+
+.PHONY: default build install install_jvm
diff --git a/hotspot/make/linux/makefiles/zero.make b/hotspot/make/bsd/makefiles/zero.make
similarity index 100%
copy from hotspot/make/linux/makefiles/zero.make
copy to hotspot/make/bsd/makefiles/zero.make
diff --git a/hotspot/make/bsd/makefiles/zeroshark.make b/hotspot/make/bsd/makefiles/zeroshark.make
new file mode 100644
index 0000000..12c4198
--- /dev/null
+++ b/hotspot/make/bsd/makefiles/zeroshark.make
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2007, 2008 Red Hat, Inc.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
+#
+
+# Setup common to Zero (non-Shark) and Shark versions of VM
+
+# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
+# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized
+OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT)
+
+# Specify that the CPU is little endian, if necessary
+ifeq ($(ZERO_ENDIANNESS), little)
+ CFLAGS += -DVM_LITTLE_ENDIAN
+endif
+
+# Specify that the CPU is 64 bit, if necessary
+ifeq ($(ARCH_DATA_MODEL), 64)
+ CFLAGS += -D_LP64=1
+endif
+
+# Specify the path to the FFI headers
+ifdef ALT_PACKAGE_PATH
+ PACKAGE_PATH = $(ALT_PACKAGE_PATH)
+else
+ ifeq ($(OS_VENDOR),Apple)
+ PACKAGE_PATH = /opt/local
+ else
+ ifeq ($(OS_VENDOR),NetBSD)
+ PACKAGE_PATH = /usr/pkg
+ LIBS += -Wl,-R${PACKAGE_PATH}/lib
+ else
+ PACKAGE_PATH = /usr/local
+ endif
+ endif
+endif
+
+CFLAGS += -I$(PACKAGE_PATH)/include
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
+OPT_CFLAGS/compactingPermGenGen.o = -O1
diff --git a/hotspot/make/bsd/platform_amd64 b/hotspot/make/bsd/platform_amd64
new file mode 100644
index 0000000..51b2b1c
--- /dev/null
+++ b/hotspot/make/bsd/platform_amd64
@@ -0,0 +1,15 @@
+os_family = bsd
+
+arch = x86
+
+arch_model = x86_64
+
+os_arch = bsd_x86
+
+os_arch_model = bsd_x86_64
+
+lib_arch = amd64
+
+compiler = gcc
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
diff --git a/hotspot/make/bsd/platform_amd64.suncc b/hotspot/make/bsd/platform_amd64.suncc
new file mode 100644
index 0000000..68e0cc3
--- /dev/null
+++ b/hotspot/make/bsd/platform_amd64.suncc
@@ -0,0 +1,17 @@
+os_family = bsd
+
+arch = x86
+
+arch_model = x86_64
+
+os_arch = bsd_x86
+
+os_arch_model = bsd_x86_64
+
+lib_arch = amd64
+
+compiler = sparcWorks
+
+gnu_dis_arch = amd64
+
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
diff --git a/hotspot/make/bsd/platform_i486 b/hotspot/make/bsd/platform_i486
new file mode 100644
index 0000000..2f77e79
--- /dev/null
+++ b/hotspot/make/bsd/platform_i486
@@ -0,0 +1,15 @@
+os_family = bsd
+
+arch = x86
+
+arch_model = x86_32
+
+os_arch = bsd_x86
+
+os_arch_model = bsd_x86_32
+
+lib_arch = i386
+
+compiler = gcc
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
diff --git a/hotspot/make/bsd/platform_i486.suncc b/hotspot/make/bsd/platform_i486.suncc
new file mode 100644
index 0000000..5b203cd
--- /dev/null
+++ b/hotspot/make/bsd/platform_i486.suncc
@@ -0,0 +1,17 @@
+os_family = bsd
+
+arch = x86
+
+arch_model = x86_32
+
+os_arch = bsd_x86
+
+os_arch_model = bsd_x86_32
+
+lib_arch = i386
+
+compiler = sparcWorks
+
+gnu_dis_arch = i386
+
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
diff --git a/hotspot/make/bsd/platform_ia64 b/hotspot/make/bsd/platform_ia64
new file mode 100644
index 0000000..00b9f33
--- /dev/null
+++ b/hotspot/make/bsd/platform_ia64
@@ -0,0 +1,15 @@
+os_family = bsd
+
+arch = ia64
+
+os_arch = bsd_ia64
+
+lib_arch = ia64
+
+compiler = gcc
+
+gnu_dis_arch = ia64
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
+
+mark_style = alignment
diff --git a/hotspot/make/bsd/platform_sparc b/hotspot/make/bsd/platform_sparc
new file mode 100644
index 0000000..04772ad
--- /dev/null
+++ b/hotspot/make/bsd/platform_sparc
@@ -0,0 +1,15 @@
+os_family = bsd
+
+arch = sparc
+
+arch_model = sparc
+
+os_arch = bsd_sparc
+
+os_arch_model = bsd_sparc
+
+lib_arch = sparc
+
+compiler = gcc
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
diff --git a/hotspot/make/bsd/platform_sparcv9 b/hotspot/make/bsd/platform_sparcv9
new file mode 100644
index 0000000..89e51c5
--- /dev/null
+++ b/hotspot/make/bsd/platform_sparcv9
@@ -0,0 +1,15 @@
+os_family = bsd
+
+arch = sparc
+
+arch_model = sparc
+
+os_arch = bsd_sparc
+
+os_arch_model = bsd_sparc
+
+lib_arch = sparcv9
+
+compiler = gcc
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
diff --git a/hotspot/make/bsd/platform_zero.in b/hotspot/make/bsd/platform_zero.in
new file mode 100644
index 0000000..f6729c2
--- /dev/null
+++ b/hotspot/make/bsd/platform_zero.in
@@ -0,0 +1,17 @@
+os_family = bsd
+
+arch = zero
+
+arch_model = zero
+
+os_arch = bsd_zero
+
+os_arch_model = bsd_zero
+
+lib_arch = zero
+
+compiler = gcc
+
+gnu_dis_arch = zero
+
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D at ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
diff --git a/hotspot/make/cscope.make b/hotspot/make/cscope.make
index 17c3aa3..c38b7a5 100644
--- a/hotspot/make/cscope.make
+++ b/hotspot/make/cscope.make
@@ -63,7 +63,7 @@ CS_PRUNE_GENERATED = -o -name '${OSNAME}_*_core' -o \
# space-separated list of identifiers to include only those systems.
ifdef CS_OS
CS_PRUNE_OS = $(patsubst %,-o -name '*%*',\
- $(filter-out ${CS_OS},linux macos solaris windows))
+ $(filter-out ${CS_OS},bsd linux macos solaris windows))
endif
# CPU-specific files for all processors are included by default. Set CS_CPU
diff --git a/hotspot/make/defs.make b/hotspot/make/defs.make
index fe6c4a2..44f873d 100644
--- a/hotspot/make/defs.make
+++ b/hotspot/make/defs.make
@@ -118,13 +118,23 @@ endif
# Windows should have OS predefined
ifeq ($(OS),)
OS := $(shell uname -s)
+ ifneq ($(findstring BSD,$(OS)),)
+ OS=bsd
+ endif
+ ifeq ($(OS), Darwin)
+ OS=bsd
+ endif
HOST := $(shell uname -n)
endif
-# If not SunOS and not Linux, assume Windows
+# If not SunOS, not Linux and not BSD, assume Windows
ifneq ($(OS), Linux)
ifneq ($(OS), SunOS)
- OSNAME=windows
+ ifneq ($(OS), bsd)
+ OSNAME=windows
+ else
+ OSNAME=bsd
+ endif
else
OSNAME=solaris
endif
diff --git a/hotspot/make/hotspot_version b/hotspot/make/hotspot_version
index 2a3983d..f5de8cd 100644
--- a/hotspot/make/hotspot_version
+++ b/hotspot/make/hotspot_version
@@ -33,7 +33,7 @@
# Don't put quotes (fail windows build).
HOTSPOT_VM_COPYRIGHT=Copyright 2011
-HS_MAJOR_VER=22
+HS_MAJOR_VER=23
HS_MINOR_VER=0
HS_BUILD_NUMBER=01
diff --git a/hotspot/make/jprt.gmk b/hotspot/make/jprt.gmk
index 00ee6a2..aded081 100644
--- a/hotspot/make/jprt.gmk
+++ b/hotspot/make/jprt.gmk
@@ -34,13 +34,13 @@ else
endif
jprt_build_productEmb:
- $(MAKE) JAVASE_EMBEDDED=true jprt_build_product
+ $(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_product
jprt_build_debugEmb:
- $(MAKE) JAVASE_EMBEDDED=true jprt_build_debug
+ $(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_debug
jprt_build_fastdebugEmb:
- $(MAKE) JAVASE_EMBEDDED=true jprt_build_fastdebug
+ $(MAKE) JAVASE_EMBEDDED=true MINIMIZE_RAM_USAGE=true jprt_build_fastdebug
jprt_build_productOpen:
$(MAKE) OPENJDK=true jprt_build_product
diff --git a/hotspot/make/linux/Makefile b/hotspot/make/linux/Makefile
index fa1f56d..22dcd53 100644
--- a/hotspot/make/linux/Makefile
+++ b/hotspot/make/linux/Makefile
@@ -210,6 +210,7 @@ TARGETS_SHARK = $(addsuffix shark,$(TARGETS))
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+BUILDTREE_VARS += OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY)
BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
@@ -230,7 +231,7 @@ checks: check_os_version check_j2se_version
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
diff --git a/hotspot/make/linux/build.sh b/hotspot/make/linux/build.sh
index f46b8df..79844c5 100644
--- a/hotspot/make/linux/build.sh
+++ b/hotspot/make/linux/build.sh
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -45,6 +45,9 @@ case `uname -m` in
i386|i486|i586|i686)
mach=i386
;;
+ x86_64)
+ mach=amd64
+ ;;
*)
echo "Unsupported machine: " `uname -m`
exit 1
diff --git a/hotspot/make/linux/makefiles/arm.make b/hotspot/make/linux/makefiles/arm.make
index e210303..6d7079e 100644
--- a/hotspot/make/linux/makefiles/arm.make
+++ b/hotspot/make/linux/makefiles/arm.make
@@ -1,6 +1,25 @@
#
# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
-# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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.
+#
#
Obj_Files += linux_arm.o
diff --git a/hotspot/make/linux/makefiles/build_vm_def.sh b/hotspot/make/linux/makefiles/build_vm_def.sh
index fb9a0d5..ea81ff6 100644
--- a/hotspot/make/linux/makefiles/build_vm_def.sh
+++ b/hotspot/make/linux/makefiles/build_vm_def.sh
@@ -7,6 +7,10 @@ else
NM=nm
fi
-$NM --defined-only $* | awk '
- { if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";" }
- '
+$NM --defined-only $* \
+ | awk '{
+ if ($3 ~ /^_ZTV/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
+ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
+ if ($3 ~ /^_ZN9Arguments17SharedArchivePathE$/) print "\t" $3 ";"
+ }' \
+ | sort -u
diff --git a/hotspot/make/linux/makefiles/buildtree.make b/hotspot/make/linux/makefiles/buildtree.make
index becd974..f8a1e885 100644
--- a/hotspot/make/linux/makefiles/buildtree.make
+++ b/hotspot/make/linux/makefiles/buildtree.make
@@ -233,6 +233,10 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
[ -n "$(CFLAGS_BROWSE)" ] && \
echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
+ [ -n "$(OBJCOPY)" ] && \
+ echo && echo "OBJCOPY = $(OBJCOPY)"; \
+ [ -n "$(STRIP_POLICY)" ] && \
+ echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
[ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
echo && \
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
diff --git a/hotspot/make/linux/makefiles/defs.make b/hotspot/make/linux/makefiles/defs.make
index 88329a6..df5b8e4 100644
--- a/hotspot/make/linux/makefiles/defs.make
+++ b/hotspot/make/linux/makefiles/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
@@ -114,36 +114,113 @@ ifeq ($(ARCH), ppc)
HS_ARCH = ppc
endif
+# determine if HotSpot is being built in JDK6 or earlier version
+JDK6_OR_EARLIER=0
+ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
+ # if the longer variable names (newer build style) are set, then check those
+ ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
+ JDK6_OR_EARLIER=1
+ endif
+else
+ # the longer variables aren't set so check the shorter variable names
+ ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
+ JDK6_OR_EARLIER=1
+ endif
+endif
+
+ifeq ($(JDK6_OR_EARLIER),0)
+ # Full Debug Symbols is supported on JDK7 or newer
+
+ # Default OBJCOPY comes from GNU Binutils on Linux:
+ DEF_OBJCOPY=/usr/bin/objcopy
+ ifdef CROSS_COMPILE_ARCH
+ # don't try to generate .debuginfo files when cross compiling
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \
+ "skipping .debuginfo generation.")
+ OBJCOPY=
+ else
+ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+ ifneq ($(ALT_OBJCOPY),)
+ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
+ # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
+ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
+ endif
+ endif
+
+ ifeq ($(OBJCOPY),)
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
+ else
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+
+ # Library stripping policies for .debuginfo configs:
+ # all_strip - strips everything from the library
+ # min_strip - strips most stuff from the library; leaves minimum symbols
+ # no_strip - does not strip the library at all
+ #
+ # Oracle security policy requires "all_strip". A waiver was granted on
+ # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+ #
+ DEF_STRIP_POLICY="min_strip"
+ ifeq ($(ALT_STRIP_POLICY),)
+ STRIP_POLICY=$(DEF_STRIP_POLICY)
+ else
+ STRIP_POLICY=$(ALT_STRIP_POLICY)
+ endif
+
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+ endif
+endif
+
JDK_INCLUDE_SUBDIR=linux
+# Library suffix
+LIBRARY_SUFFIX=so
+
# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
VM_DEBUG=jvmg
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
# client and server subdirectories have symbolic links to ../libjsig.so
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
+ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
ifndef BUILD_CLIENT_ONLY
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ endif
endif
ifneq ($(ZERO_BUILD), true)
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ endif
endif
endif
# Serviceability Binaries
# No SA Support for PPC, IA64, ARM or zero
-ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+ADD_SA_BINARIES/x86 = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
-ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so \
+ADD_SA_BINARIES/sparc = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \
$(EXPORT_LIB_DIR)/sa-jdi.jar
+ifneq ($(OBJCOPY),)
+ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+endif
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
ADD_SA_BINARIES/arm =
diff --git a/hotspot/make/linux/makefiles/gcc.make b/hotspot/make/linux/makefiles/gcc.make
index fa9e29c..e36cec6 100644
--- a/hotspot/make/linux/makefiles/gcc.make
+++ b/hotspot/make/linux/makefiles/gcc.make
@@ -225,6 +225,26 @@ ifeq ($(DEBUG_CFLAGS/$(BUILDARCH)),)
DEBUG_CFLAGS += -gstabs
endif
+ifneq ($(OBJCOPY),)
+ FASTDEBUG_CFLAGS/ia64 = -g
+ FASTDEBUG_CFLAGS/amd64 = -g
+ FASTDEBUG_CFLAGS/arm = -g
+ FASTDEBUG_CFLAGS/ppc = -g
+ FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH))
+ ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),)
+ FASTDEBUG_CFLAGS += -gstabs
+ endif
+
+ OPT_CFLAGS/ia64 = -g
+ OPT_CFLAGS/amd64 = -g
+ OPT_CFLAGS/arm = -g
+ OPT_CFLAGS/ppc = -g
+ OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH))
+ ifeq ($(OPT_CFLAGS/$(BUILDARCH)),)
+ OPT_CFLAGS += -gstabs
+ endif
+endif
+
# DEBUG_BINARIES overrides everything, use full -g debug information
ifeq ($(DEBUG_BINARIES), true)
DEBUG_CFLAGS = -g
@@ -242,3 +262,9 @@ endif
ifdef MINIMIZE_RAM_USAGE
CFLAGS += -DMINIMIZE_RAM_USAGE
endif
+
+ifdef CROSS_COMPILE_ARCH
+ STRIP = $(ALT_COMPILER_PATH)/strip
+else
+ STRIP = strip
+endif
diff --git a/hotspot/make/linux/makefiles/jsig.make b/hotspot/make/linux/makefiles/jsig.make
index 18f65d9..9408e49 100644
--- a/hotspot/make/linux/makefiles/jsig.make
+++ b/hotspot/make/linux/makefiles/jsig.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -31,9 +31,13 @@ LIBJSIG = lib$(JSIG).so
JSIG_G = $(JSIG)$(G_SUFFIX)
LIBJSIG_G = lib$(JSIG_G).so
+LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo
+LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo
+
JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
-DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO)
LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
@@ -54,9 +58,24 @@ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< -ldl
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -g $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); }
+endif
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
+ $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \
+ cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
.PHONY: install_jsig
diff --git a/hotspot/make/linux/makefiles/mapfile-vers-debug b/hotspot/make/linux/makefiles/mapfile-vers-debug
index 7592f7d..3f4e85f 100644
--- a/hotspot/make/linux/makefiles/mapfile-vers-debug
+++ b/hotspot/make/linux/makefiles/mapfile-vers-debug
@@ -245,24 +245,6 @@ SUNWprivate_1.1 {
JVM_Yield;
JVM_handle_linux_signal;
- # Old reflection routines
- # These do not need to be present in the product build in JDK 1.4
- # but their code has not been removed yet because there will not
- # be a substantial code savings until JVM_InvokeMethod and
- # JVM_NewInstanceFromConstructor can also be removed; see
- # reflectionCompat.hpp.
- JVM_GetClassConstructor;
- JVM_GetClassConstructors;
- JVM_GetClassField;
- JVM_GetClassFields;
- JVM_GetClassMethod;
- JVM_GetClassMethods;
- JVM_GetField;
- JVM_GetPrimitiveField;
- JVM_NewInstance;
- JVM_SetField;
- JVM_SetPrimitiveField;
-
# debug JVM
JVM_AccessVMBooleanFlag;
JVM_AccessVMIntFlag;
diff --git a/hotspot/make/linux/makefiles/mapfile-vers-product b/hotspot/make/linux/makefiles/mapfile-vers-product
index 451a4cd..43bc964 100644
--- a/hotspot/make/linux/makefiles/mapfile-vers-product
+++ b/hotspot/make/linux/makefiles/mapfile-vers-product
@@ -245,24 +245,6 @@ SUNWprivate_1.1 {
JVM_Yield;
JVM_handle_linux_signal;
- # Old reflection routines
- # These do not need to be present in the product build in JDK 1.4
- # but their code has not been removed yet because there will not
- # be a substantial code savings until JVM_InvokeMethod and
- # JVM_NewInstanceFromConstructor can also be removed; see
- # reflectionCompat.hpp.
- JVM_GetClassConstructor;
- JVM_GetClassConstructors;
- JVM_GetClassField;
- JVM_GetClassFields;
- JVM_GetClassMethod;
- JVM_GetClassMethods;
- JVM_GetField;
- JVM_GetPrimitiveField;
- JVM_NewInstance;
- JVM_SetField;
- JVM_SetPrimitiveField;
-
# miscellaneous functions
jio_fprintf;
jio_printf;
diff --git a/hotspot/make/linux/makefiles/ppc.make b/hotspot/make/linux/makefiles/ppc.make
index a3a19bc..92957f9 100644
--- a/hotspot/make/linux/makefiles/ppc.make
+++ b/hotspot/make/linux/makefiles/ppc.make
@@ -1,6 +1,25 @@
#
# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
-# ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute 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 copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
diff --git a/hotspot/make/linux/makefiles/product.make b/hotspot/make/linux/makefiles/product.make
index 379685f..981a9be 100644
--- a/hotspot/make/linux/makefiles/product.make
+++ b/hotspot/make/linux/makefiles/product.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -46,13 +46,10 @@ VERSION = optimized
# use -g to strip library as -x will discard its symbol table; -x is fine for
# executables.
-ifdef CROSS_COMPILE_ARCH
- STRIP = $(ALT_COMPILER_PATH)/strip
-else
- STRIP = strip
-endif
+# Note: these macros are not used in .debuginfo configs
STRIP_LIBJVM = $(STRIP) -g $@ || exit 1;
STRIP_AOUT = $(STRIP) -x $@ || exit 1;
-# Don't strip in VM build; JDK build will strip libraries later
+# If we can create .debuginfo files, then the VM is stripped in vm.make
+# and this macro is not used.
# LINK_LIB.CC/POST_HOOK += $(STRIP_$(LINK_INTO))
diff --git a/hotspot/make/linux/makefiles/sa.make b/hotspot/make/linux/makefiles/sa.make
index 37a53b8..ede5761 100644
--- a/hotspot/make/linux/makefiles/sa.make
+++ b/hotspot/make/linux/makefiles/sa.make
@@ -43,13 +43,7 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
# TODO: if it's a modules image, check if SA module is installed.
MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
-# gnumake 3.78.1 does not accept the *s that
-# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
-
-AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
-AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
+AGENT_FILES_LIST := $(GENERATED)/agent.classes.list
SA_CLASSDIR = $(GENERATED)/saclasses
@@ -68,7 +62,7 @@ all:
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
$(QUIETLY) echo "Making $@"
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -82,7 +76,6 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
mkdir -p $(SA_CLASSDIR); \
fi
-
# Note: When indented, make tries to execute the '$(shell' comment.
# In some environments, cmd processors have limited line length.
# To prevent the javac invocation in the next block from using
@@ -93,13 +86,12 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
# the initialization of the lists is also done in the same phase
# using '$(shell rm ...' instead of using the more traditional
# 'rm ...' rule.
- $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
- $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
- $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
-
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
- $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-
+ $(shell rm -rf $(AGENT_FILES_LIST))
+# gnumake 3.78.1 does not accept the *'s that
+# are in AGENT_FILES, so use the shell to expand them.
+# Be extra carefull to not produce too long command lines in the shell!
+ $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
+ $(QUIETLY) $(REMOTE) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
$(QUIETLY) $(REMOTE) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
@@ -118,4 +110,4 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
clean:
rm -rf $(SA_CLASSDIR)
rm -rf $(GENERATED)/sa-jdi.jar
- rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
+ rm -rf $(AGENT_FILES_LIST)
diff --git a/hotspot/make/linux/makefiles/saproc.make b/hotspot/make/linux/makefiles/saproc.make
index 68ec237..4bca453 100644
--- a/hotspot/make/linux/makefiles/saproc.make
+++ b/hotspot/make/linux/makefiles/saproc.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -32,6 +32,9 @@ LIBSAPROC = lib$(SAPROC).so
SAPROC_G = $(SAPROC)$(G_SUFFIX)
LIBSAPROC_G = lib$(SAPROC_G).so
+LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
+LIBSAPROC_G_DEBUGINFO = lib$(SAPROC_G).debuginfo
+
AGENT_DIR = $(GAMMADIR)/agent
SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)
@@ -45,7 +48,8 @@ SASRCFILES = $(SASRCDIR)/salibelf.c \
SAMAPFILE = $(SASRCDIR)/mapfile
-DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO)
# DEBUG_BINARIES overrides everything, use full -g debug information
ifeq ($(DEBUG_BINARIES), true)
@@ -82,10 +86,25 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
-o $@ \
-lthread_db
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -g $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); }
+endif
install_saproc: $(BUILDLIBSAPROC)
$(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \
echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \
+ test -f $(LIBSAPROC_DEBUGINFO) && \
+ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO); \
cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
fi
diff --git a/hotspot/make/linux/makefiles/vm.make b/hotspot/make/linux/makefiles/vm.make
index 83c51b1..d406782 100644
--- a/hotspot/make/linux/makefiles/vm.make
+++ b/hotspot/make/linux/makefiles/vm.make
@@ -60,10 +60,16 @@ Src_Dirs_I += $(GENERATED)
# The order is important for the precompiled headers to work.
INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%)
-ifeq (${VERSION}, debug)
+# SYMFLAG is used by {jsig,saproc}.make
+ifneq ($(OBJCOPY),)
+ # always build with debug info when we can create .debuginfo files
SYMFLAG = -g
else
- SYMFLAG =
+ ifeq (${VERSION}, debug)
+ SYMFLAG = -g
+ else
+ SYMFLAG =
+ endif
endif
# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
@@ -124,6 +130,9 @@ JVM = jvm
LIBJVM = lib$(JVM).so
LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
+LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
+LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
+
SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
SOURCE_PATHS=\
@@ -307,11 +316,30 @@ $(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
fi \
fi \
}
+ifeq ($(CROSS_COMPILE_ARCH),)
+ ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -g $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+ endif
+endif
-DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
+DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
+DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
+DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
install_jvm: $(LIBJVM)
@echo "Copying $(LIBJVM) to $(DEST_JVM)"
+ $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
+ cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
$(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
#----------------------------------------------------------------------
diff --git a/hotspot/make/sa.files b/hotspot/make/sa.files
index dd9a0fd..4836c96 100644
--- a/hotspot/make/sa.files
+++ b/hotspot/make/sa.files
@@ -36,7 +36,7 @@ AGENT_SRC_DIR = $(AGENT_DIR)/src/share/classes
# Splitted the set of files into two sets because on linux plaform
# listing or compiling all the files results in 'Argument list too long' error.
-AGENT_FILES1 = \
+AGENT_FILES = \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/amd64/*.java \
@@ -46,17 +46,18 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/asm/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/bugspot/tree/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/c1/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/ci/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/code/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/amd64/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/amd64/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/bsd/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/basic/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/basic/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/sparc/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dbx/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/dummy/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/ia64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/linux/*.java \
@@ -75,7 +76,6 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/remote/amd64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/remote/sparc/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/remote/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/sparc/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/win32/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/win32/coff/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/windbg/amd64/*.java \
@@ -89,12 +89,14 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/interpreter/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/jdi/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/livejvm/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/memory/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java
-
-
-AGENT_FILES2 = \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/oops/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/opto/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/prims/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/amd64/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd_amd64/*.java \
+$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/bsd_x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \
@@ -106,9 +108,6 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/solaris_amd64/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/solaris_sparc/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/solaris_x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/sparc/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/win32_amd64/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/win32_ia64/*.java \
-$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/win32_x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/x86/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/tools/jcore/*.java \
diff --git a/hotspot/make/solaris/Makefile b/hotspot/make/solaris/Makefile
index b3af851..e1f32c4 100644
--- a/hotspot/make/solaris/Makefile
+++ b/hotspot/make/solaris/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
@@ -168,6 +168,7 @@ TARGETS_KERNEL = $(addsuffix kernel,$(TARGETS))
BUILDTREE_MAKE = $(GAMMADIR)/make/$(OSNAME)/makefiles/buildtree.make
BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) ARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH)
BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+BUILDTREE_VARS += OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY)
BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS)
diff --git a/hotspot/make/solaris/makefiles/build_vm_def.sh b/hotspot/make/solaris/makefiles/build_vm_def.sh
new file mode 100644
index 0000000..7f86953
--- /dev/null
+++ b/hotspot/make/solaris/makefiles/build_vm_def.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+/usr/ccs/bin/nm -p $* \
+ | awk '{
+ if ($2 == "U") next
+ if ($3 ~ /^__1c.*__vtbl_$/ || $3 ~ /^gHotSpotVM/) print "\t" $3 ";"
+ if ($3 ~ /^UseSharedSpaces$/) print "\t" $3 ";"
+ if ($3 ~ /^__1cJArgumentsRSharedArchivePath_$/) print "\t" $3 ";"
+ }' \
+ | sort -u
diff --git a/hotspot/make/solaris/makefiles/buildtree.make b/hotspot/make/solaris/makefiles/buildtree.make
index 591ae3c..30e03be 100644
--- a/hotspot/make/solaris/makefiles/buildtree.make
+++ b/hotspot/make/solaris/makefiles/buildtree.make
@@ -226,6 +226,10 @@ flags.make: $(BUILDTREE_MAKE) ../shared_dirs.lst
echo "$(call gamma-path,commonsrc,os/posix/vm)"; \
[ -n "$(CFLAGS_BROWSE)" ] && \
echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \
+ [ -n "$(OBJCOPY)" ] && \
+ echo && echo "OBJCOPY = $(OBJCOPY)"; \
+ [ -n "$(STRIP_POLICY)" ] && \
+ echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \
[ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \
echo && \
echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \
diff --git a/hotspot/make/solaris/makefiles/debug.make b/hotspot/make/solaris/makefiles/debug.make
index 57b6a11..60dc21b 100644
--- a/hotspot/make/solaris/makefiles/debug.make
+++ b/hotspot/make/solaris/makefiles/debug.make
@@ -41,8 +41,7 @@ CFLAGS += $(DEBUG_CFLAGS/BYFILE)
# Linker mapfiles
MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
+ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
# This mapfile is only needed when compiling with dtrace support,
# and mustn't be otherwise.
diff --git a/hotspot/make/solaris/makefiles/defs.make b/hotspot/make/solaris/makefiles/defs.make
index 6fc5964..f4b6ea3 100644
--- a/hotspot/make/solaris/makefiles/defs.make
+++ b/hotspot/make/solaris/makefiles/defs.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 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
@@ -59,36 +59,135 @@ else
endif
endif
+# determine if HotSpot is being built in JDK6 or earlier version
+JDK6_OR_EARLIER=0
+ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1"
+ # if the longer variable names (newer build style) are set, then check those
+ ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1"
+ JDK6_OR_EARLIER=1
+ endif
+else
+ # the longer variables aren't set so check the shorter variable names
+ ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1"
+ JDK6_OR_EARLIER=1
+ endif
+endif
+
+ifeq ($(JDK6_OR_EARLIER),0)
+ # Full Debug Symbols is supported on JDK7 or newer
+
+ifdef ENABLE_FULL_DEBUG_SYMBOLS
+ # Only check for Full Debug Symbols support on Solaris if it is
+ # specifically enabled. Hopefully, it can be enabled by default
+ # once the .debuginfo size issues are worked out.
+
+ # Default OBJCOPY comes from the SUNWbinutils package:
+ DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
+ ifeq ($(VM_PLATFORM),solaris_amd64)
+ # On Solaris AMD64/X64, gobjcopy is not happy and fails:
+ #
+ # usr/sfw/bin/gobjcopy --add-gnu-debuglink=<lib>.debuginfo <lib>.so
+ # BFD: stKPaiop: Not enough room for program headers, try linking with -N
+ # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value
+ # BFD: stKPaiop: Not enough room for program headers, try linking with -N
+ # /usr/sfw/bin/gobjcopy: libsaproc.debuginfo: Bad value
+ # BFD: stKPaiop: Not enough room for program headers, try linking with -N
+ # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: $(DEF_OBJCOPY) is not working on Solaris AMD64/X64")
+ OBJCOPY=
+ else
+ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
+ ifneq ($(ALT_OBJCOPY),)
+ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
+ # disable .debuginfo support by setting ALT_OBJCOPY to a non-existent path
+ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
+ endif
+ endif
+endif
+
+ ifeq ($(OBJCOPY),)
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.")
+ else
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.")
+
+ # Library stripping policies for .debuginfo configs:
+ # all_strip - strips everything from the library
+ # min_strip - strips most stuff from the library; leaves minimum symbols
+ # no_strip - does not strip the library at all
+ #
+ # Oracle security policy requires "all_strip". A waiver was granted on
+ # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE.
+ #
+ DEF_STRIP_POLICY="min_strip"
+ ifeq ($(ALT_STRIP_POLICY),)
+ STRIP_POLICY=$(DEF_STRIP_POLICY)
+ else
+ STRIP_POLICY=$(ALT_STRIP_POLICY)
+ endif
+ _JUNK_ := $(shell \
+ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)")
+ endif
+endif
+
JDK_INCLUDE_SUBDIR=solaris
+# Library suffix
+LIBRARY_SUFFIX=so
+
# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
VM_DEBUG=jvmg
EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
-# client and server subdirectories have symbolic links to ../libjsig.so
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.so
+# client and server subdirectories have symbolic links to ../libjsig.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX)
+ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo
+endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+
ifneq ($(BUILD_CLIENT_ONLY),true)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.debuginfo
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.debuginfo
+ endif
endif
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.debuginfo
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.debuginfo
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.debuginfo
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.debuginfo
+ endif
ifneq ($(BUILD_CLIENT_ONLY), true)
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so
- EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX)
+ ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.debuginfo
+ EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.debuginfo
+ endif
endif
endif
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
+ifneq ($(OBJCOPY),)
+ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo
+endif
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
diff --git a/hotspot/make/solaris/makefiles/dtrace.make b/hotspot/make/solaris/makefiles/dtrace.make
index 8b75085..c7cc159 100644
--- a/hotspot/make/solaris/makefiles/dtrace.make
+++ b/hotspot/make/solaris/makefiles/dtrace.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -41,10 +41,16 @@ JVM_DB = libjvm_db
LIBJVM_DB = libjvm_db.so
LIBJVM_DB_G = libjvm$(G_SUFFIX)_db.so
+LIBJVM_DB_DEBUGINFO = libjvm_db.debuginfo
+LIBJVM_DB_G_DEBUGINFO = libjvm$(G_SUFFIX)_db.debuginfo
+
JVM_DTRACE = jvm_dtrace
LIBJVM_DTRACE = libjvm_dtrace.so
LIBJVM_DTRACE_G = libjvm$(G_SUFFIX)_dtrace.so
+LIBJVM_DTRACE_DEBUGINFO = libjvm_dtrace.debuginfo
+LIBJVM_DTRACE_G_DEBUGINFO = libjvm$(G_SUFFIX)_dtrace.debuginfo
+
JVMOFFS = JvmOffsets
JVMOFFS.o = $(JVMOFFS).o
GENOFFS = generate$(JVMOFFS)
@@ -89,12 +95,30 @@ XLIBJVM_DB_G = 64/$(LIBJVM_DB_G)
XLIBJVM_DTRACE = 64/$(LIBJVM_DTRACE)
XLIBJVM_DTRACE_G = 64/$(LIBJVM_DTRACE_G)
+XLIBJVM_DB_DEBUGINFO = 64/$(LIBJVM_DB_DEBUGINFO)
+XLIBJVM_DB_G_DEBUGINFO = 64/$(LIBJVM_DB_G_DEBUGINFO)
+XLIBJVM_DTRACE_DEBUGINFO = 64/$(LIBJVM_DTRACE_DEBUGINFO)
+XLIBJVM_DTRACE_G_DEBUGINFO = 64/$(LIBJVM_DTRACE_G_DEBUGINFO)
+
$(XLIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS).h $(LIBJVM_DB_MAPFILE)
@echo Making $@
$(QUIETLY) mkdir -p 64/ ; \
$(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. -I$(GENERATED) \
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
[ -f $(XLIBJVM_DB_G) ] || { ln -s $(LIBJVM_DB) $(XLIBJVM_DB_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DB_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DB_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(XLIBJVM_DB_G_DEBUGINFO) ] || { ln -s $(LIBJVM_DB_DEBUGINFO) $(XLIBJVM_DB_G_DEBUGINFO); }
+endif
$(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
@echo Making $@
@@ -102,6 +126,19 @@ $(XLIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(DTRACE_SRCDIR)/$(JVM_DTRAC
$(CC) $(SYMFLAG) $(ARCHFLAG/$(ISA)) -D$(TYPE) -I. \
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
[ -f $(XLIBJVM_DTRACE_G) ] || { ln -s $(LIBJVM_DTRACE) $(XLIBJVM_DTRACE_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(XLIBJVM_DTRACE_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(XLIBJVM_DTRACE_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(XLIBJVM_DTRACE_G_DEBUGINFO) ] || { ln -s $(LIBJVM_DTRACE_DEBUGINFO) $(XLIBJVM_DTRACE_G_DEBUGINFO); }
+endif
endif # ifneq ("${ISA}","${BUILDARCH}")
@@ -148,12 +185,38 @@ $(LIBJVM_DB): $(DTRACE_SRCDIR)/$(JVM_DB).c $(JVMOFFS.o) $(XLIBJVM_DB) $(LIBJVM_D
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. -I$(GENERATED) \
$(SHARED_FLAG) $(LFLAGS_JVM_DB) -o $@ $(DTRACE_SRCDIR)/$(JVM_DB).c -lc
[ -f $(LIBJVM_DB_G) ] || { ln -s $@ $(LIBJVM_DB_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DB_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DB_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(LIBJVM_DB_G_DEBUGINFO) ] || { ln -s $(LIBJVM_DB_DEBUGINFO) $(LIBJVM_DB_G_DEBUGINFO); }
+endif
$(LIBJVM_DTRACE): $(DTRACE_SRCDIR)/$(JVM_DTRACE).c $(XLIBJVM_DTRACE) $(DTRACE_SRCDIR)/$(JVM_DTRACE).h $(LIBJVM_DTRACE_MAPFILE)
@echo Making $@
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) -D$(TYPE) -I. \
$(SHARED_FLAG) $(LFLAGS_JVM_DTRACE) -o $@ $(DTRACE_SRCDIR)/$(JVM_DTRACE).c -lc -lthread -ldoor
[ -f $(LIBJVM_DTRACE_G) ] || { ln -s $@ $(LIBJVM_DTRACE_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DTRACE_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DTRACE_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(LIBJVM_DTRACE_G_DEBUGINFO) ] || { ln -s $(LIBJVM_DTRACE_DEBUGINFO) $(LIBJVM_DTRACE_G_DEBUGINFO); }
+endif
$(DTRACE).d: $(DTRACE_SRCDIR)/hotspot.d $(DTRACE_SRCDIR)/hotspot_jni.d \
$(DTRACE_SRCDIR)/hs_private.d $(DTRACE_SRCDIR)/jhelper.d
diff --git a/hotspot/make/solaris/makefiles/fastdebug.make b/hotspot/make/solaris/makefiles/fastdebug.make
index 1a033f0..2841055 100644
--- a/hotspot/make/solaris/makefiles/fastdebug.make
+++ b/hotspot/make/solaris/makefiles/fastdebug.make
@@ -107,8 +107,7 @@ CFLAGS += $(DEBUG_CFLAGS/BYFILE)
# Linker mapfiles
MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
+ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
# This mapfile is only needed when compiling with dtrace support,
# and mustn't be otherwise.
diff --git a/hotspot/make/solaris/makefiles/jsig.make b/hotspot/make/solaris/makefiles/jsig.make
index 0fadae7..9002077 100644
--- a/hotspot/make/solaris/makefiles/jsig.make
+++ b/hotspot/make/solaris/makefiles/jsig.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 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
@@ -31,9 +31,13 @@ LIBJSIG = lib$(JSIG).so
JSIG_G = $(JSIG)$(G_SUFFIX)
LIBJSIG_G = lib$(JSIG_G).so
+LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo
+LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo
+
JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm
-DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG)
+DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO)
LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig
@@ -50,9 +54,24 @@ $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
$(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
$(LFLAGS_JSIG) -o $@ $< -ldl
[ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); }
+endif
install_jsig: $(LIBJSIG)
@echo "Copying $(LIBJSIG) to $(DEST_JSIG)"
+ $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \
+ cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO)
$(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done"
.PHONY: install_jsig
diff --git a/hotspot/make/solaris/makefiles/jvmg.make b/hotspot/make/solaris/makefiles/jvmg.make
index a5cc37f..8e1db86 100644
--- a/hotspot/make/solaris/makefiles/jvmg.make
+++ b/hotspot/make/solaris/makefiles/jvmg.make
@@ -44,8 +44,7 @@ CFLAGS += $(DEBUG_CFLAGS/BYFILE)
# Linker mapfiles
MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
+ $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-debug
# This mapfile is only needed when compiling with dtrace support,
# and mustn't be otherwise.
diff --git a/hotspot/make/solaris/makefiles/mapfile-vers b/hotspot/make/solaris/makefiles/mapfile-vers
index 49e9401..a073502 100644
--- a/hotspot/make/solaris/makefiles/mapfile-vers
+++ b/hotspot/make/solaris/makefiles/mapfile-vers
@@ -3,7 +3,7 @@
#
#
-# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 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
@@ -257,6 +257,9 @@ SUNWprivate_1.1 {
# This is for Forte Analyzer profiling support.
AsyncGetCallTrace;
+
+ # INSERT VTABLE SYMBOLS HERE
+
local:
*;
};
diff --git a/hotspot/make/solaris/makefiles/optimized.make b/hotspot/make/solaris/makefiles/optimized.make
index 563bd4c..6919578 100644
--- a/hotspot/make/solaris/makefiles/optimized.make
+++ b/hotspot/make/solaris/makefiles/optimized.make
@@ -48,9 +48,7 @@ endif # Platform_compiler == sparcWorks
CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
# Linker mapfiles
-# NOTE: inclusion of nonproduct mapfile not necessary; read it for details
-MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
+MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
# This mapfile is only needed when compiling with dtrace support,
# and mustn't be otherwise.
diff --git a/hotspot/make/solaris/makefiles/product.make b/hotspot/make/solaris/makefiles/product.make
index e6ebeea..300b70d 100644
--- a/hotspot/make/solaris/makefiles/product.make
+++ b/hotspot/make/solaris/makefiles/product.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 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
@@ -58,13 +58,9 @@ CFLAGS$(HOTSPARC_GENERIC) += $(OPT_CFLAGS/BYFILE)
# to inhibit the effect of the previous line on CFLAGS.
# Linker mapfiles
-# NOTE: inclusion of nonproduct mapfile not necessary; read it for details
-ifdef USE_GCC
MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers
-else
-MAPFILE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers \
- $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-nonproduct
+ifndef USE_GCC
# This mapfile is only needed when compiling with dtrace support,
# and mustn't be otherwise.
MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
@@ -72,7 +68,8 @@ MAPFILE_DTRACE = $(GAMMADIR)/make/solaris/makefiles/mapfile-vers-$(TYPE)
REORDERFILE = $(GAMMADIR)/make/solaris/makefiles/reorder_$(TYPE)_$(BUILDARCH)
endif
-# Don't strip in VM build; JDK build will strip libraries later
+# If we can create .debuginfo files, then the VM is stripped in vm.make
+# and this macro is not used.
# LINK_LIB.CC/POST_HOOK += $(STRIP_LIB.CC/POST_HOOK)
G_SUFFIX =
diff --git a/hotspot/make/solaris/makefiles/sa.make b/hotspot/make/solaris/makefiles/sa.make
index d510443..ec27f56 100644
--- a/hotspot/make/solaris/makefiles/sa.make
+++ b/hotspot/make/solaris/makefiles/sa.make
@@ -39,13 +39,7 @@ SA_CLASSPATH = $(BOOT_JAVA_HOME)/lib/tools.jar
# TODO: if it's a modules image, check if SA module is installed.
MODULELIB_PATH= $(BOOT_JAVA_HOME)/lib/modules
-# gnumake 3.78.1 does not accept the *s that
-# are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them
-AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1))
-AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2))
-
-AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
-AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
+AGENT_FILES_LIST := $(GENERATED)/agent.classes.list
SA_CLASSDIR = $(GENERATED)/saclasses
@@ -59,7 +53,7 @@ all:
$(MAKE) -f sa.make $(GENERATED)/sa-jdi.jar; \
fi
-$(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
+$(GENERATED)/sa-jdi.jar: $(AGENT_FILES)
$(QUIETLY) echo "Making $@";
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
@@ -73,7 +67,6 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
$(QUIETLY) if [ ! -d $(SA_CLASSDIR) ] ; then \
mkdir -p $(SA_CLASSDIR); \
fi
-
# Note: When indented, make tries to execute the '$(shell' comment.
# In some environments, cmd processors have limited line length.
# To prevent the javac invocation in the next block from using
@@ -84,13 +77,12 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
# the initialization of the lists is also done in the same phase
# using '$(shell rm ...' instead of using the more traditional
# 'rm ...' rule.
- $(shell rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST))
- $(foreach file,$(AGENT_FILES1),$(shell echo $(file) >> $(AGENT_FILES1_LIST)))
- $(foreach file,$(AGENT_FILES2),$(shell echo $(file) >> $(AGENT_FILES2_LIST)))
-
- $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES1_LIST)
- $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES2_LIST)
-
+ $(shell rm -rf $(AGENT_FILES_LIST))
+# gnumake 3.78.1 does not accept the *'s that
+# are in AGENT_FILES, so use the shell to expand them.
+# Be extra carefull to not produce too long command lines in the shell!
+ $(foreach file,$(AGENT_FILES),$(shell ls -1 $(file) >> $(AGENT_FILES_LIST)))
+ $(QUIETLY) $(COMPILE.JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) @$(AGENT_FILES_LIST)
$(QUIETLY) $(COMPILE.RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
$(QUIETLY) echo "$(SA_BUILD_VERSION_PROP)" > $(SA_PROPERTIES)
$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
@@ -106,4 +98,4 @@ $(GENERATED)/sa-jdi.jar: $(AGENT_FILES1) $(AGENT_FILES2)
clean:
rm -rf $(SA_CLASSDIR)
rm -rf $(GENERATED)/sa-jdi.jar
- rm -rf $(AGENT_FILES1_LIST) $(AGENT_FILES2_LIST)
+ rm -rf $(AGENT_FILES_LIST)
diff --git a/hotspot/make/solaris/makefiles/saproc.make b/hotspot/make/solaris/makefiles/saproc.make
index 027faaa..389ed9d 100644
--- a/hotspot/make/solaris/makefiles/saproc.make
+++ b/hotspot/make/solaris/makefiles/saproc.make
@@ -32,6 +32,9 @@ LIBSAPROC = lib$(SAPROC).so
SAPROC_G = $(SAPROC)$(G_SUFFIX)
LIBSAPROC_G = lib$(SAPROC_G).so
+LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo
+LIBSAPROC_G_DEBUGINFO = lib$(SAPROC_G).debuginfo
+
AGENT_DIR = $(GAMMADIR)/agent
SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family)/proc
@@ -40,7 +43,8 @@ SASRCFILES = $(SASRCDIR)/saproc.cpp
SAMAPFILE = $(SASRCDIR)/mapfile
-DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC)
+DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO)
# if $(AGENT_DIR) does not exist, we don't build SA
@@ -72,9 +76,9 @@ $(shell uname -r -v \
-e '/^[0-4]\. /b' \
-e '/^5\.[0-9] /b' \
-e '/^5\.10 /b' \
- -e '/ snv_[0-9][0-9]$/b' \
- -e '/ snv_[01][0-4][0-9]$/b' \
- -e '/ snv_15[0-8]$/b' \
+ -e '/ snv_[0-9][0-9]$$/b' \
+ -e '/ snv_[01][0-4][0-9]$$/b' \
+ -e '/ snv_15[0-8]$$/b' \
-e 's/.*/-DSOLARIS_11_B159_OR_LATER/' \
-e 'p' \
)
@@ -101,10 +105,25 @@ $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
-o $@ \
-ldl -ldemangle -lthread -lc
[ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); }
+endif
install_saproc: $(BULDLIBSAPROC)
$(QUIETLY) if [ -f $(LIBSAPROC) ] ; then \
echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \
+ test -f $(LIBSAPROC_DEBUGINFO) && \
+ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO); \
cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \
fi
diff --git a/hotspot/make/solaris/makefiles/sparcWorks.make b/hotspot/make/solaris/makefiles/sparcWorks.make
index 18a892e..67a22a2 100644
--- a/hotspot/make/solaris/makefiles/sparcWorks.make
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 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
@@ -148,6 +148,9 @@ endif
# -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp.
CFLAGS += -DDONT_USE_PRECOMPILED_HEADER
+# Compiler warnings are treated as errors
+CFLAGS_WARN = -xwe
+
################################################
# Begin current (>=5.9) Forte compiler options #
#################################################
@@ -478,9 +481,18 @@ CFLAGS += -DCC_INTERP
endif
# Flags for Debugging
+# The -g0 setting allows the C++ frontend to inline, which is a big win.
+# The -xs setting disables 'lazy debug info' which puts everything in
+# the .so instead of requiring the '.o' files.
+ifneq ($(OBJCOPY),)
+ OPT_CFLAGS += -g0 -xs
+endif
DEBUG_CFLAGS = -g
FASTDEBUG_CFLAGS = -g0
-# The -g0 setting allows the C++ frontend to inline, which is a big win.
+ifneq ($(OBJCOPY),)
+ DEBUG_CFLAGS += -xs
+ FASTDEBUG_CFLAGS += -xs
+endif
# Special global options for SS12
ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
@@ -499,6 +511,9 @@ endif
# data using a unique globalization prefix. Instead force the use of
# a static globalization prefix based on the source filepath so the
# objects from two identical compilations are the same.
+# EXTRA_CFLAGS only covers vm_version.cpp for some reason
+#EXTRA_CFLAGS += -Qoption ccfe -xglobalstatic
+#OPT_CFLAGS += -Qoption ccfe -xglobalstatic
#DEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
#FASTDEBUG_CFLAGS += -Qoption ccfe -xglobalstatic
@@ -559,6 +574,8 @@ LINK_LIB.CC/POST_HOOK += $(MCS) -c $@ || exit 1;
# since the hook must terminate itself as a valid command.)
# Also, strip debug and line number information (worth about 1.7Mb).
+# If we can create .debuginfo files, then the VM is stripped in vm.make
+# and this macro is not used.
STRIP_LIB.CC/POST_HOOK = $(STRIP) -x $@ || exit 1;
# STRIP_LIB.CC/POST_HOOK is incorporated into LINK_LIB.CC/POST_HOOK
# in certain configurations, such as product.make. Other configurations,
diff --git a/hotspot/make/solaris/makefiles/vm.make b/hotspot/make/solaris/makefiles/vm.make
index 5db3dae..7b950af 100644
--- a/hotspot/make/solaris/makefiles/vm.make
+++ b/hotspot/make/solaris/makefiles/vm.make
@@ -55,10 +55,17 @@ VPATH += $(Src_Dirs_V:%=%:)
Src_Dirs_I += $(GENERATED)
INCLUDES += $(Src_Dirs_I:%=-I%)
-ifeq (${VERSION}, debug)
- SYMFLAG = -g
+# SYMFLAG is used by {dtrace,jsig,saproc}.make.
+ifneq ($(OBJCOPY),)
+ # always build with debug info when we can create .debuginfo files
+ # and disable 'lazy debug info' so the .so has everything.
+ SYMFLAG = -g -xs
else
- SYMFLAG =
+ ifeq (${VERSION}, debug)
+ SYMFLAG = -g
+ else
+ SYMFLAG =
+ endif
endif
# The following variables are defined in the generated flags.make file.
@@ -140,6 +147,9 @@ JVM = jvm
LIBJVM = lib$(JVM).so
LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
+LIBJVM_DEBUGINFO = lib$(JVM).debuginfo
+LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo
+
SPECIAL_PATHS:=adlc c1 dist gc_implementation opto shark libadt
SOURCE_PATHS=\
@@ -212,14 +222,24 @@ JVM_OBJ_FILES = $(Obj_Files) $(DTRACE_OBJS)
vm_version.o: $(filter-out vm_version.o,$(JVM_OBJ_FILES))
-mapfile : $(MAPFILE) $(MAPFILE_DTRACE_OPT)
+mapfile : $(MAPFILE) $(MAPFILE_DTRACE_OPT) vm.def
rm -f $@
- cat $^ > $@
+ cat $(MAPFILE) $(MAPFILE_DTRACE_OPT) \
+ | $(NAWK) '{ \
+ if ($$0 ~ "INSERT VTABLE SYMBOLS HERE") { \
+ system ("cat vm.def"); \
+ } else { \
+ print $$0; \
+ } \
+ }' > $@
mapfile_reorder : mapfile $(MAPFILE_DTRACE_OPT) $(REORDERFILE)
rm -f $@
cat $^ > $@
+vm.def: $(Obj_Files)
+ sh $(GAMMADIR)/make/solaris/makefiles/build_vm_def.sh *.o > $@
+
ifeq ($(LINK_INTO),AOUT)
LIBJVM.o =
LIBJVM_MAPFILE =
@@ -255,13 +275,30 @@ ifeq ($(filter -sbfast -xsbfast, $(CFLAGS_BROWSE)),)
$(QUIETLY) rm -f $@.1 && ln -s $@ $@.1
$(QUIETLY) [ -f $(LIBJVM_G) ] || ln -s $@ $(LIBJVM_G)
$(QUIETLY) [ -f $(LIBJVM_G).1 ] || ln -s $@.1 $(LIBJVM_G).1
+ifneq ($(OBJCOPY),)
+ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO)
+ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@
+ ifeq ($(STRIP_POLICY),all_strip)
+ $(QUIETLY) $(STRIP) $@
+ else
+ ifeq ($(STRIP_POLICY),min_strip)
+ $(QUIETLY) $(STRIP) -x $@
+ # implied else here is no stripping at all
+ endif
+ endif
+ $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO)
+endif
endif # filter -sbfast -xsbfast
-DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
+DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR)
+DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM)
+DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO)
install_jvm: $(LIBJVM)
@echo "Copying $(LIBJVM) to $(DEST_JVM)"
+ $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \
+ cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO)
$(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done"
#----------------------------------------------------------------------
diff --git a/hotspot/make/windows/makefiles/compile.make b/hotspot/make/windows/makefiles/compile.make
index 75851e2..8cc5677 100644
--- a/hotspot/make/windows/makefiles/compile.make
+++ b/hotspot/make/windows/makefiles/compile.make
@@ -81,7 +81,6 @@ CPP=ARCH_ERROR
!endif
CPP_FLAGS=$(CPP_FLAGS) /D "WIN32" /D "_WINDOWS"
-
# Must specify this for sharedRuntimeTrig.cpp
CPP_FLAGS=$(CPP_FLAGS) /D "VM_LITTLE_ENDIAN"
@@ -232,6 +231,11 @@ LINK_FLAGS= $(LINK_FLAGS) kernel32.lib user32.lib gdi32.lib winspool.lib \
uuid.lib Wsock32.lib winmm.lib /nologo /machine:$(MACHINE) /opt:REF \
/opt:ICF,8 /map /debug
+
+!if $(MSC_VER) >= 1600
+LINK_FLAGS= $(LINK_FLAGS) psapi.lib
+!endif
+
# Resource compiler settings
RC=rc.exe
RC_FLAGS=/D "HS_VER=$(HS_VER)" \
diff --git a/hotspot/make/windows/makefiles/defs.make b/hotspot/make/windows/makefiles/defs.make
index ded87af..c1be7d2 100644
--- a/hotspot/make/windows/makefiles/defs.make
+++ b/hotspot/make/windows/makefiles/defs.make
@@ -109,6 +109,9 @@ endif
JDK_INCLUDE_SUBDIR=win32
+# Library suffix
+LIBRARY_SUFFIX=dll
+
# HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
# and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
@@ -171,27 +174,28 @@ ifeq ($(BUILD_WIN_SA), 1)
endif
EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
+EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
+EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
+
EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
-EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
ifeq ($(ARCH_DATA_MODEL), 32)
- EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
+ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
# kernel vm
- EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
- EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
+ EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
endif
ifeq ($(BUILD_WIN_SA), 1)
- EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll
+ EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
diff --git a/hotspot/make/windows/makefiles/sa.make b/hotspot/make/windows/makefiles/sa.make
index 85072ec..ac59711 100644
--- a/hotspot/make/windows/makefiles/sa.make
+++ b/hotspot/make/windows/makefiles/sa.make
@@ -52,12 +52,11 @@ default:: $(GENERATED)\sa-jdi.jar
# Remove the space between $(SA_BUILD_VERSION_PROP) and > below as it adds a white space
# at the end of SA version string and causes a version mismatch with the target VM version.
-$(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
+$(GENERATED)\sa-jdi.jar: $(AGENT_FILES:/=\)
@if not exist $(SA_CLASSDIR) mkdir $(SA_CLASSDIR)
@echo ...Building sa-jdi.jar
@echo ...$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -d $(SA_CLASSDIR) ....
- @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES1:/=\)
- @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES2:/=\)
+ @$(COMPILE_JAVAC) -classpath $(SA_CLASSPATH) -sourcepath $(AGENT_SRC_DIR) -d $(SA_CLASSDIR) $(AGENT_FILES:/=\)
$(COMPILE_RMIC) -classpath $(SA_CLASSDIR) -d $(SA_CLASSDIR) sun.jvm.hotspot.debugger.remote.RemoteDebuggerServer
$(QUIETLY) echo $(SA_BUILD_VERSION_PROP)> $(SA_PROPERTIES)
$(QUIETLY) rm -f $(SA_CLASSDIR)/sun/jvm/hotspot/utilities/soql/sa.js
@@ -66,7 +65,7 @@ $(GENERATED)\sa-jdi.jar: $(AGENT_FILES1:/=\) $(AGENT_FILES2:/=\)
$(QUIETLY) mkdir $(SA_CLASSDIR)\sun\jvm\hotspot\ui\resources
$(QUIETLY) cp $(AGENT_SRC_DIR)/sun/jvm/hotspot/ui/resources/*.png $(SA_CLASSDIR)/sun/jvm/hotspot/ui/resources
$(QUIETLY) cp -r $(AGENT_SRC_DIR)/images/* $(SA_CLASSDIR)
- $(RUN_JAR) cf $@ -C saclasses .
+ $(RUN_JAR) cf $@ -C $(SA_CLASSDIR) .
$(RUN_JAR) uf $@ -C $(AGENT_SRC_DIR:/=\) META-INF\services\com.sun.jdi.connect.Connector
$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.windbg.WindbgDebuggerLocal
$(RUN_JAVAH) -classpath $(SA_CLASSDIR) -jni sun.jvm.hotspot.debugger.x86.X86ThreadContext
diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp
index 14f7f6c..8fe1155 100644
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.cpp
@@ -100,12 +100,19 @@ void Assembler::print_instruction(int inst) {
case call_op: s = "call"; break;
case branch_op:
switch (inv_op2(inst)) {
- case bpr_op2: s = "bpr"; break;
case fb_op2: s = "fb"; break;
case fbp_op2: s = "fbp"; break;
case br_op2: s = "br"; break;
case bp_op2: s = "bp"; break;
case cb_op2: s = "cb"; break;
+ case bpr_op2: {
+ if (is_cbcond(inst)) {
+ s = is_cxb(inst) ? "cxb" : "cwb";
+ } else {
+ s = "bpr";
+ }
+ break;
+ }
default: s = "????"; break;
}
}
@@ -127,12 +134,21 @@ int Assembler::patched_branch(int dest_pos, int inst, int inst_pos) {
case call_op: m = wdisp(word_aligned_ones, 0, 30); v = wdisp(dest_pos, inst_pos, 30); break;
case branch_op:
switch (inv_op2(inst)) {
- case bpr_op2: m = wdisp16(word_aligned_ones, 0); v = wdisp16(dest_pos, inst_pos); break;
case fbp_op2: m = wdisp( word_aligned_ones, 0, 19); v = wdisp( dest_pos, inst_pos, 19); break;
case bp_op2: m = wdisp( word_aligned_ones, 0, 19); v = wdisp( dest_pos, inst_pos, 19); break;
case fb_op2: m = wdisp( word_aligned_ones, 0, 22); v = wdisp( dest_pos, inst_pos, 22); break;
case br_op2: m = wdisp( word_aligned_ones, 0, 22); v = wdisp( dest_pos, inst_pos, 22); break;
case cb_op2: m = wdisp( word_aligned_ones, 0, 22); v = wdisp( dest_pos, inst_pos, 22); break;
+ case bpr_op2: {
+ if (is_cbcond(inst)) {
+ m = wdisp10(word_aligned_ones, 0);
+ v = wdisp10(dest_pos, inst_pos);
+ } else {
+ m = wdisp16(word_aligned_ones, 0);
+ v = wdisp16(dest_pos, inst_pos);
+ }
+ break;
+ }
default: ShouldNotReachHere();
}
}
@@ -149,12 +165,19 @@ int Assembler::branch_destination(int inst, int pos) {
case call_op: r = inv_wdisp(inst, pos, 30); break;
case branch_op:
switch (inv_op2(inst)) {
- case bpr_op2: r = inv_wdisp16(inst, pos); break;
case fbp_op2: r = inv_wdisp( inst, pos, 19); break;
case bp_op2: r = inv_wdisp( inst, pos, 19); break;
case fb_op2: r = inv_wdisp( inst, pos, 22); break;
case br_op2: r = inv_wdisp( inst, pos, 22); break;
case cb_op2: r = inv_wdisp( inst, pos, 22); break;
+ case bpr_op2: {
+ if (is_cbcond(inst)) {
+ r = inv_wdisp10(inst, pos);
+ } else {
+ r = inv_wdisp16(inst, pos);
+ }
+ break;
+ }
default: ShouldNotReachHere();
}
}
@@ -968,13 +991,7 @@ void MacroAssembler::set_last_Java_frame(Register last_java_sp, Register last_Ja
Label PcOk;
save_frame(0); // to avoid clobbering O0
ld_ptr(pc_addr, L0);
- tst(L0);
-#ifdef _LP64
- brx(Assembler::zero, false, Assembler::pt, PcOk);
-#else
- br(Assembler::zero, false, Assembler::pt, PcOk);
-#endif // _LP64
- delayed() -> nop();
+ br_null_short(L0, Assembler::pt, PcOk);
stop("last_Java_pc not zeroed before leaving Java");
bind(PcOk);
@@ -1003,7 +1020,7 @@ void MacroAssembler::set_last_Java_frame(Register last_java_sp, Register last_Ja
Label StackOk;
andcc(last_java_sp, 0x01, G0);
br(Assembler::notZero, false, Assembler::pt, StackOk);
- delayed() -> nop();
+ delayed()->nop();
stop("Stack Not Biased in set_last_Java_frame");
bind(StackOk);
#endif // ASSERT
@@ -1099,8 +1116,7 @@ void MacroAssembler::check_and_forward_exception(Register scratch_reg)
Address exception_addr(G2_thread, Thread::pending_exception_offset());
ld_ptr(exception_addr, scratch_reg);
- br_null(scratch_reg,false,pt,L);
- delayed()->nop();
+ br_null_short(scratch_reg, pt, L);
// we use O7 linkage so that forward_exception_entry has the issuing PC
call(StubRoutines::forward_exception_entry(), relocInfo::runtime_call_type);
delayed()->nop();
@@ -1778,7 +1794,8 @@ void MacroAssembler::_verify_oop(Register reg, const char* msg, const char * fil
mov(reg,O0); // Move arg into O0; arg might be in O7 which is about to be crushed
stx(O7,SP,frame::register_save_words*wordSize+STACK_BIAS+7*8);
- set((intptr_t)real_msg, O1);
+ // Size of set() should stay the same
+ patchable_set((intptr_t)real_msg, O1);
// Load address to call to into O7
load_ptr_contents(a, O7);
// Register call to verify_oop_subroutine
@@ -1815,7 +1832,8 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* msg, const char
ld_ptr(addr.base(), addr.disp() + 8*8, O0); // Load arg into O0; arg might be in O7 which is about to be crushed
stx(O7,SP,frame::register_save_words*wordSize+STACK_BIAS+7*8);
- set((intptr_t)real_msg, O1);
+ // Size of set() should stay the same
+ patchable_set((intptr_t)real_msg, O1);
// Load address to call to into O7
load_ptr_contents(a, O7);
// Register call to verify_oop_subroutine
@@ -1874,14 +1892,11 @@ void MacroAssembler::verify_oop_subroutine() {
// assert((obj & oop_mask) == oop_bits);
and3(O0_obj, O2_mask, O4_temp);
- cmp(O4_temp, O3_bits);
- brx(notEqual, false, pn, null_or_fail);
- delayed()->nop();
+ cmp_and_brx_short(O4_temp, O3_bits, notEqual, pn, null_or_fail);
if ((NULL_WORD & Universe::verify_oop_mask()) == Universe::verify_oop_bits()) {
// the null_or_fail case is useless; must test for null separately
- br_null(O0_obj, false, pn, succeed);
- delayed()->nop();
+ br_null_short(O0_obj, pn, succeed);
}
// Check the klassOop of this object for being in the right area of memory.
@@ -1893,9 +1908,7 @@ void MacroAssembler::verify_oop_subroutine() {
if( Universe::verify_klass_bits() != Universe::verify_oop_bits() )
set(Universe::verify_klass_bits(), O3_bits);
and3(O0_obj, O2_mask, O4_temp);
- cmp(O4_temp, O3_bits);
- brx(notEqual, false, pn, fail);
- delayed()->nop();
+ cmp_and_brx_short(O4_temp, O3_bits, notEqual, pn, fail);
// Check the klass's klass
load_klass(O0_obj, O0_obj);
and3(O0_obj, O2_mask, O4_temp);
@@ -1965,7 +1978,8 @@ void MacroAssembler::stop(const char* msg) {
save_frame(::round_to(sizeof(RegistersForDebugging) / BytesPerWord, 2));
// stop_subroutine expects message pointer in I1.
- set((intptr_t)msg, O1);
+ // Size of set() should stay the same
+ patchable_set((intptr_t)msg, O1);
// factor long stop-sequence into subroutine to save space
assert(StubRoutines::Sparc::stop_subroutine_entry_address(), "hasn't been generated yet");
@@ -1987,7 +2001,8 @@ void MacroAssembler::warn(const char* msg) {
save_frame(::round_to(sizeof(RegistersForDebugging) / BytesPerWord, 2));
RegistersForDebugging::save_registers(this);
mov(O0, L0);
- set((intptr_t)msg, O0);
+ // Size of set() should stay the same
+ patchable_set((intptr_t)msg, O0);
call( CAST_FROM_FN_PTR(address, warning) );
delayed()->nop();
// ret();
@@ -2122,13 +2137,12 @@ Assembler::RCondition cond2rcond(Assembler::Condition c) {
return Assembler::rc_z;
}
-// compares register with zero and branches. NOT FOR USE WITH 64-bit POINTERS
-void MacroAssembler::br_zero( Condition c, bool a, Predict p, Register s1, Label& L) {
+// compares (32 bit) register with zero and branches. NOT FOR USE WITH 64-bit POINTERS
+void MacroAssembler::cmp_zero_and_br(Condition c, Register s1, Label& L, bool a, Predict p) {
tst(s1);
br (c, a, p, L);
}
-
// Compares a pointer register with zero and branches on null.
// Does a test & branch on 32-bit systems and a register-branch on 64-bit.
void MacroAssembler::br_null( Register s1, bool a, Predict p, Label& L ) {
@@ -2151,27 +2165,91 @@ void MacroAssembler::br_notnull( Register s1, bool a, Predict p, Label& L ) {
#endif
}
-void MacroAssembler::br_on_reg_cond( RCondition rc, bool a, Predict p,
- Register s1, address d,
- relocInfo::relocType rt ) {
- if (VM_Version::v9_instructions_work()) {
- bpr(rc, a, p, s1, d, rt);
+// Compare registers and branch with nop in delay slot or cbcond without delay slot.
+
+// Compare integer (32 bit) values (icc only).
+void MacroAssembler::cmp_and_br_short(Register s1, Register s2, Condition c,
+ Predict p, Label& L) {
+ assert_not_delayed();
+ if (use_cbcond(L)) {
+ Assembler::cbcond(c, icc, s1, s2, L);
} else {
- tst(s1);
- br(reg_cond_to_cc_cond(rc), a, p, d, rt);
+ cmp(s1, s2);
+ br(c, false, p, L);
+ delayed()->nop();
}
}
-void MacroAssembler::br_on_reg_cond( RCondition rc, bool a, Predict p,
- Register s1, Label& L ) {
- if (VM_Version::v9_instructions_work()) {
- bpr(rc, a, p, s1, L);
+// Compare integer (32 bit) values (icc only).
+void MacroAssembler::cmp_and_br_short(Register s1, int simm13a, Condition c,
+ Predict p, Label& L) {
+ assert_not_delayed();
+ if (is_simm(simm13a,5) && use_cbcond(L)) {
+ Assembler::cbcond(c, icc, s1, simm13a, L);
+ } else {
+ cmp(s1, simm13a);
+ br(c, false, p, L);
+ delayed()->nop();
+ }
+}
+
+// Branch that tests xcc in LP64 and icc in !LP64
+void MacroAssembler::cmp_and_brx_short(Register s1, Register s2, Condition c,
+ Predict p, Label& L) {
+ assert_not_delayed();
+ if (use_cbcond(L)) {
+ Assembler::cbcond(c, ptr_cc, s1, s2, L);
+ } else {
+ cmp(s1, s2);
+ brx(c, false, p, L);
+ delayed()->nop();
+ }
+}
+
+// Branch that tests xcc in LP64 and icc in !LP64
+void MacroAssembler::cmp_and_brx_short(Register s1, int simm13a, Condition c,
+ Predict p, Label& L) {
+ assert_not_delayed();
+ if (is_simm(simm13a,5) && use_cbcond(L)) {
+ Assembler::cbcond(c, ptr_cc, s1, simm13a, L);
} else {
- tst(s1);
- br(reg_cond_to_cc_cond(rc), a, p, L);
+ cmp(s1, simm13a);
+ brx(c, false, p, L);
+ delayed()->nop();
}
}
+// Short branch version for compares a pointer with zero.
+
+void MacroAssembler::br_null_short(Register s1, Predict p, Label& L) {
+ assert_not_delayed();
+ if (use_cbcond(L)) {
+ Assembler::cbcond(zero, ptr_cc, s1, 0, L);
+ return;
+ }
+ br_null(s1, false, p, L);
+ delayed()->nop();
+}
+
+void MacroAssembler::br_notnull_short(Register s1, Predict p, Label& L) {
+ assert_not_delayed();
+ if (use_cbcond(L)) {
+ Assembler::cbcond(notZero, ptr_cc, s1, 0, L);
+ return;
+ }
+ br_notnull(s1, false, p, L);
+ delayed()->nop();
+}
+
+// Unconditional short branch
+void MacroAssembler::ba_short(Label& L) {
+ if (use_cbcond(L)) {
+ Assembler::cbcond(equal, icc, G0, G0, L);
+ return;
+ }
+ br(always, false, pt, L);
+ delayed()->nop();
+}
// instruction sequences factored across compiler & interpreter
@@ -2197,11 +2275,9 @@ void MacroAssembler::lcmp( Register Ra_hi, Register Ra_low,
// since that triplet is reached only after finding the high halves differ.
if (VM_Version::v9_instructions_work()) {
-
- mov ( -1, Rresult);
- ba( false, done ); delayed()-> movcc(greater, false, icc, 1, Rresult);
- }
- else {
+ mov(-1, Rresult);
+ ba(done); delayed()-> movcc(greater, false, icc, 1, Rresult);
+ } else {
br(less, true, pt, done); delayed()-> set(-1, Rresult);
br(greater, true, pt, done); delayed()-> set( 1, Rresult);
}
@@ -2212,9 +2288,8 @@ void MacroAssembler::lcmp( Register Ra_hi, Register Ra_low,
mov( -1, Rresult);
movcc(equal, false, icc, 0, Rresult);
movcc(greaterUnsigned, false, icc, 1, Rresult);
- }
- else {
- set(-1, Rresult);
+ } else {
+ set(-1, Rresult);
br(equal, true, pt, done); delayed()->set( 0, Rresult);
br(greaterUnsigned, true, pt, done); delayed()->set( 1, Rresult);
}
@@ -2250,11 +2325,10 @@ void MacroAssembler::lshl( Register Rin_high, Register Rin_low,
// This code can be optimized to use the 64 bit shifts in V9.
// Here we use the 32 bit shifts.
- and3( Rcount, 0x3f, Rcount); // take least significant 6 bits
- subcc(Rcount, 31, Ralt_count);
+ and3( Rcount, 0x3f, Rcount); // take least significant 6 bits
+ subcc(Rcount, 31, Ralt_count);
br(greater, true, pn, big_shift);
- delayed()->
- dec(Ralt_count);
+ delayed()->dec(Ralt_count);
// shift < 32 bits, Ralt_count = Rcount-31
@@ -2263,28 +2337,27 @@ void MacroAssembler::lshl( Register Rin_high, Register Rin_low,
// more to take care of the special (rare) case where count is zero
// (shifting by 32 would not work).
- neg( Ralt_count );
+ neg(Ralt_count);
// The order of the next two instructions is critical in the case where
// Rin and Rout are the same and should not be reversed.
- srl( Rin_low, Ralt_count, Rxfer_bits ); // shift right by 31-count
+ srl(Rin_low, Ralt_count, Rxfer_bits); // shift right by 31-count
if (Rcount != Rout_low) {
- sll( Rin_low, Rcount, Rout_low ); // low half
+ sll(Rin_low, Rcount, Rout_low); // low half
}
- sll( Rin_high, Rcount, Rout_high );
+ sll(Rin_high, Rcount, Rout_high);
if (Rcount == Rout_low) {
- sll( Rin_low, Rcount, Rout_low ); // low half
+ sll(Rin_low, Rcount, Rout_low); // low half
}
- srl( Rxfer_bits, 1, Rxfer_bits ); // shift right by one more
- ba (false, done);
- delayed()->
- or3( Rout_high, Rxfer_bits, Rout_high); // new hi value: or in shifted old hi part and xfer from low
+ srl(Rxfer_bits, 1, Rxfer_bits ); // shift right by one more
+ ba(done);
+ delayed()->or3(Rout_high, Rxfer_bits, Rout_high); // new hi value: or in shifted old hi part and xfer from low
// shift >= 32 bits, Ralt_count = Rcount-32
bind(big_shift);
- sll( Rin_low, Ralt_count, Rout_high );
- clr( Rout_low );
+ sll(Rin_low, Ralt_count, Rout_high );
+ clr(Rout_low);
bind(done);
}
@@ -2313,8 +2386,8 @@ void MacroAssembler::lshr( Register Rin_high, Register Rin_low,
// This code can be optimized to use the 64 bit shifts in V9.
// Here we use the 32 bit shifts.
- and3( Rcount, 0x3f, Rcount); // take least significant 6 bits
- subcc(Rcount, 31, Ralt_count);
+ and3( Rcount, 0x3f, Rcount); // take least significant 6 bits
+ subcc(Rcount, 31, Ralt_count);
br(greater, true, pn, big_shift);
delayed()->dec(Ralt_count);
@@ -2325,29 +2398,28 @@ void MacroAssembler::lshr( Register Rin_high, Register Rin_low,
// more to take care of the special (rare) case where count is zero
// (shifting by 32 would not work).
- neg( Ralt_count );
+ neg(Ralt_count);
if (Rcount != Rout_low) {
- srl( Rin_low, Rcount, Rout_low );
+ srl(Rin_low, Rcount, Rout_low);
}
// The order of the next two instructions is critical in the case where
// Rin and Rout are the same and should not be reversed.
- sll( Rin_high, Ralt_count, Rxfer_bits ); // shift left by 31-count
- sra( Rin_high, Rcount, Rout_high ); // high half
- sll( Rxfer_bits, 1, Rxfer_bits ); // shift left by one more
+ sll(Rin_high, Ralt_count, Rxfer_bits); // shift left by 31-count
+ sra(Rin_high, Rcount, Rout_high ); // high half
+ sll(Rxfer_bits, 1, Rxfer_bits); // shift left by one more
if (Rcount == Rout_low) {
- srl( Rin_low, Rcount, Rout_low );
+ srl(Rin_low, Rcount, Rout_low);
}
- ba (false, done);
- delayed()->
- or3( Rout_low, Rxfer_bits, Rout_low ); // new low value: or shifted old low part and xfer from high
+ ba(done);
+ delayed()->or3(Rout_low, Rxfer_bits, Rout_low); // new low value: or shifted old low part and xfer from high
// shift >= 32 bits, Ralt_count = Rcount-32
bind(big_shift);
- sra( Rin_high, Ralt_count, Rout_low );
- sra( Rin_high, 31, Rout_high ); // sign into hi
+ sra(Rin_high, Ralt_count, Rout_low);
+ sra(Rin_high, 31, Rout_high); // sign into hi
bind( done );
}
@@ -2377,8 +2449,8 @@ void MacroAssembler::lushr( Register Rin_high, Register Rin_low,
// This code can be optimized to use the 64 bit shifts in V9.
// Here we use the 32 bit shifts.
- and3( Rcount, 0x3f, Rcount); // take least significant 6 bits
- subcc(Rcount, 31, Ralt_count);
+ and3( Rcount, 0x3f, Rcount); // take least significant 6 bits
+ subcc(Rcount, 31, Ralt_count);
br(greater, true, pn, big_shift);
delayed()->dec(Ralt_count);
@@ -2389,29 +2461,28 @@ void MacroAssembler::lushr( Register Rin_high, Register Rin_low,
// more to take care of the special (rare) case where count is zero
// (shifting by 32 would not work).
- neg( Ralt_count );
+ neg(Ralt_count);
if (Rcount != Rout_low) {
- srl( Rin_low, Rcount, Rout_low );
+ srl(Rin_low, Rcount, Rout_low);
}
// The order of the next two instructions is critical in the case where
// Rin and Rout are the same and should not be reversed.
- sll( Rin_high, Ralt_count, Rxfer_bits ); // shift left by 31-count
- srl( Rin_high, Rcount, Rout_high ); // high half
- sll( Rxfer_bits, 1, Rxfer_bits ); // shift left by one more
+ sll(Rin_high, Ralt_count, Rxfer_bits); // shift left by 31-count
+ srl(Rin_high, Rcount, Rout_high ); // high half
+ sll(Rxfer_bits, 1, Rxfer_bits); // shift left by one more
if (Rcount == Rout_low) {
- srl( Rin_low, Rcount, Rout_low );
+ srl(Rin_low, Rcount, Rout_low);
}
- ba (false, done);
- delayed()->
- or3( Rout_low, Rxfer_bits, Rout_low ); // new low value: or shifted old low part and xfer from high
+ ba(done);
+ delayed()->or3(Rout_low, Rxfer_bits, Rout_low); // new low value: or shifted old low part and xfer from high
// shift >= 32 bits, Ralt_count = Rcount-32
bind(big_shift);
- srl( Rin_high, Ralt_count, Rout_low );
- clr( Rout_high );
+ srl(Rin_high, Ralt_count, Rout_low);
+ clr(Rout_high);
bind( done );
}
@@ -2419,7 +2490,7 @@ void MacroAssembler::lushr( Register Rin_high, Register Rin_low,
#ifdef _LP64
void MacroAssembler::lcmp( Register Ra, Register Rb, Register Rresult) {
cmp(Ra, Rb);
- mov( -1, Rresult);
+ mov(-1, Rresult);
movcc(equal, false, xcc, 0, Rresult);
movcc(greater, false, xcc, 1, Rresult);
}
@@ -2459,14 +2530,14 @@ void MacroAssembler::float_cmp( bool is_float, int unordered_result,
if (VM_Version::v9_instructions_work()) {
- mov( -1, Rresult );
- movcc( eq, true, fcc0, 0, Rresult );
- movcc( gt, true, fcc0, 1, Rresult );
+ mov(-1, Rresult);
+ movcc(eq, true, fcc0, 0, Rresult);
+ movcc(gt, true, fcc0, 1, Rresult);
} else {
Label done;
- set( -1, Rresult );
+ set( -1, Rresult );
//fb(lt, true, pn, done); delayed()->set( -1, Rresult );
fb( eq, true, pn, done); delayed()->set( 0, Rresult );
fb( gt, true, pn, done); delayed()->set( 1, Rresult );
@@ -2668,9 +2739,7 @@ void MacroAssembler::cas_under_lock(Register top_ptr_reg, Register top_reg, Regi
set(StubRoutines::Sparc::locked, lock_reg);
bind(retry_get_lock);
- cmp(yield_reg, V8AtomicOperationUnderLockSpinCount);
- br(Assembler::less, false, Assembler::pt, dont_yield);
- delayed()->nop();
+ cmp_and_br_short(yield_reg, V8AtomicOperationUnderLockSpinCount, Assembler::less, Assembler::pt, dont_yield);
if(use_call_vm) {
Untested("Need to verify global reg consistancy");
@@ -2700,9 +2769,7 @@ void MacroAssembler::cas_under_lock(Register top_ptr_reg, Register top_reg, Regi
// yes, got lock. do we have the same top?
ld(top_ptr_reg_after_save, 0, value_reg);
- cmp(value_reg, top_reg_after_save);
- br(Assembler::notEqual, false, Assembler::pn, not_same);
- delayed()->nop();
+ cmp_and_br_short(value_reg, top_reg_after_save, Assembler::notEqual, Assembler::pn, not_same);
// yes, same top.
st(ptr_reg_after_save, top_ptr_reg_after_save, 0);
@@ -2952,8 +3019,7 @@ void MacroAssembler::check_klass_subtype(Register sub_klass,
// on success:
restore();
- ba(false, L_success);
- delayed()->nop();
+ ba_short(L_success);
// on failure:
bind(L_pop_to_failure);
@@ -2969,8 +3035,7 @@ void MacroAssembler::check_klass_subtype_fast_path(Register sub_klass,
Label* L_success,
Label* L_failure,
Label* L_slow_path,
- RegisterOrConstant super_check_offset,
- Register instanceof_hack) {
+ RegisterOrConstant super_check_offset) {
int sc_offset = (klassOopDesc::header_size() * HeapWordSize +
Klass::secondary_super_cache_offset_in_bytes());
int sco_offset = (klassOopDesc::header_size() * HeapWordSize +
@@ -2993,29 +3058,10 @@ void MacroAssembler::check_klass_subtype_fast_path(Register sub_klass,
if (L_success == NULL) { L_success = &L_fallthrough; label_nulls++; }
if (L_failure == NULL) { L_failure = &L_fallthrough; label_nulls++; }
if (L_slow_path == NULL) { L_slow_path = &L_fallthrough; label_nulls++; }
- assert(label_nulls <= 1 || instanceof_hack != noreg ||
+ assert(label_nulls <= 1 ||
(L_slow_path == &L_fallthrough && label_nulls <= 2 && !need_slow_path),
"at most one NULL in the batch, usually");
- // Support for the instanceof hack, which uses delay slots to
- // set a destination register to zero or one.
- bool do_bool_sets = (instanceof_hack != noreg);
-#define BOOL_SET(bool_value) \
- if (do_bool_sets && bool_value >= 0) \
- set(bool_value, instanceof_hack)
-#define DELAYED_BOOL_SET(bool_value) \
- if (do_bool_sets && bool_value >= 0) \
- delayed()->set(bool_value, instanceof_hack); \
- else delayed()->nop()
- // Hacked ba(), which may only be used just before L_fallthrough.
-#define FINAL_JUMP(label, bool_value) \
- if (&(label) == &L_fallthrough) { \
- BOOL_SET(bool_value); \
- } else { \
- ba((do_bool_sets && bool_value >= 0), label); \
- DELAYED_BOOL_SET(bool_value); \
- }
-
// If the pointers are equal, we are done (e.g., String[] elements).
// This self-check enables sharing of secondary supertype arrays among
// non-primary types such as array-of-interface. Otherwise, each such
@@ -3024,8 +3070,8 @@ void MacroAssembler::check_klass_subtype_fast_path(Register sub_klass,
// type checks are in fact trivially successful in this manner,
// so we get a nicely predicted branch right at the start of the check.
cmp(super_klass, sub_klass);
- brx(Assembler::equal, do_bool_sets, Assembler::pn, *L_success);
- DELAYED_BOOL_SET(1);
+ brx(Assembler::equal, false, Assembler::pn, *L_success);
+ delayed()->nop();
// Check the supertype display:
if (must_load_sco) {
@@ -3049,50 +3095,49 @@ void MacroAssembler::check_klass_subtype_fast_path(Register sub_klass,
// So if it was a primary super, we can just fail immediately.
// Otherwise, it's the slow path for us (no success at this point).
+ // Hacked ba(), which may only be used just before L_fallthrough.
+#define FINAL_JUMP(label) \
+ if (&(label) != &L_fallthrough) { \
+ ba(label); delayed()->nop(); \
+ }
+
if (super_check_offset.is_register()) {
- brx(Assembler::equal, do_bool_sets, Assembler::pn, *L_success);
- delayed(); if (do_bool_sets) BOOL_SET(1);
- // if !do_bool_sets, sneak the next cmp into the delay slot:
- cmp(super_check_offset.as_register(), sc_offset);
+ brx(Assembler::equal, false, Assembler::pn, *L_success);
+ delayed()->cmp(super_check_offset.as_register(), sc_offset);
if (L_failure == &L_fallthrough) {
- brx(Assembler::equal, do_bool_sets, Assembler::pt, *L_slow_path);
+ brx(Assembler::equal, false, Assembler::pt, *L_slow_path);
delayed()->nop();
- BOOL_SET(0); // fallthrough on failure
} else {
- brx(Assembler::notEqual, do_bool_sets, Assembler::pn, *L_failure);
- DELAYED_BOOL_SET(0);
- FINAL_JUMP(*L_slow_path, -1); // -1 => vanilla delay slot
+ brx(Assembler::notEqual, false, Assembler::pn, *L_failure);
+ delayed()->nop();
+ FINAL_JUMP(*L_slow_path);
}
} else if (super_check_offset.as_constant() == sc_offset) {
// Need a slow path; fast failure is impossible.
if (L_slow_path == &L_fallthrough) {
- brx(Assembler::equal, do_bool_sets, Assembler::pt, *L_success);
- DELAYED_BOOL_SET(1);
+ brx(Assembler::equal, false, Assembler::pt, *L_success);
+ delayed()->nop();
} else {
brx(Assembler::notEqual, false, Assembler::pn, *L_slow_path);
delayed()->nop();
- FINAL_JUMP(*L_success, 1);
+ FINAL_JUMP(*L_success);
}
} else {
// No slow path; it's a fast decision.
if (L_failure == &L_fallthrough) {
- brx(Assembler::equal, do_bool_sets, Assembler::pt, *L_success);
- DELAYED_BOOL_SET(1);
- BOOL_SET(0);
+ brx(Assembler::equal, false, Assembler::pt, *L_success);
+ delayed()->nop();
} else {
- brx(Assembler::notEqual, do_bool_sets, Assembler::pn, *L_failure);
- DELAYED_BOOL_SET(0);
- FINAL_JUMP(*L_success, 1);
+ brx(Assembler::notEqual, false, Assembler::pn, *L_failure);
+ delayed()->nop();
+ FINAL_JUMP(*L_success);
}
}
bind(L_fallthrough);
-#undef final_jump
-#undef bool_set
-#undef DELAYED_BOOL_SET
-#undef final_jump
+#undef FINAL_JUMP
}
@@ -3185,7 +3230,7 @@ void MacroAssembler::check_klass_subtype_slow_path(Register sub_klass,
st_ptr(super_klass, sub_klass, sc_offset);
if (L_success != &L_fallthrough) {
- ba(false, *L_success);
+ ba(*L_success);
delayed()->nop();
}
@@ -3200,9 +3245,7 @@ void MacroAssembler::check_method_handle_type(Register mtype_reg, Register mh_re
// compare method type against that of the receiver
RegisterOrConstant mhtype_offset = delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg);
load_heap_oop(mh_reg, mhtype_offset, temp_reg);
- cmp(temp_reg, mtype_reg);
- br(Assembler::notEqual, false, Assembler::pn, wrong_method_type);
- delayed()->nop();
+ cmp_and_brx_short(temp_reg, mtype_reg, Assembler::notEqual, Assembler::pn, wrong_method_type);
}
@@ -3214,15 +3257,10 @@ void MacroAssembler::load_method_handle_vmslots(Register vmslots_reg, Register m
Register temp_reg) {
assert_different_registers(vmslots_reg, mh_reg, temp_reg);
// load mh.type.form.vmslots
- if (java_lang_invoke_MethodHandle::vmslots_offset_in_bytes() != 0) {
- // hoist vmslots into every mh to avoid dependent load chain
- ld( Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::vmslots_offset_in_bytes, temp_reg)), vmslots_reg);
- } else {
- Register temp2_reg = vmslots_reg;
- load_heap_oop(Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg)), temp2_reg);
- load_heap_oop(Address(temp2_reg, delayed_value(java_lang_invoke_MethodType::form_offset_in_bytes, temp_reg)), temp2_reg);
- ld( Address(temp2_reg, delayed_value(java_lang_invoke_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)), vmslots_reg);
- }
+ Register temp2_reg = vmslots_reg;
+ load_heap_oop(Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg)), temp2_reg);
+ load_heap_oop(Address(temp2_reg, delayed_value(java_lang_invoke_MethodType::form_offset_in_bytes, temp_reg)), temp2_reg);
+ ld( Address(temp2_reg, delayed_value(java_lang_invoke_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)), vmslots_reg);
}
@@ -3295,9 +3333,7 @@ void MacroAssembler::biased_locking_enter(Register obj_reg, Register mark_reg,
// pointers to allow age to be placed into low bits
assert(markOopDesc::age_shift == markOopDesc::lock_bits + markOopDesc::biased_lock_bits, "biased locking makes assumptions about bit layout");
and3(mark_reg, markOopDesc::biased_lock_mask_in_place, temp_reg);
- cmp(temp_reg, markOopDesc::biased_lock_pattern);
- brx(Assembler::notEqual, false, Assembler::pn, cas_label);
- delayed()->nop();
+ cmp_and_brx_short(temp_reg, markOopDesc::biased_lock_pattern, Assembler::notEqual, Assembler::pn, cas_label);
load_klass(obj_reg, temp_reg);
ld_ptr(Address(temp_reg, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes()), temp_reg);
@@ -3364,8 +3400,7 @@ void MacroAssembler::biased_locking_enter(Register obj_reg, Register mark_reg,
brx(Assembler::notEqual, true, Assembler::pn, *slow_case);
delayed()->nop();
}
- br(Assembler::always, false, Assembler::pt, done);
- delayed()->nop();
+ ba_short(done);
bind(try_rebias);
// At this point we know the epoch has expired, meaning that the
@@ -3393,8 +3428,7 @@ void MacroAssembler::biased_locking_enter(Register obj_reg, Register mark_reg,
brx(Assembler::notEqual, true, Assembler::pn, *slow_case);
delayed()->nop();
}
- br(Assembler::always, false, Assembler::pt, done);
- delayed()->nop();
+ ba_short(done);
bind(try_revoke_bias);
// The prototype mark in the klass doesn't have the bias bit set any
@@ -3445,7 +3479,7 @@ void MacroAssembler::biased_locking_exit (Address mark_addr, Register temp_reg,
// Solaris/SPARC's "as". Another apt name would be cas_ptr()
void MacroAssembler::casn (Register addr_reg, Register cmp_reg, Register set_reg ) {
- casx_under_lock (addr_reg, cmp_reg, set_reg, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr()) ;
+ casx_under_lock (addr_reg, cmp_reg, set_reg, (address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
}
@@ -3486,9 +3520,9 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
}
if (EmitSync & 1) {
- mov (3, Rscratch) ;
- st_ptr (Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
- cmp (SP, G0) ;
+ mov(3, Rscratch);
+ st_ptr(Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ cmp(SP, G0);
return ;
}
@@ -3529,7 +3563,7 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
assert(os::vm_page_size() > 0xfff, "page size too small - change the constant");
andcc(Rscratch, 0xfffff003, Rscratch);
st_ptr(Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
- bind (done) ;
+ bind (done);
return ;
}
@@ -3538,7 +3572,7 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
if (EmitSync & 256) {
Label IsInflated ;
- ld_ptr (mark_addr, Rmark); // fetch obj->mark
+ ld_ptr(mark_addr, Rmark); // fetch obj->mark
// Triage: biased, stack-locked, neutral, inflated
if (try_bias) {
biased_locking_enter(Roop, Rmark, Rscratch, done, NULL, counters);
@@ -3549,49 +3583,49 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
// Store mark into displaced mark field in the on-stack basic-lock "box"
// Critically, this must happen before the CAS
// Maximize the ST-CAS distance to minimize the ST-before-CAS penalty.
- st_ptr (Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
- andcc (Rmark, 2, G0) ;
- brx (Assembler::notZero, false, Assembler::pn, IsInflated) ;
- delayed() ->
+ st_ptr(Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ andcc(Rmark, 2, G0);
+ brx(Assembler::notZero, false, Assembler::pn, IsInflated);
+ delayed()->
// Try stack-lock acquisition.
// Beware: the 1st instruction is in a delay slot
- mov (Rbox, Rscratch);
- or3 (Rmark, markOopDesc::unlocked_value, Rmark);
- assert (mark_addr.disp() == 0, "cas must take a zero displacement");
- casn (mark_addr.base(), Rmark, Rscratch) ;
- cmp (Rmark, Rscratch);
- brx (Assembler::equal, false, Assembler::pt, done);
+ mov(Rbox, Rscratch);
+ or3(Rmark, markOopDesc::unlocked_value, Rmark);
+ assert(mark_addr.disp() == 0, "cas must take a zero displacement");
+ casn(mark_addr.base(), Rmark, Rscratch);
+ cmp(Rmark, Rscratch);
+ brx(Assembler::equal, false, Assembler::pt, done);
delayed()->sub(Rscratch, SP, Rscratch);
// Stack-lock attempt failed - check for recursive stack-lock.
// See the comments below about how we might remove this case.
#ifdef _LP64
- sub (Rscratch, STACK_BIAS, Rscratch);
+ sub(Rscratch, STACK_BIAS, Rscratch);
#endif
assert(os::vm_page_size() > 0xfff, "page size too small - change the constant");
- andcc (Rscratch, 0xfffff003, Rscratch);
- br (Assembler::always, false, Assembler::pt, done) ;
- delayed()-> st_ptr (Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ andcc(Rscratch, 0xfffff003, Rscratch);
+ br(Assembler::always, false, Assembler::pt, done);
+ delayed()-> st_ptr(Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
- bind (IsInflated) ;
+ bind(IsInflated);
if (EmitSync & 64) {
// If m->owner != null goto IsLocked
// Pessimistic form: Test-and-CAS vs CAS
// The optimistic form avoids RTS->RTO cache line upgrades.
- ld_ptr (Rmark, ObjectMonitor::owner_offset_in_bytes() - 2, Rscratch);
- andcc (Rscratch, Rscratch, G0) ;
- brx (Assembler::notZero, false, Assembler::pn, done) ;
- delayed()->nop() ;
+ ld_ptr(Rmark, ObjectMonitor::owner_offset_in_bytes() - 2, Rscratch);
+ andcc(Rscratch, Rscratch, G0);
+ brx(Assembler::notZero, false, Assembler::pn, done);
+ delayed()->nop();
// m->owner == null : it's unlocked.
}
// Try to CAS m->owner from null to Self
// Invariant: if we acquire the lock then _recursions should be 0.
- add (Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark) ;
- mov (G2_thread, Rscratch) ;
- casn (Rmark, G0, Rscratch) ;
- cmp (Rscratch, G0) ;
+ add(Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark);
+ mov(G2_thread, Rscratch);
+ casn(Rmark, G0, Rscratch);
+ cmp(Rscratch, G0);
// Intentional fall-through into done
} else {
// Aggressively avoid the Store-before-CAS penalty
@@ -3599,9 +3633,9 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
Label IsInflated, Recursive ;
// Anticipate CAS -- Avoid RTS->RTO upgrade
-// prefetch (mark_addr, Assembler::severalWritesAndPossiblyReads) ;
+// prefetch (mark_addr, Assembler::severalWritesAndPossiblyReads);
- ld_ptr (mark_addr, Rmark); // fetch obj->mark
+ ld_ptr(mark_addr, Rmark); // fetch obj->mark
// Triage: biased, stack-locked, neutral, inflated
if (try_bias) {
@@ -3609,8 +3643,8 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
// Invariant: if control reaches this point in the emitted stream
// then Rmark has not been modified.
}
- andcc (Rmark, 2, G0) ;
- brx (Assembler::notZero, false, Assembler::pn, IsInflated) ;
+ andcc(Rmark, 2, G0);
+ brx(Assembler::notZero, false, Assembler::pn, IsInflated);
delayed()-> // Beware - dangling delay-slot
// Try stack-lock acquisition.
@@ -3620,23 +3654,21 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
// ST obj->mark = box -- overwrite transient 0 value
// This presumes TSO, of course.
- mov (0, Rscratch) ;
- or3 (Rmark, markOopDesc::unlocked_value, Rmark);
- assert (mark_addr.disp() == 0, "cas must take a zero displacement");
- casn (mark_addr.base(), Rmark, Rscratch) ;
-// prefetch (mark_addr, Assembler::severalWritesAndPossiblyReads) ;
- cmp (Rscratch, Rmark) ;
- brx (Assembler::notZero, false, Assembler::pn, Recursive) ;
- delayed() ->
- st_ptr (Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ mov(0, Rscratch);
+ or3(Rmark, markOopDesc::unlocked_value, Rmark);
+ assert(mark_addr.disp() == 0, "cas must take a zero displacement");
+ casn(mark_addr.base(), Rmark, Rscratch);
+// prefetch (mark_addr, Assembler::severalWritesAndPossiblyReads);
+ cmp(Rscratch, Rmark);
+ brx(Assembler::notZero, false, Assembler::pn, Recursive);
+ delayed()->st_ptr(Rmark, Rbox, BasicLock::displaced_header_offset_in_bytes());
if (counters != NULL) {
cond_inc(Assembler::equal, (address) counters->fast_path_entry_count_addr(), Rmark, Rscratch);
}
- br (Assembler::always, false, Assembler::pt, done);
- delayed() ->
- st_ptr (Rbox, mark_addr) ;
+ ba(done);
+ delayed()->st_ptr(Rbox, mark_addr);
- bind (Recursive) ;
+ bind(Recursive);
// Stack-lock attempt failed - check for recursive stack-lock.
// Tests show that we can remove the recursive case with no impact
// on refworkload 0.83. If we need to reduce the size of the code
@@ -3653,49 +3685,48 @@ void MacroAssembler::compiler_lock_object(Register Roop, Register Rmark,
// RScratch contains the fetched obj->mark value from the failed CASN.
#ifdef _LP64
- sub (Rscratch, STACK_BIAS, Rscratch);
+ sub(Rscratch, STACK_BIAS, Rscratch);
#endif
sub(Rscratch, SP, Rscratch);
assert(os::vm_page_size() > 0xfff, "page size too small - change the constant");
- andcc (Rscratch, 0xfffff003, Rscratch);
+ andcc(Rscratch, 0xfffff003, Rscratch);
if (counters != NULL) {
// Accounting needs the Rscratch register
- st_ptr (Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ st_ptr(Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
cond_inc(Assembler::equal, (address) counters->fast_path_entry_count_addr(), Rmark, Rscratch);
- br (Assembler::always, false, Assembler::pt, done) ;
- delayed()->nop() ;
+ ba_short(done);
} else {
- br (Assembler::always, false, Assembler::pt, done) ;
- delayed()-> st_ptr (Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ ba(done);
+ delayed()->st_ptr(Rscratch, Rbox, BasicLock::displaced_header_offset_in_bytes());
}
- bind (IsInflated) ;
+ bind (IsInflated);
if (EmitSync & 64) {
// If m->owner != null goto IsLocked
// Test-and-CAS vs CAS
// Pessimistic form avoids futile (doomed) CAS attempts
// The optimistic form avoids RTS->RTO cache line upgrades.
- ld_ptr (Rmark, ObjectMonitor::owner_offset_in_bytes() - 2, Rscratch);
- andcc (Rscratch, Rscratch, G0) ;
- brx (Assembler::notZero, false, Assembler::pn, done) ;
- delayed()->nop() ;
+ ld_ptr(Rmark, ObjectMonitor::owner_offset_in_bytes() - 2, Rscratch);
+ andcc(Rscratch, Rscratch, G0);
+ brx(Assembler::notZero, false, Assembler::pn, done);
+ delayed()->nop();
// m->owner == null : it's unlocked.
}
// Try to CAS m->owner from null to Self
// Invariant: if we acquire the lock then _recursions should be 0.
- add (Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark) ;
- mov (G2_thread, Rscratch) ;
- casn (Rmark, G0, Rscratch) ;
- cmp (Rscratch, G0) ;
+ add(Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark);
+ mov(G2_thread, Rscratch);
+ casn(Rmark, G0, Rscratch);
+ cmp(Rscratch, G0);
// ST box->displaced_header = NonZero.
// Any non-zero value suffices:
// unused_mark(), G2_thread, RBox, RScratch, rsp, etc.
- st_ptr (Rbox, Rbox, BasicLock::displaced_header_offset_in_bytes());
+ st_ptr(Rbox, Rbox, BasicLock::displaced_header_offset_in_bytes());
// Intentional fall-through into done
}
- bind (done) ;
+ bind (done);
}
void MacroAssembler::compiler_unlock_object(Register Roop, Register Rmark,
@@ -3706,7 +3737,7 @@ void MacroAssembler::compiler_unlock_object(Register Roop, Register Rmark,
Label done ;
if (EmitSync & 4) {
- cmp (SP, G0) ;
+ cmp(SP, G0);
return ;
}
@@ -3717,18 +3748,16 @@ void MacroAssembler::compiler_unlock_object(Register Roop, Register Rmark,
// Test first if it is a fast recursive unlock
ld_ptr(Rbox, BasicLock::displaced_header_offset_in_bytes(), Rmark);
- cmp(Rmark, G0);
- brx(Assembler::equal, false, Assembler::pt, done);
- delayed()->nop();
+ br_null_short(Rmark, Assembler::pt, done);
// Check if it is still a light weight lock, this is is true if we see
// the stack address of the basicLock in the markOop of the object
assert(mark_addr.disp() == 0, "cas must take a zero displacement");
casx_under_lock(mark_addr.base(), Rbox, Rmark,
(address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
- br (Assembler::always, false, Assembler::pt, done);
+ ba(done);
delayed()->cmp(Rbox, Rmark);
- bind (done) ;
+ bind(done);
return ;
}
@@ -3743,14 +3772,14 @@ void MacroAssembler::compiler_unlock_object(Register Roop, Register Rmark,
biased_locking_exit(mark_addr, Rscratch, done);
}
- ld_ptr (Roop, oopDesc::mark_offset_in_bytes(), Rmark) ;
- ld_ptr (Rbox, BasicLock::displaced_header_offset_in_bytes(), Rscratch);
- andcc (Rscratch, Rscratch, G0);
- brx (Assembler::zero, false, Assembler::pn, done);
- delayed()-> nop() ; // consider: relocate fetch of mark, above, into this DS
- andcc (Rmark, 2, G0) ;
- brx (Assembler::zero, false, Assembler::pt, LStacked) ;
- delayed()-> nop() ;
+ ld_ptr(Roop, oopDesc::mark_offset_in_bytes(), Rmark);
+ ld_ptr(Rbox, BasicLock::displaced_header_offset_in_bytes(), Rscratch);
+ andcc(Rscratch, Rscratch, G0);
+ brx(Assembler::zero, false, Assembler::pn, done);
+ delayed()->nop(); // consider: relocate fetch of mark, above, into this DS
+ andcc(Rmark, 2, G0);
+ brx(Assembler::zero, false, Assembler::pt, LStacked);
+ delayed()->nop();
// It's inflated
// Conceptually we need a #loadstore|#storestore "release" MEMBAR before
@@ -3761,48 +3790,45 @@ void MacroAssembler::compiler_unlock_object(Register Roop, Register Rmark,
// Note that we use 1-0 locking by default for the inflated case. We
// close the resultant (and rare) race by having contented threads in
// monitorenter periodically poll _owner.
- ld_ptr (Rmark, ObjectMonitor::owner_offset_in_bytes() - 2, Rscratch);
- ld_ptr (Rmark, ObjectMonitor::recursions_offset_in_bytes() - 2, Rbox);
- xor3 (Rscratch, G2_thread, Rscratch) ;
- orcc (Rbox, Rscratch, Rbox) ;
- brx (Assembler::notZero, false, Assembler::pn, done) ;
+ ld_ptr(Rmark, ObjectMonitor::owner_offset_in_bytes() - 2, Rscratch);
+ ld_ptr(Rmark, ObjectMonitor::recursions_offset_in_bytes() - 2, Rbox);
+ xor3(Rscratch, G2_thread, Rscratch);
+ orcc(Rbox, Rscratch, Rbox);
+ brx(Assembler::notZero, false, Assembler::pn, done);
delayed()->
- ld_ptr (Rmark, ObjectMonitor::EntryList_offset_in_bytes() - 2, Rscratch);
- ld_ptr (Rmark, ObjectMonitor::cxq_offset_in_bytes() - 2, Rbox);
- orcc (Rbox, Rscratch, G0) ;
+ ld_ptr(Rmark, ObjectMonitor::EntryList_offset_in_bytes() - 2, Rscratch);
+ ld_ptr(Rmark, ObjectMonitor::cxq_offset_in_bytes() - 2, Rbox);
+ orcc(Rbox, Rscratch, G0);
if (EmitSync & 65536) {
Label LSucc ;
- brx (Assembler::notZero, false, Assembler::pn, LSucc) ;
- delayed()->nop() ;
- br (Assembler::always, false, Assembler::pt, done) ;
- delayed()->
- st_ptr (G0, Rmark, ObjectMonitor::owner_offset_in_bytes() - 2);
-
- bind (LSucc) ;
- st_ptr (G0, Rmark, ObjectMonitor::owner_offset_in_bytes() - 2);
- if (os::is_MP()) { membar (StoreLoad) ; }
- ld_ptr (Rmark, ObjectMonitor::succ_offset_in_bytes() - 2, Rscratch);
- andcc (Rscratch, Rscratch, G0) ;
- brx (Assembler::notZero, false, Assembler::pt, done) ;
- delayed()-> andcc (G0, G0, G0) ;
- add (Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark) ;
- mov (G2_thread, Rscratch) ;
- casn (Rmark, G0, Rscratch) ;
- cmp (Rscratch, G0) ;
+ brx(Assembler::notZero, false, Assembler::pn, LSucc);
+ delayed()->nop();
+ ba(done);
+ delayed()->st_ptr(G0, Rmark, ObjectMonitor::owner_offset_in_bytes() - 2);
+
+ bind(LSucc);
+ st_ptr(G0, Rmark, ObjectMonitor::owner_offset_in_bytes() - 2);
+ if (os::is_MP()) { membar (StoreLoad); }
+ ld_ptr(Rmark, ObjectMonitor::succ_offset_in_bytes() - 2, Rscratch);
+ andcc(Rscratch, Rscratch, G0);
+ brx(Assembler::notZero, false, Assembler::pt, done);
+ delayed()->andcc(G0, G0, G0);
+ add(Rmark, ObjectMonitor::owner_offset_in_bytes()-2, Rmark);
+ mov(G2_thread, Rscratch);
+ casn(Rmark, G0, Rscratch);
// invert icc.zf and goto done
- brx (Assembler::notZero, false, Assembler::pt, done) ;
- delayed() -> cmp (G0, G0) ;
- br (Assembler::always, false, Assembler::pt, done);
- delayed() -> cmp (G0, 1) ;
+ br_notnull(Rscratch, false, Assembler::pt, done);
+ delayed()->cmp(G0, G0);
+ ba(done);
+ delayed()->cmp(G0, 1);
} else {
- brx (Assembler::notZero, false, Assembler::pn, done) ;
- delayed()->nop() ;
- br (Assembler::always, false, Assembler::pt, done) ;
- delayed()->
- st_ptr (G0, Rmark, ObjectMonitor::owner_offset_in_bytes() - 2);
+ brx(Assembler::notZero, false, Assembler::pn, done);
+ delayed()->nop();
+ ba(done);
+ delayed()->st_ptr(G0, Rmark, ObjectMonitor::owner_offset_in_bytes() - 2);
}
- bind (LStacked) ;
+ bind (LStacked);
// Consider: we could replace the expensive CAS in the exit
// path with a simple ST of the displaced mark value fetched from
// the on-stack basiclock box. That admits a race where a thread T2
@@ -3831,11 +3857,11 @@ void MacroAssembler::compiler_unlock_object(Register Roop, Register Rmark,
// A prototype implementation showed excellent results, although
// the scavenger and timeout code was rather involved.
- casn (mark_addr.base(), Rbox, Rscratch) ;
- cmp (Rbox, Rscratch);
+ casn(mark_addr.base(), Rbox, Rscratch);
+ cmp(Rbox, Rscratch);
// Intentional fall through into done ...
- bind (done) ;
+ bind(done);
}
@@ -3891,9 +3917,7 @@ void MacroAssembler::verify_tlab() {
ld_ptr(G2_thread, in_bytes(JavaThread::tlab_top_offset()), t1);
ld_ptr(G2_thread, in_bytes(JavaThread::tlab_start_offset()), t2);
or3(t1, t2, t3);
- cmp(t1, t2);
- br(Assembler::greaterEqual, false, Assembler::pn, next);
- delayed()->nop();
+ cmp_and_br_short(t1, t2, Assembler::greaterEqual, Assembler::pn, next);
stop("assert(top >= start)");
should_not_reach_here();
@@ -3901,17 +3925,13 @@ void MacroAssembler::verify_tlab() {
ld_ptr(G2_thread, in_bytes(JavaThread::tlab_top_offset()), t1);
ld_ptr(G2_thread, in_bytes(JavaThread::tlab_end_offset()), t2);
or3(t3, t2, t3);
- cmp(t1, t2);
- br(Assembler::lessEqual, false, Assembler::pn, next2);
- delayed()->nop();
+ cmp_and_br_short(t1, t2, Assembler::lessEqual, Assembler::pn, next2);
stop("assert(top <= end)");
should_not_reach_here();
bind(next2);
and3(t3, MinObjAlignmentInBytesMask, t3);
- cmp(t3, 0);
- br(Assembler::lessEqual, false, Assembler::pn, ok);
- delayed()->nop();
+ cmp_and_br_short(t3, 0, Assembler::lessEqual, Assembler::pn, ok);
stop("assert(aligned)");
should_not_reach_here();
@@ -3937,8 +3957,7 @@ void MacroAssembler::eden_allocate(
if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
// No allocation in the shared eden.
- br(Assembler::always, false, Assembler::pt, slow_case);
- delayed()->nop();
+ ba_short(slow_case);
} else {
// get eden boundaries
// note: we need both top & top_addr!
@@ -4072,8 +4091,7 @@ void MacroAssembler::tlab_refill(Label& retry, Label& try_eden, Label& slow_case
if (CMSIncrementalMode || !Universe::heap()->supports_inline_contig_alloc()) {
// No allocation in the shared eden.
- br(Assembler::always, false, Assembler::pt, slow_case);
- delayed()->nop();
+ ba_short(slow_case);
}
ld_ptr(G2_thread, in_bytes(JavaThread::tlab_top_offset()), top);
@@ -4098,8 +4116,7 @@ void MacroAssembler::tlab_refill(Label& retry, Label& try_eden, Label& slow_case
add(t2, 1, t2);
stw(t2, G2_thread, in_bytes(JavaThread::tlab_slow_allocations_offset()));
}
- br(Assembler::always, false, Assembler::pt, try_eden);
- delayed()->nop();
+ ba_short(try_eden);
bind(discard_tlab);
if (TLABStats) {
@@ -4115,8 +4132,7 @@ void MacroAssembler::tlab_refill(Label& retry, Label& try_eden, Label& slow_case
// if tlab is currently allocated (top or end != null) then
// fill [top, end + alignment_reserve) with array object
- br_null(top, false, Assembler::pn, do_refill);
- delayed()->nop();
+ br_null_short(top, Assembler::pn, do_refill);
set((intptr_t)markOopDesc::prototype()->copy_set_hash(0x2), t2);
st_ptr(t2, top, oopDesc::mark_offset_in_bytes()); // set up the mark word
@@ -4151,9 +4167,7 @@ void MacroAssembler::tlab_refill(Label& retry, Label& try_eden, Label& slow_case
Label ok;
ld_ptr(G2_thread, in_bytes(JavaThread::tlab_size_offset()), t2);
sll_ptr(t2, LogHeapWordSize, t2);
- cmp(t1, t2);
- br(Assembler::equal, false, Assembler::pt, ok);
- delayed()->nop();
+ cmp_and_br_short(t1, t2, Assembler::equal, Assembler::pt, ok);
stop("assert(t1 == tlab_size)");
should_not_reach_here();
@@ -4164,8 +4178,7 @@ void MacroAssembler::tlab_refill(Label& retry, Label& try_eden, Label& slow_case
sub(top, ThreadLocalAllocBuffer::alignment_reserve_in_bytes(), top);
st_ptr(top, G2_thread, in_bytes(JavaThread::tlab_end_offset()));
verify_tlab();
- br(Assembler::always, false, Assembler::pt, retry);
- delayed()->nop();
+ ba_short(retry);
}
void MacroAssembler::incr_allocated_bytes(RegisterOrConstant size_in_bytes,
@@ -4290,77 +4303,89 @@ static void generate_satb_log_enqueue(bool with_frame) {
BufferBlob* bb = BufferBlob::create("enqueue_with_frame", EnqueueCodeSize);
CodeBuffer buf(bb);
MacroAssembler masm(&buf);
- address start = masm.pc();
+
+#define __ masm.
+
+ address start = __ pc();
Register pre_val;
Label refill, restart;
if (with_frame) {
- masm.save_frame(0);
+ __ save_frame(0);
pre_val = I0; // Was O0 before the save.
} else {
pre_val = O0;
}
+
int satb_q_index_byte_offset =
in_bytes(JavaThread::satb_mark_queue_offset() +
PtrQueue::byte_offset_of_index());
+
int satb_q_buf_byte_offset =
in_bytes(JavaThread::satb_mark_queue_offset() +
PtrQueue::byte_offset_of_buf());
+
assert(in_bytes(PtrQueue::byte_width_of_index()) == sizeof(intptr_t) &&
in_bytes(PtrQueue::byte_width_of_buf()) == sizeof(intptr_t),
"check sizes in assembly below");
- masm.bind(restart);
- masm.ld_ptr(G2_thread, satb_q_index_byte_offset, L0);
+ __ bind(restart);
+
+ // Load the index into the SATB buffer. PtrQueue::_index is a size_t
+ // so ld_ptr is appropriate.
+ __ ld_ptr(G2_thread, satb_q_index_byte_offset, L0);
- masm.br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pn, L0, refill);
- // If the branch is taken, no harm in executing this in the delay slot.
- masm.delayed()->ld_ptr(G2_thread, satb_q_buf_byte_offset, L1);
- masm.sub(L0, oopSize, L0);
+ // index == 0?
+ __ cmp_and_brx_short(L0, G0, Assembler::equal, Assembler::pn, refill);
- masm.st_ptr(pre_val, L1, L0); // [_buf + index] := I0
+ __ ld_ptr(G2_thread, satb_q_buf_byte_offset, L1);
+ __ sub(L0, oopSize, L0);
+
+ __ st_ptr(pre_val, L1, L0); // [_buf + index] := I0
if (!with_frame) {
// Use return-from-leaf
- masm.retl();
- masm.delayed()->st_ptr(L0, G2_thread, satb_q_index_byte_offset);
+ __ retl();
+ __ delayed()->st_ptr(L0, G2_thread, satb_q_index_byte_offset);
} else {
// Not delayed.
- masm.st_ptr(L0, G2_thread, satb_q_index_byte_offset);
+ __ st_ptr(L0, G2_thread, satb_q_index_byte_offset);
}
if (with_frame) {
- masm.ret();
- masm.delayed()->restore();
+ __ ret();
+ __ delayed()->restore();
}
- masm.bind(refill);
+ __ bind(refill);
address handle_zero =
CAST_FROM_FN_PTR(address,
&SATBMarkQueueSet::handle_zero_index_for_thread);
// This should be rare enough that we can afford to save all the
// scratch registers that the calling context might be using.
- masm.mov(G1_scratch, L0);
- masm.mov(G3_scratch, L1);
- masm.mov(G4, L2);
+ __ mov(G1_scratch, L0);
+ __ mov(G3_scratch, L1);
+ __ mov(G4, L2);
// We need the value of O0 above (for the write into the buffer), so we
// save and restore it.
- masm.mov(O0, L3);
+ __ mov(O0, L3);
// Since the call will overwrite O7, we save and restore that, as well.
- masm.mov(O7, L4);
- masm.call_VM_leaf(L5, handle_zero, G2_thread);
- masm.mov(L0, G1_scratch);
- masm.mov(L1, G3_scratch);
- masm.mov(L2, G4);
- masm.mov(L3, O0);
- masm.br(Assembler::always, /*annul*/false, Assembler::pt, restart);
- masm.delayed()->mov(L4, O7);
+ __ mov(O7, L4);
+ __ call_VM_leaf(L5, handle_zero, G2_thread);
+ __ mov(L0, G1_scratch);
+ __ mov(L1, G3_scratch);
+ __ mov(L2, G4);
+ __ mov(L3, O0);
+ __ br(Assembler::always, /*annul*/false, Assembler::pt, restart);
+ __ delayed()->mov(L4, O7);
if (with_frame) {
satb_log_enqueue_with_frame = start;
- satb_log_enqueue_with_frame_end = masm.pc();
+ satb_log_enqueue_with_frame_end = __ pc();
} else {
satb_log_enqueue_frameless = start;
- satb_log_enqueue_frameless_end = masm.pc();
+ satb_log_enqueue_frameless_end = __ pc();
}
+
+#undef __
}
static inline void generate_satb_log_enqueue_if_necessary(bool with_frame) {
@@ -4424,9 +4449,8 @@ void MacroAssembler::g1_write_barrier_pre(Register obj,
tmp);
}
- // Check on whether to annul.
- br_on_reg_cond(rc_z, /*annul*/false, Assembler::pt, tmp, filtered);
- delayed() -> nop();
+ // Is marking active?
+ cmp_and_br_short(tmp, G0, Assembler::equal, Assembler::pt, filtered);
// Do we need to load the previous value?
if (obj != noreg) {
@@ -4448,9 +4472,7 @@ void MacroAssembler::g1_write_barrier_pre(Register obj,
assert(pre_val != noreg, "must have a real register");
// Is the previous value null?
- // Check on whether to annul.
- br_on_reg_cond(rc_z, /*annul*/false, Assembler::pt, pre_val, filtered);
- delayed() -> nop();
+ cmp_and_brx_short(pre_val, G0, Assembler::equal, Assembler::pt, filtered);
// OK, it's not filtered, so we'll need to call enqueue. In the normal
// case, pre_val will be a scratch G-reg, but there are some cases in
@@ -4477,39 +4499,6 @@ void MacroAssembler::g1_write_barrier_pre(Register obj,
bind(filtered);
}
-static jint num_ct_writes = 0;
-static jint num_ct_writes_filtered_in_hr = 0;
-static jint num_ct_writes_filtered_null = 0;
-static G1CollectedHeap* g1 = NULL;
-
-static Thread* count_ct_writes(void* filter_val, void* new_val) {
- Atomic::inc(&num_ct_writes);
- if (filter_val == NULL) {
- Atomic::inc(&num_ct_writes_filtered_in_hr);
- } else if (new_val == NULL) {
- Atomic::inc(&num_ct_writes_filtered_null);
- } else {
- if (g1 == NULL) {
- g1 = G1CollectedHeap::heap();
- }
- }
- if ((num_ct_writes % 1000000) == 0) {
- jint num_ct_writes_filtered =
- num_ct_writes_filtered_in_hr +
- num_ct_writes_filtered_null;
-
- tty->print_cr("%d potential CT writes: %5.2f%% filtered\n"
- " (%5.2f%% intra-HR, %5.2f%% null).",
- num_ct_writes,
- 100.0*(float)num_ct_writes_filtered/(float)num_ct_writes,
- 100.0*(float)num_ct_writes_filtered_in_hr/
- (float)num_ct_writes,
- 100.0*(float)num_ct_writes_filtered_null/
- (float)num_ct_writes);
- }
- return Thread::current();
-}
-
static address dirty_card_log_enqueue = 0;
static u_char* dirty_card_log_enqueue_end = 0;
@@ -4518,79 +4507,88 @@ static void generate_dirty_card_log_enqueue(jbyte* byte_map_base) {
BufferBlob* bb = BufferBlob::create("dirty_card_enqueue", EnqueueCodeSize*2);
CodeBuffer buf(bb);
MacroAssembler masm(&buf);
- address start = masm.pc();
+#define __ masm.
+ address start = __ pc();
Label not_already_dirty, restart, refill;
#ifdef _LP64
- masm.srlx(O0, CardTableModRefBS::card_shift, O0);
+ __ srlx(O0, CardTableModRefBS::card_shift, O0);
#else
- masm.srl(O0, CardTableModRefBS::card_shift, O0);
+ __ srl(O0, CardTableModRefBS::card_shift, O0);
#endif
AddressLiteral addrlit(byte_map_base);
- masm.set(addrlit, O1); // O1 := <card table base>
- masm.ldub(O0, O1, O2); // O2 := [O0 + O1]
+ __ set(addrlit, O1); // O1 := <card table base>
+ __ ldub(O0, O1, O2); // O2 := [O0 + O1]
- masm.br_on_reg_cond(Assembler::rc_nz, /*annul*/false, Assembler::pt,
- O2, not_already_dirty);
- // Get O1 + O2 into a reg by itself -- useful in the take-the-branch
- // case, harmless if not.
- masm.delayed()->add(O0, O1, O3);
+ assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
+ __ cmp_and_br_short(O2, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
// We didn't take the branch, so we're already dirty: return.
// Use return-from-leaf
- masm.retl();
- masm.delayed()->nop();
+ __ retl();
+ __ delayed()->nop();
// Not dirty.
- masm.bind(not_already_dirty);
+ __ bind(not_already_dirty);
+
+ // Get O0 + O1 into a reg by itself
+ __ add(O0, O1, O3);
+
// First, dirty it.
- masm.stb(G0, O3, G0); // [cardPtr] := 0 (i.e., dirty).
+ __ stb(G0, O3, G0); // [cardPtr] := 0 (i.e., dirty).
+
int dirty_card_q_index_byte_offset =
in_bytes(JavaThread::dirty_card_queue_offset() +
PtrQueue::byte_offset_of_index());
int dirty_card_q_buf_byte_offset =
in_bytes(JavaThread::dirty_card_queue_offset() +
PtrQueue::byte_offset_of_buf());
- masm.bind(restart);
- masm.ld_ptr(G2_thread, dirty_card_q_index_byte_offset, L0);
+ __ bind(restart);
+
+ // Load the index into the update buffer. PtrQueue::_index is
+ // a size_t so ld_ptr is appropriate here.
+ __ ld_ptr(G2_thread, dirty_card_q_index_byte_offset, L0);
- masm.br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pn,
- L0, refill);
- // If the branch is taken, no harm in executing this in the delay slot.
- masm.delayed()->ld_ptr(G2_thread, dirty_card_q_buf_byte_offset, L1);
- masm.sub(L0, oopSize, L0);
+ // index == 0?
+ __ cmp_and_brx_short(L0, G0, Assembler::equal, Assembler::pn, refill);
- masm.st_ptr(O3, L1, L0); // [_buf + index] := I0
+ __ ld_ptr(G2_thread, dirty_card_q_buf_byte_offset, L1);
+ __ sub(L0, oopSize, L0);
+
+ __ st_ptr(O3, L1, L0); // [_buf + index] := I0
// Use return-from-leaf
- masm.retl();
- masm.delayed()->st_ptr(L0, G2_thread, dirty_card_q_index_byte_offset);
+ __ retl();
+ __ delayed()->st_ptr(L0, G2_thread, dirty_card_q_index_byte_offset);
- masm.bind(refill);
+ __ bind(refill);
address handle_zero =
CAST_FROM_FN_PTR(address,
&DirtyCardQueueSet::handle_zero_index_for_thread);
// This should be rare enough that we can afford to save all the
// scratch registers that the calling context might be using.
- masm.mov(G1_scratch, L3);
- masm.mov(G3_scratch, L5);
+ __ mov(G1_scratch, L3);
+ __ mov(G3_scratch, L5);
// We need the value of O3 above (for the write into the buffer), so we
// save and restore it.
- masm.mov(O3, L6);
+ __ mov(O3, L6);
// Since the call will overwrite O7, we save and restore that, as well.
- masm.mov(O7, L4);
+ __ mov(O7, L4);
- masm.call_VM_leaf(L7_thread_cache, handle_zero, G2_thread);
- masm.mov(L3, G1_scratch);
- masm.mov(L5, G3_scratch);
- masm.mov(L6, O3);
- masm.br(Assembler::always, /*annul*/false, Assembler::pt, restart);
- masm.delayed()->mov(L4, O7);
+ __ call_VM_leaf(L7_thread_cache, handle_zero, G2_thread);
+ __ mov(L3, G1_scratch);
+ __ mov(L5, G3_scratch);
+ __ mov(L6, O3);
+ __ br(Assembler::always, /*annul*/false, Assembler::pt, restart);
+ __ delayed()->mov(L4, O7);
dirty_card_log_enqueue = start;
- dirty_card_log_enqueue_end = masm.pc();
+ dirty_card_log_enqueue_end = __ pc();
// XXX Should have a guarantee here about not going off the end!
// Does it already do so? Do an experiment...
+
+#undef __
+
}
static inline void
@@ -4618,6 +4616,7 @@ void MacroAssembler::g1_write_barrier_post(Register store_addr, Register new_val
G1SATBCardTableModRefBS* bs = (G1SATBCardTableModRefBS*) Universe::heap()->barrier_set();
assert(bs->kind() == BarrierSet::G1SATBCT ||
bs->kind() == BarrierSet::G1SATBCTLogging, "wrong barrier");
+
if (G1RSBarrierRegionFilter) {
xor3(store_addr, new_val, tmp);
#ifdef _LP64
@@ -4626,33 +4625,8 @@ void MacroAssembler::g1_write_barrier_post(Register store_addr, Register new_val
srl(tmp, HeapRegion::LogOfHRGrainBytes, tmp);
#endif
- if (G1PrintCTFilterStats) {
- guarantee(tmp->is_global(), "Or stats won't work...");
- // This is a sleazy hack: I'm temporarily hijacking G2, which I
- // promise to restore.
- mov(new_val, G2);
- save_frame(0);
- mov(tmp, O0);
- mov(G2, O1);
- // Save G-regs that target may use.
- mov(G1, L1);
- mov(G2, L2);
- mov(G3, L3);
- mov(G4, L4);
- mov(G5, L5);
- call(CAST_FROM_FN_PTR(address, &count_ct_writes));
- delayed()->nop();
- mov(O0, G2);
- // Restore G-regs that target may have used.
- mov(L1, G1);
- mov(L3, G3);
- mov(L4, G4);
- mov(L5, G5);
- restore(G0, G0, G0);
- }
- // XXX Should I predict this taken or not? Does it mattern?
- br_on_reg_cond(rc_z, /*annul*/false, Assembler::pt, tmp, filtered);
- delayed()->nop();
+ // XXX Should I predict this taken or not? Does it matter?
+ cmp_and_brx_short(tmp, G0, Assembler::equal, Assembler::pt, filtered);
}
// If the "store_addr" register is an "in" or "local" register, move it to
@@ -4677,7 +4651,6 @@ void MacroAssembler::g1_write_barrier_post(Register store_addr, Register new_val
restore();
bind(filtered);
-
}
#endif // SERIALGC
@@ -4903,7 +4876,7 @@ void MacroAssembler::char_arrays_equals(Register ary1, Register ary2,
delayed()->mov(G0, result); // not equal
// only one char ?
- br_on_reg_cond(rc_z, true, Assembler::pn, limit, Ldone);
+ cmp_zero_and_br(zero, limit, Ldone, true, Assembler::pn);
delayed()->add(G0, 1, result); // zero-length arrays are equal
// word by word compare, dont't need alignment check
@@ -4927,3 +4900,64 @@ void MacroAssembler::char_arrays_equals(Register ary1, Register ary2,
// Caller should set it:
// add(G0, 1, result); // equals
}
+
+// Use BIS for zeroing (count is in bytes).
+void MacroAssembler::bis_zeroing(Register to, Register count, Register temp, Label& Ldone) {
+ assert(UseBlockZeroing && VM_Version::has_block_zeroing(), "only works with BIS zeroing");
+ Register end = count;
+ int cache_line_size = VM_Version::prefetch_data_size();
+ // Minimum count when BIS zeroing can be used since
+ // it needs membar which is expensive.
+ int block_zero_size = MAX2(cache_line_size*3, (int)BlockZeroingLowLimit);
+
+ Label small_loop;
+ // Check if count is negative (dead code) or zero.
+ // Note, count uses 64bit in 64 bit VM.
+ cmp_and_brx_short(count, 0, Assembler::lessEqual, Assembler::pn, Ldone);
+
+ // Use BIS zeroing only for big arrays since it requires membar.
+ if (Assembler::is_simm13(block_zero_size)) { // < 4096
+ cmp(count, block_zero_size);
+ } else {
+ set(block_zero_size, temp);
+ cmp(count, temp);
+ }
+ br(Assembler::lessUnsigned, false, Assembler::pt, small_loop);
+ delayed()->add(to, count, end);
+
+ // Note: size is >= three (32 bytes) cache lines.
+
+ // Clean the beginning of space up to next cache line.
+ for (int offs = 0; offs < cache_line_size; offs += 8) {
+ stx(G0, to, offs);
+ }
+
+ // align to next cache line
+ add(to, cache_line_size, to);
+ and3(to, -cache_line_size, to);
+
+ // Note: size left >= two (32 bytes) cache lines.
+
+ // BIS should not be used to zero tail (64 bytes)
+ // to avoid zeroing a header of the following object.
+ sub(end, (cache_line_size*2)-8, end);
+
+ Label bis_loop;
+ bind(bis_loop);
+ stxa(G0, to, G0, Assembler::ASI_ST_BLKINIT_PRIMARY);
+ add(to, cache_line_size, to);
+ cmp_and_brx_short(to, end, Assembler::lessUnsigned, Assembler::pt, bis_loop);
+
+ // BIS needs membar.
+ membar(Assembler::StoreLoad);
+
+ add(end, (cache_line_size*2)-8, end); // restore end
+ cmp_and_brx_short(to, end, Assembler::greaterEqualUnsigned, Assembler::pn, Ldone);
+
+ // Clean the tail.
+ bind(small_loop);
+ stx(G0, to, 0);
+ add(to, 8, to);
+ cmp_and_brx_short(to, end, Assembler::lessUnsigned, Assembler::pt, small_loop);
+ nop(); // Separate short branches
+}
diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp b/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp
index 30cff57..14a6b62 100644
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.hpp
@@ -761,7 +761,7 @@ class Assembler : public AbstractAssembler {
mwtos_opf = 0x119
};
- enum RCondition { rc_z = 1, rc_lez = 2, rc_lz = 3, rc_nz = 5, rc_gz = 6, rc_gez = 7 };
+ enum RCondition { rc_z = 1, rc_lez = 2, rc_lz = 3, rc_nz = 5, rc_gz = 6, rc_gez = 7, rc_last = rc_gez };
enum Condition {
// for FBfcc & FBPfcc instruction
@@ -866,9 +866,18 @@ class Assembler : public AbstractAssembler {
return is_simm(d, nbits + 2);
}
+ address target_distance(Label& L) {
+ // Assembler::target(L) should be called only when
+ // a branch instruction is emitted since non-bound
+ // labels record current pc() as a branch address.
+ if (L.is_bound()) return target(L);
+ // Return current address for non-bound labels.
+ return pc();
+ }
+
// test if label is in simm16 range in words (wdisp16).
bool is_in_wdisp16_range(Label& L) {
- return is_in_wdisp_range(target(L), pc(), 16);
+ return is_in_wdisp_range(target_distance(L), pc(), 16);
}
// test if the distance between two addresses fits in simm30 range in words
static bool is_in_wdisp30_range(address a, address b) {
@@ -876,8 +885,13 @@ class Assembler : public AbstractAssembler {
}
enum ASIs { // page 72, v9
- ASI_PRIMARY = 0x80,
- ASI_PRIMARY_LITTLE = 0x88
+ ASI_PRIMARY = 0x80,
+ ASI_PRIMARY_NOFAULT = 0x82,
+ ASI_PRIMARY_LITTLE = 0x88,
+ // Block initializing store
+ ASI_ST_BLKINIT_PRIMARY = 0xE2,
+ // Most-Recently-Used (MRU) BIS variant
+ ASI_ST_BLKINIT_MRU_PRIMARY = 0xF2
// add more from book as needed
};
@@ -975,6 +989,20 @@ class Assembler : public AbstractAssembler {
static int sx( int i) { return u_field(i, 12, 12); } // shift x=1 means 64-bit
static int opf( int x) { return u_field(x, 13, 5); }
+ static bool is_cbcond( int x ) {
+ return (VM_Version::has_cbcond() && (inv_cond(x) > rc_last) &&
+ inv_op(x) == branch_op && inv_op2(x) == bpr_op2);
+ }
+ static bool is_cxb( int x ) {
+ assert(is_cbcond(x), "wrong instruction");
+ return (x & (1<<21)) != 0;
+ }
+ static int cond_cbcond( int x) { return u_field((((x & 8)<<1) + 8 + (x & 7)), 29, 25); }
+ static int inv_cond_cbcond(int x) {
+ assert(is_cbcond(x), "wrong instruction");
+ return inv_u_field(x, 27, 25) | (inv_u_field(x, 29, 29)<<3);
+ }
+
static int opf_cc( CC c, bool useFloat ) { return u_field((useFloat ? 0 : 4) + c, 13, 11); }
static int mov_cc( CC c, bool useFloat ) { return u_field(useFloat ? 0 : 1, 18, 18) | u_field(c, 12, 11); }
@@ -1026,6 +1054,26 @@ class Assembler : public AbstractAssembler {
return r;
}
+ // compute inverse of wdisp10
+ static intptr_t inv_wdisp10(int x, intptr_t pos) {
+ assert(is_cbcond(x), "wrong instruction");
+ int lo = inv_u_field(x, 12, 5);
+ int hi = (x >> 19) & 3;
+ if (hi >= 2) hi |= ~1;
+ return (((hi << 8) | lo) << 2) + pos;
+ }
+
+ // word offset for cbcond, 8 bits at [B12,B5], 2 bits at [B20,B19]
+ static int wdisp10(intptr_t x, intptr_t off) {
+ assert(VM_Version::has_cbcond(), "This CPU does not have CBCOND instruction");
+ intptr_t xx = x - off;
+ assert_signed_word_disp_range(xx, 10);
+ int r = ( ( (xx >> 2 ) & ((1 << 8) - 1) ) << 5 )
+ | ( ( (xx >> (2+8)) & 3 ) << 19 );
+ // Have to fake cbcond instruction to pass assert in inv_wdisp10()
+ assert(inv_wdisp10((r | op(branch_op) | cond_cbcond(rc_last+1) | op2(bpr_op2)), off) == x, "inverse is not inverse");
+ return r;
+ }
// word displacement in low-order nbits bits
@@ -1138,7 +1186,26 @@ class Assembler : public AbstractAssembler {
#endif
}
+ // cbcond instruction should not be generated one after an other
+ bool cbcond_before() {
+ if (offset() == 0) return false; // it is first instruction
+ int x = *(int*)(intptr_t(pc()) - 4); // previous instruction
+ return is_cbcond(x);
+ }
+
+ void no_cbcond_before() {
+ assert(offset() == 0 || !cbcond_before(), "cbcond should not follow an other cbcond");
+ }
+
public:
+
+ bool use_cbcond(Label& L) {
+ if (!UseCBCond || cbcond_before()) return false;
+ intptr_t x = intptr_t(target_distance(L)) - intptr_t(pc());
+ assert( (x & 3) == 0, "not word aligned");
+ return is_simm(x, 12);
+ }
+
// Tells assembler you know that next instruction is delayed
Assembler* delayed() {
#ifdef CHECK_DELAY
@@ -1181,10 +1248,15 @@ public:
void addccc( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(addc_op3 | cc_bit_op3) | rs1(s1) | rs2(s2) ); }
void addccc( Register s1, int simm13a, Register d ) { emit_long( op(arith_op) | rd(d) | op3(addc_op3 | cc_bit_op3) | rs1(s1) | immed(true) | simm(simm13a, 13) ); }
+
// pp 136
- inline void bpr( RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt = relocInfo::none );
- inline void bpr( RCondition c, bool a, Predict p, Register s1, Label& L);
+ inline void bpr(RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt = relocInfo::none);
+ inline void bpr(RCondition c, bool a, Predict p, Register s1, Label& L);
+
+ // compare and branch
+ inline void cbcond(Condition c, CC cc, Register s1, Register s2, Label& L);
+ inline void cbcond(Condition c, CC cc, Register s1, int simm5, Label& L);
protected: // use MacroAssembler::br instead
@@ -1198,8 +1270,6 @@ public:
inline void fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
inline void fbp( Condition c, bool a, CC cc, Predict p, Label& L );
- public:
-
// pp 144
inline void br( Condition c, bool a, address d, relocInfo::relocType rt = relocInfo::none );
@@ -1220,6 +1290,8 @@ public:
inline void call( address d, relocInfo::relocType rt = relocInfo::runtime_call_type );
inline void call( Label& L, relocInfo::relocType rt = relocInfo::runtime_call_type );
+ public:
+
// pp 150
// These instructions compare the contents of s2 with the contents of
@@ -1715,9 +1787,12 @@ public:
rs1(s) |
op3(wrreg_op3) |
u_field(2, 29, 25) |
- u_field(1, 13, 13) |
+ immed(true) |
simm(simm13a, 13)); }
- inline void wrasi( Register d) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(3, 29, 25)); }
+ inline void wrasi(Register d) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(3, 29, 25)); }
+ // wrasi(d, imm) stores (d xor imm) to asi
+ inline void wrasi(Register d, int simm13a) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) |
+ u_field(3, 29, 25) | immed(true) | simm(simm13a, 13)); }
inline void wrfprs( Register d) { v9_only(); emit_long( op(arith_op) | rs1(d) | op3(wrreg_op3) | u_field(6, 29, 25)); }
@@ -1862,18 +1937,32 @@ class MacroAssembler: public Assembler {
inline void fb( Condition c, bool a, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
inline void fb( Condition c, bool a, Predict p, Label& L );
- // compares register with zero and branches (V9 and V8 instructions)
- void br_zero( Condition c, bool a, Predict p, Register s1, Label& L);
+ // compares register with zero (32 bit) and branches (V9 and V8 instructions)
+ void cmp_zero_and_br( Condition c, Register s1, Label& L, bool a = false, Predict p = pn );
// Compares a pointer register with zero and branches on (not)null.
// Does a test & branch on 32-bit systems and a register-branch on 64-bit.
void br_null ( Register s1, bool a, Predict p, Label& L );
void br_notnull( Register s1, bool a, Predict p, Label& L );
- // These versions will do the most efficient thing on v8 and v9. Perhaps
- // this is what the routine above was meant to do, but it didn't (and
- // didn't cover both target address kinds.)
- void br_on_reg_cond( RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt = relocInfo::none );
- void br_on_reg_cond( RCondition c, bool a, Predict p, Register s1, Label& L);
+ //
+ // Compare registers and branch with nop in delay slot or cbcond without delay slot.
+ //
+ // ATTENTION: use these instructions with caution because cbcond instruction
+ // has very short distance: 512 instructions (2Kbyte).
+
+ // Compare integer (32 bit) values (icc only).
+ void cmp_and_br_short(Register s1, Register s2, Condition c, Predict p, Label& L);
+ void cmp_and_br_short(Register s1, int simm13a, Condition c, Predict p, Label& L);
+ // Platform depending version for pointer compare (icc on !LP64 and xcc on LP64).
+ void cmp_and_brx_short(Register s1, Register s2, Condition c, Predict p, Label& L);
+ void cmp_and_brx_short(Register s1, int simm13a, Condition c, Predict p, Label& L);
+
+ // Short branch version for compares a pointer pwith zero.
+ void br_null_short ( Register s1, Predict p, Label& L );
+ void br_notnull_short( Register s1, Predict p, Label& L );
+
+ // unconditional short branch
+ void ba_short(Label& L);
inline void bp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
inline void bp( Condition c, bool a, CC cc, Predict p, Label& L );
@@ -1882,8 +1971,8 @@ class MacroAssembler: public Assembler {
inline void brx( Condition c, bool a, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
inline void brx( Condition c, bool a, Predict p, Label& L );
- // unconditional short branch
- inline void ba( bool a, Label& L );
+ // unconditional branch
+ inline void ba( Label& L );
// Branch that tests fp condition codes
inline void fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt = relocInfo::none );
@@ -2167,7 +2256,6 @@ public:
inline void stbool(Register d, const Address& a) { stb(d, a); }
inline void ldbool(const Address& a, Register d) { ldsb(a, d); }
- inline void tstbool( Register s ) { tst(s); }
inline void movbool( bool boolconst, Register d) { mov( (int) boolconst, d); }
// klass oop manipulations if compressed
@@ -2469,8 +2557,7 @@ public:
Label* L_success,
Label* L_failure,
Label* L_slow_path,
- RegisterOrConstant super_check_offset = RegisterOrConstant(-1),
- Register instanceof_hack = noreg);
+ RegisterOrConstant super_check_offset = RegisterOrConstant(-1));
// The rest of the type check; must be wired to a corresponding fast path.
// It does not repeat the fast path logic, so don't use it standalone.
@@ -2542,6 +2629,8 @@ public:
void char_arrays_equals(Register ary1, Register ary2,
Register limit, Register result,
Register chr1, Register chr2, Label& Ldone);
+ // Use BIS for zeroing
+ void bis_zeroing(Register to, Register count, Register temp, Label& Ldone);
#undef VIRTUAL
diff --git a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
index 164152a..bbacbe9 100644
--- a/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
+++ b/hotspot/src/cpu/sparc/vm/assembler_sparc.inline.hpp
@@ -80,32 +80,36 @@ inline void Assembler::add(Register s1, Register s2, Register d )
inline void Assembler::add(Register s1, int simm13a, Register d, relocInfo::relocType rtype ) { emit_data( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rtype ); }
inline void Assembler::add(Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { emit_data( op(arith_op) | rd(d) | op3(add_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec ); }
-inline void Assembler::bpr( RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt ) { v9_only(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(bpr_op2) | wdisp16(intptr_t(d), intptr_t(pc())) | predict(p) | rs1(s1), rt); has_delay_slot(); }
+inline void Assembler::bpr( RCondition c, bool a, Predict p, Register s1, address d, relocInfo::relocType rt ) { v9_only(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(bpr_op2) | wdisp16(intptr_t(d), intptr_t(pc())) | predict(p) | rs1(s1), rt); has_delay_slot(); }
inline void Assembler::bpr( RCondition c, bool a, Predict p, Register s1, Label& L) { bpr( c, a, p, s1, target(L)); }
-inline void Assembler::fb( Condition c, bool a, address d, relocInfo::relocType rt ) { v9_dep(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(fb_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt); has_delay_slot(); }
+inline void Assembler::fb( Condition c, bool a, address d, relocInfo::relocType rt ) { v9_dep(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(fb_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt); has_delay_slot(); }
inline void Assembler::fb( Condition c, bool a, Label& L ) { fb(c, a, target(L)); }
-inline void Assembler::fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt ) { v9_only(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(fbp_op2) | branchcc(cc) | predict(p) | wdisp(intptr_t(d), intptr_t(pc()), 19), rt); has_delay_slot(); }
+inline void Assembler::fbp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt ) { v9_only(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(fbp_op2) | branchcc(cc) | predict(p) | wdisp(intptr_t(d), intptr_t(pc()), 19), rt); has_delay_slot(); }
inline void Assembler::fbp( Condition c, bool a, CC cc, Predict p, Label& L ) { fbp(c, a, cc, p, target(L)); }
-inline void Assembler::cb( Condition c, bool a, address d, relocInfo::relocType rt ) { v8_only(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(cb_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt); has_delay_slot(); }
+inline void Assembler::cb( Condition c, bool a, address d, relocInfo::relocType rt ) { v8_only(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(cb_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt); has_delay_slot(); }
inline void Assembler::cb( Condition c, bool a, Label& L ) { cb(c, a, target(L)); }
-inline void Assembler::br( Condition c, bool a, address d, relocInfo::relocType rt ) { v9_dep(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(br_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt); has_delay_slot(); }
+inline void Assembler::br( Condition c, bool a, address d, relocInfo::relocType rt ) { v9_dep(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(br_op2) | wdisp(intptr_t(d), intptr_t(pc()), 22), rt); has_delay_slot(); }
inline void Assembler::br( Condition c, bool a, Label& L ) { br(c, a, target(L)); }
-inline void Assembler::bp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt ) { v9_only(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(bp_op2) | branchcc(cc) | predict(p) | wdisp(intptr_t(d), intptr_t(pc()), 19), rt); has_delay_slot(); }
+inline void Assembler::bp( Condition c, bool a, CC cc, Predict p, address d, relocInfo::relocType rt ) { v9_only(); cti(); emit_data( op(branch_op) | annul(a) | cond(c) | op2(bp_op2) | branchcc(cc) | predict(p) | wdisp(intptr_t(d), intptr_t(pc()), 19), rt); has_delay_slot(); }
inline void Assembler::bp( Condition c, bool a, CC cc, Predict p, Label& L ) { bp(c, a, cc, p, target(L)); }
-inline void Assembler::call( address d, relocInfo::relocType rt ) { emit_data( op(call_op) | wdisp(intptr_t(d), intptr_t(pc()), 30), rt); has_delay_slot(); assert(rt != relocInfo::virtual_call_type, "must use virtual_call_Relocation::spec"); }
+// compare and branch
+inline void Assembler::cbcond(Condition c, CC cc, Register s1, Register s2, Label& L) { cti(); no_cbcond_before(); emit_data(op(branch_op) | cond_cbcond(c) | op2(bpr_op2) | branchcc(cc) | wdisp10(intptr_t(target(L)), intptr_t(pc())) | rs1(s1) | rs2(s2)); }
+inline void Assembler::cbcond(Condition c, CC cc, Register s1, int simm5, Label& L) { cti(); no_cbcond_before(); emit_data(op(branch_op) | cond_cbcond(c) | op2(bpr_op2) | branchcc(cc) | wdisp10(intptr_t(target(L)), intptr_t(pc())) | rs1(s1) | immed(true) | simm(simm5, 5)); }
+
+inline void Assembler::call( address d, relocInfo::relocType rt ) { cti(); emit_data( op(call_op) | wdisp(intptr_t(d), intptr_t(pc()), 30), rt); has_delay_slot(); assert(rt != relocInfo::virtual_call_type, "must use virtual_call_Relocation::spec"); }
inline void Assembler::call( Label& L, relocInfo::relocType rt ) { call( target(L), rt); }
inline void Assembler::flush( Register s1, Register s2) { emit_long( op(arith_op) | op3(flush_op3) | rs1(s1) | rs2(s2)); }
inline void Assembler::flush( Register s1, int simm13a) { emit_data( op(arith_op) | op3(flush_op3) | rs1(s1) | immed(true) | simm(simm13a, 13)); }
-inline void Assembler::jmpl( Register s1, Register s2, Register d ) { emit_long( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
-inline void Assembler::jmpl( Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { emit_data( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); has_delay_slot(); }
+inline void Assembler::jmpl( Register s1, Register s2, Register d ) { cti(); emit_long( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
+inline void Assembler::jmpl( Register s1, int simm13a, Register d, RelocationHolder const& rspec ) { cti(); emit_data( op(arith_op) | rd(d) | op3(jmpl_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rspec); has_delay_slot(); }
inline void Assembler::ldf(FloatRegisterImpl::Width w, Register s1, RegisterOrConstant s2, FloatRegister d) {
if (s2.is_register()) ldf(w, s1, s2.as_register(), d);
@@ -240,8 +244,8 @@ inline void Assembler::prefetch(Register s1, int simm13a, PrefetchFcn f) { v9_on
inline void Assembler::prefetch(const Address& a, PrefetchFcn f, int offset) { v9_only(); relocate(a.rspec(offset)); prefetch(a.base(), a.disp() + offset, f); }
-inline void Assembler::rett( Register s1, Register s2 ) { emit_long( op(arith_op) | op3(rett_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
-inline void Assembler::rett( Register s1, int simm13a, relocInfo::relocType rt) { emit_data( op(arith_op) | op3(rett_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rt); has_delay_slot(); }
+inline void Assembler::rett( Register s1, Register s2 ) { cti(); emit_long( op(arith_op) | op3(rett_op3) | rs1(s1) | rs2(s2)); has_delay_slot(); }
+inline void Assembler::rett( Register s1, int simm13a, relocInfo::relocType rt) { cti(); emit_data( op(arith_op) | op3(rett_op3) | rs1(s1) | immed(true) | simm(simm13a, 13), rt); has_delay_slot(); }
inline void Assembler::sethi( int imm22a, Register d, RelocationHolder const& rspec ) { emit_data( op(branch_op) | rd(d) | op2(sethi_op2) | hi22(imm22a), rspec); }
@@ -557,8 +561,8 @@ inline void MacroAssembler::brx( Condition c, bool a, Predict p, Label& L ) {
brx(c, a, p, target(L));
}
-inline void MacroAssembler::ba( bool a, Label& L ) {
- br(always, a, pt, L);
+inline void MacroAssembler::ba( Label& L ) {
+ br(always, false, pt, L);
}
// Warning: V9 only functions
diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
index 73d808a..e155153 100644
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
@@ -303,9 +303,7 @@ void PatchingStub::emit_code(LIR_Assembler* ce) {
assert(_oop_index >= 0, "must have oop index");
__ load_heap_oop(_obj, java_lang_Class::klass_offset_in_bytes(), G3);
__ ld_ptr(G3, instanceKlass::init_thread_offset_in_bytes() + sizeof(klassOopDesc), G3);
- __ cmp(G2_thread, G3);
- __ br(Assembler::notEqual, false, Assembler::pn, call_patch);
- __ delayed()->nop();
+ __ cmp_and_brx_short(G2_thread, G3, Assembler::notEqual, Assembler::pn, call_patch);
// load_klass patches may execute the patched code before it's
// copied back into place so we need to jump back into the main
@@ -423,8 +421,7 @@ void G1PreBarrierStub::emit_code(LIR_Assembler* ce) {
}
if (__ is_in_wdisp16_range(_continuation)) {
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
- pre_val_reg, _continuation);
+ __ br_null(pre_val_reg, /*annul*/false, Assembler::pt, _continuation);
} else {
__ cmp(pre_val_reg, G0);
__ brx(Assembler::equal, false, Assembler::pn, _continuation);
@@ -460,8 +457,7 @@ void G1UnsafeGetObjSATBBarrierStub::emit_code(LIR_Assembler* ce) {
// The original src operand was not a constant.
// Generate src == null?
if (__ is_in_wdisp16_range(_continuation)) {
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
- src_reg, _continuation);
+ __ br_null(src_reg, /*annul*/false, Assembler::pt, _continuation);
} else {
__ cmp(src_reg, G0);
__ brx(Assembler::equal, false, Assembler::pt, _continuation);
@@ -478,13 +474,9 @@ void G1UnsafeGetObjSATBBarrierStub::emit_code(LIR_Assembler* ce) {
Address ref_type_adr(tmp_reg, instanceKlass::reference_type_offset_in_bytes() + sizeof(oopDesc));
__ ld(ref_type_adr, tmp_reg);
- if (__ is_in_wdisp16_range(_continuation)) {
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
- tmp_reg, _continuation);
- } else {
- __ cmp(tmp_reg, G0);
- __ brx(Assembler::equal, false, Assembler::pt, _continuation);
- }
+ // _reference_type field is of type ReferenceType (enum)
+ assert(REF_NONE == 0, "check this code");
+ __ cmp_zero_and_br(Assembler::equal, tmp_reg, _continuation, /*annul*/false, Assembler::pt);
__ delayed()->nop();
// Is marking active?
@@ -500,13 +492,8 @@ void G1UnsafeGetObjSATBBarrierStub::emit_code(LIR_Assembler* ce) {
assert(in_bytes(PtrQueue::byte_width_of_active()) == 1, "Assumption");
__ ldsb(in_progress, tmp_reg);
}
- if (__ is_in_wdisp16_range(_continuation)) {
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
- tmp_reg, _continuation);
- } else {
- __ cmp(tmp_reg, G0);
- __ brx(Assembler::equal, false, Assembler::pt, _continuation);
- }
+
+ __ cmp_zero_and_br(Assembler::equal, tmp_reg, _continuation, /*annul*/false, Assembler::pt);
__ delayed()->nop();
// val == null?
@@ -514,8 +501,7 @@ void G1UnsafeGetObjSATBBarrierStub::emit_code(LIR_Assembler* ce) {
Register val_reg = val()->as_register();
if (__ is_in_wdisp16_range(_continuation)) {
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
- val_reg, _continuation);
+ __ br_null(val_reg, /*annul*/false, Assembler::pt, _continuation);
} else {
__ cmp(val_reg, G0);
__ brx(Assembler::equal, false, Assembler::pt, _continuation);
@@ -544,9 +530,9 @@ void G1PostBarrierStub::emit_code(LIR_Assembler* ce) {
assert(new_val()->is_register(), "Precondition.");
Register addr_reg = addr()->as_pointer_register();
Register new_val_reg = new_val()->as_register();
+
if (__ is_in_wdisp16_range(_continuation)) {
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pt,
- new_val_reg, _continuation);
+ __ br_null(new_val_reg, /*annul*/false, Assembler::pt, _continuation);
} else {
__ cmp(new_val_reg, G0);
__ brx(Assembler::equal, false, Assembler::pn, _continuation);
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
index b450437..7a8b555 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp
@@ -142,11 +142,6 @@ LIR_Opr LIR_Assembler::receiverOpr() {
}
-LIR_Opr LIR_Assembler::incomingReceiverOpr() {
- return FrameMap::I0_oop_opr;
-}
-
-
LIR_Opr LIR_Assembler::osrBufferPointer() {
return FrameMap::I0_opr;
}
@@ -217,9 +212,7 @@ void LIR_Assembler::osr_entry() {
{
Label L;
__ ld_ptr(OSR_buf, slot_offset + 1*BytesPerWord, O7);
- __ cmp(G0, O7);
- __ br(Assembler::notEqual, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ cmp_and_br_short(O7, G0, Assembler::notEqual, Assembler::pt, L);
__ stop("locked object is NULL");
__ bind(L);
}
@@ -2096,10 +2089,10 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
__ xor3(O0, -1, tmp);
__ sub(length, tmp, length);
__ add(src_pos, tmp, src_pos);
- __ br_zero(Assembler::less, false, Assembler::pn, O0, *stub->entry());
+ __ cmp_zero_and_br(Assembler::less, O0, *stub->entry());
__ delayed()->add(dst_pos, tmp, dst_pos);
} else {
- __ br_zero(Assembler::less, false, Assembler::pn, O0, *stub->entry());
+ __ cmp_zero_and_br(Assembler::less, O0, *stub->entry());
__ delayed()->nop();
}
__ bind(*stub->continuation());
@@ -2123,22 +2116,19 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
if (flags & LIR_OpArrayCopy::src_pos_positive_check) {
// test src_pos register
- __ tst(src_pos);
- __ br(Assembler::less, false, Assembler::pn, *stub->entry());
+ __ cmp_zero_and_br(Assembler::less, src_pos, *stub->entry());
__ delayed()->nop();
}
if (flags & LIR_OpArrayCopy::dst_pos_positive_check) {
// test dst_pos register
- __ tst(dst_pos);
- __ br(Assembler::less, false, Assembler::pn, *stub->entry());
+ __ cmp_zero_and_br(Assembler::less, dst_pos, *stub->entry());
__ delayed()->nop();
}
if (flags & LIR_OpArrayCopy::length_positive_check) {
// make sure length isn't negative
- __ tst(length);
- __ br(Assembler::less, false, Assembler::pn, *stub->entry());
+ __ cmp_zero_and_br(Assembler::less, length, *stub->entry());
__ delayed()->nop();
}
@@ -2261,8 +2251,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
#ifndef PRODUCT
if (PrintC1Statistics) {
Label failed;
- __ br_notnull(O0, false, Assembler::pn, failed);
- __ delayed()->nop();
+ __ br_notnull_short(O0, Assembler::pn, failed);
__ inc_counter((address)&Runtime1::_arraycopy_checkcast_cnt, G1, G3);
__ bind(failed);
}
@@ -2314,9 +2303,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
__ br(Assembler::notEqual, false, Assembler::pn, halt);
// load the raw value of the src klass.
__ delayed()->lduw(src, oopDesc::klass_offset_in_bytes(), tmp2);
- __ cmp(tmp, tmp2);
- __ br(Assembler::equal, false, Assembler::pn, known_ok);
- __ delayed()->nop();
+ __ cmp_and_br_short(tmp, tmp2, Assembler::equal, Assembler::pn, known_ok);
} else {
__ cmp(tmp, tmp2);
__ br(Assembler::equal, false, Assembler::pn, known_ok);
@@ -2330,9 +2317,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
__ cmp(tmp, tmp2);
__ brx(Assembler::notEqual, false, Assembler::pn, halt);
__ delayed()->ld_ptr(src, oopDesc::klass_offset_in_bytes(), tmp2);
- __ cmp(tmp, tmp2);
- __ brx(Assembler::equal, false, Assembler::pn, known_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(tmp, tmp2, Assembler::equal, Assembler::pn, known_ok);
} else {
__ cmp(tmp, tmp2);
__ brx(Assembler::equal, false, Assembler::pn, known_ok);
@@ -2530,15 +2515,13 @@ void LIR_Assembler::type_profile_helper(Register mdo, int mdo_offset_bias,
mdo_offset_bias);
__ ld_ptr(receiver_addr, tmp1);
__ verify_oop(tmp1);
- __ cmp(recv, tmp1);
- __ brx(Assembler::notEqual, false, Assembler::pt, next_test);
- __ delayed()->nop();
+ __ cmp_and_brx_short(recv, tmp1, Assembler::notEqual, Assembler::pt, next_test);
Address data_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)) -
mdo_offset_bias);
__ ld_ptr(data_addr, tmp1);
__ add(tmp1, DataLayout::counter_increment, tmp1);
__ st_ptr(tmp1, data_addr);
- __ ba(false, *update_done);
+ __ ba(*update_done);
__ delayed()->nop();
__ bind(next_test);
}
@@ -2549,13 +2532,12 @@ void LIR_Assembler::type_profile_helper(Register mdo, int mdo_offset_bias,
Address recv_addr(mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_offset(i)) -
mdo_offset_bias);
__ ld_ptr(recv_addr, tmp1);
- __ br_notnull(tmp1, false, Assembler::pt, next_test);
- __ delayed()->nop();
+ __ br_notnull_short(tmp1, Assembler::pt, next_test);
__ st_ptr(recv, recv_addr);
__ set(DataLayout::counter_increment, tmp1);
__ st_ptr(tmp1, mdo, md->byte_offset_of_slot(data, ReceiverTypeData::receiver_count_offset(i)) -
mdo_offset_bias);
- __ ba(false, *update_done);
+ __ ba(*update_done);
__ delayed()->nop();
__ bind(next_test);
}
@@ -2601,8 +2583,7 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
setup_md_access(method, op->profiled_bci(), md, data, mdo_offset_bias);
Label not_null;
- __ br_notnull(obj, false, Assembler::pn, not_null);
- __ delayed()->nop();
+ __ br_notnull_short(obj, Assembler::pn, not_null);
Register mdo = k_RInfo;
Register data_val = Rtmp1;
jobject2reg(md->constant_encoding(), mdo);
@@ -2614,7 +2595,7 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
__ ldub(flags_addr, data_val);
__ or3(data_val, BitData::null_seen_byte_constant(), data_val);
__ stb(data_val, flags_addr);
- __ ba(false, *obj_is_null);
+ __ ba(*obj_is_null);
__ delayed()->nop();
__ bind(not_null);
} else {
@@ -2682,7 +2663,7 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
__ load_klass(obj, recv);
type_profile_helper(mdo, mdo_offset_bias, md, data, recv, tmp1, success);
// Jump over the failure case
- __ ba(false, *success);
+ __ ba(*success);
__ delayed()->nop();
// Cast failure case
__ bind(profile_cast_failure);
@@ -2695,10 +2676,10 @@ void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, L
__ ld_ptr(data_addr, tmp1);
__ sub(tmp1, DataLayout::counter_increment, tmp1);
__ st_ptr(tmp1, data_addr);
- __ ba(false, *failure);
+ __ ba(*failure);
__ delayed()->nop();
}
- __ ba(false, *success);
+ __ ba(*success);
__ delayed()->nop();
}
@@ -2728,8 +2709,7 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
if (op->should_profile()) {
Label not_null;
- __ br_notnull(value, false, Assembler::pn, not_null);
- __ delayed()->nop();
+ __ br_notnull_short(value, Assembler::pn, not_null);
Register mdo = k_RInfo;
Register data_val = Rtmp1;
jobject2reg(md->constant_encoding(), mdo);
@@ -2741,12 +2721,10 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
__ ldub(flags_addr, data_val);
__ or3(data_val, BitData::null_seen_byte_constant(), data_val);
__ stb(data_val, flags_addr);
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
__ bind(not_null);
} else {
- __ br_null(value, false, Assembler::pn, done);
- __ delayed()->nop();
+ __ br_null_short(value, Assembler::pn, done);
}
add_debug_info_for_null_check_here(op->info_for_exception());
__ load_klass(array, k_RInfo);
@@ -2777,8 +2755,7 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
}
__ load_klass(value, recv);
type_profile_helper(mdo, mdo_offset_bias, md, data, recv, tmp1, &done);
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
// Cast failure case
__ bind(profile_cast_failure);
jobject2reg(md->constant_encoding(), mdo);
@@ -2790,7 +2767,7 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
__ ld_ptr(data_addr, tmp1);
__ sub(tmp1, DataLayout::counter_increment, tmp1);
__ st_ptr(tmp1, data_addr);
- __ ba(false, *stub->entry());
+ __ ba(*stub->entry());
__ delayed()->nop();
}
__ bind(done);
@@ -2808,8 +2785,7 @@ void LIR_Assembler::emit_opTypeCheck(LIR_OpTypeCheck* op) {
emit_typecheck_helper(op, &success, &failure, &failure);
__ bind(failure);
__ set(0, dst);
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
__ bind(success);
__ set(1, dst);
__ bind(done);
diff --git a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
index 7b60789..abf3ab9 100644
--- a/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp
@@ -328,7 +328,8 @@ void LIRGenerator::do_StoreIndexed(StoreIndexed* x) {
bool use_length = x->length() != NULL;
bool obj_store = x->elt_type() == T_ARRAY || x->elt_type() == T_OBJECT;
bool needs_store_check = obj_store && (x->value()->as_Constant() == NULL ||
- !get_jobject_constant(x->value())->is_null_object());
+ !get_jobject_constant(x->value())->is_null_object() ||
+ x->should_profile());
LIRItem array(x->array(), this);
LIRItem index(x->index(), this);
@@ -382,7 +383,7 @@ void LIRGenerator::do_StoreIndexed(StoreIndexed* x) {
LIR_Opr tmp3 = FrameMap::G5_opr;
CodeEmitInfo* store_check_info = new CodeEmitInfo(range_check_info);
- __ store_check(value.result(), array.result(), tmp1, tmp2, tmp3, store_check_info);
+ __ store_check(value.result(), array.result(), tmp1, tmp2, tmp3, store_check_info, x->profiled_method(), x->profiled_bci());
}
if (obj_store) {
diff --git a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
index 35e70e9..4372225 100644
--- a/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp
@@ -41,9 +41,7 @@ void C1_MacroAssembler::inline_cache_check(Register receiver, Register iCache) {
// Note: needs more testing of out-of-line vs. inline slow case
verify_oop(receiver);
load_klass(receiver, temp_reg);
- cmp(temp_reg, iCache);
- brx(Assembler::equal, true, Assembler::pt, L);
- delayed()->nop();
+ cmp_and_brx_short(temp_reg, iCache, Assembler::equal, Assembler::pt, L);
AddressLiteral ic_miss(SharedRuntime::get_ic_miss_stub());
jump_to(ic_miss, temp_reg);
delayed()->nop();
@@ -142,8 +140,7 @@ void C1_MacroAssembler::unlock_object(Register Rmark, Register Roop, Register Rb
}
// Test first it it is a fast recursive unlock
ld_ptr(Rbox, BasicLock::displaced_header_offset_in_bytes(), Rmark);
- br_null(Rmark, false, Assembler::pt, done);
- delayed()->nop();
+ br_null_short(Rmark, Assembler::pt, done);
if (!UseBiasedLocking) {
// load object
ld_ptr(Rbox, BasicObjectLock::obj_offset_in_bytes(), Roop);
@@ -231,7 +228,7 @@ void C1_MacroAssembler::allocate_object(
if (!is_simm13(obj_size * wordSize)) {
// would need to use extra register to load
// object size => go the slow case for now
- br(Assembler::always, false, Assembler::pt, slow_case);
+ ba(slow_case);
delayed()->nop();
return;
}
@@ -257,12 +254,10 @@ void C1_MacroAssembler::initialize_object(
Label ok;
ld(klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), t1);
if (var_size_in_bytes != noreg) {
- cmp(t1, var_size_in_bytes);
+ cmp_and_brx_short(t1, var_size_in_bytes, Assembler::equal, Assembler::pt, ok);
} else {
- cmp(t1, con_size_in_bytes);
+ cmp_and_brx_short(t1, con_size_in_bytes, Assembler::equal, Assembler::pt, ok);
}
- brx(Assembler::equal, false, Assembler::pt, ok);
- delayed()->nop();
stop("bad size in initialize_object");
should_not_reach_here();
@@ -387,8 +382,7 @@ void C1_MacroAssembler::verify_stack_oop(int stack_offset) {
void C1_MacroAssembler::verify_not_null_oop(Register r) {
Label not_null;
- br_notnull(r, false, Assembler::pt, not_null);
- delayed()->nop();
+ br_notnull_short(r, Assembler::pt, not_null);
stop("non-null oop required");
bind(not_null);
if (!VerifyOops) return;
diff --git a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
index 6256ae1..23bf235 100644
--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp
@@ -71,8 +71,7 @@ int StubAssembler::call_RT(Register oop_result1, Register oop_result2, address e
{ Label L;
Address exception_addr(G2_thread, Thread::pending_exception_offset());
ld_ptr(exception_addr, Gtemp);
- br_null(Gtemp, false, pt, L);
- delayed()->nop();
+ br_null_short(Gtemp, pt, L);
Address vm_result_addr(G2_thread, JavaThread::vm_result_offset());
st_ptr(G0, vm_result_addr);
Address vm_result_addr_2(G2_thread, JavaThread::vm_result_2_offset());
@@ -333,9 +332,7 @@ OopMapSet* Runtime1::generate_patching(StubAssembler* sasm, address target) {
assert(deopt_blob != NULL, "deoptimization blob must have been created");
Label no_deopt;
- __ tst(O0);
- __ brx(Assembler::equal, false, Assembler::pt, no_deopt);
- __ delayed()->nop();
+ __ br_null_short(O0, Assembler::pt, no_deopt);
// return to the deoptimization handler entry for unpacking and rexecute
// if we simply returned the we'd deopt as if any call we patched had just
@@ -402,18 +399,15 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
if (id == fast_new_instance_init_check_id) {
// make sure the klass is initialized
__ ld(G5_klass, instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc), G3_t1);
- __ cmp(G3_t1, instanceKlass::fully_initialized);
- __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_t1, instanceKlass::fully_initialized, Assembler::notEqual, Assembler::pn, slow_path);
}
#ifdef ASSERT
// assert object can be fast path allocated
{
Label ok, not_ok;
__ ld(G5_klass, Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc), G1_obj_size);
- __ cmp(G1_obj_size, 0); // make sure it's an instance (LH > 0)
- __ br(Assembler::lessEqual, false, Assembler::pn, not_ok);
- __ delayed()->nop();
+ // make sure it's an instance (LH > 0)
+ __ cmp_and_br_short(G1_obj_size, 0, Assembler::lessEqual, Assembler::pn, not_ok);
__ btst(Klass::_lh_instance_slow_path_bit, G1_obj_size);
__ br(Assembler::zero, false, Assembler::pn, ok);
__ delayed()->nop();
@@ -501,9 +495,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
int tag = ((id == new_type_array_id)
? Klass::_lh_array_tag_type_value
: Klass::_lh_array_tag_obj_value);
- __ cmp(G3_t1, tag);
- __ brx(Assembler::equal, false, Assembler::pt, ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(G3_t1, tag, Assembler::equal, Assembler::pt, ok);
__ stop("assert(is an array klass)");
__ should_not_reach_here();
__ bind(ok);
@@ -519,9 +511,7 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
// check that array length is small enough for fast path
__ set(C1_MacroAssembler::max_array_allocation_length, G3_t1);
- __ cmp(G4_length, G3_t1);
- __ br(Assembler::greaterUnsigned, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ __ cmp_and_br_short(G4_length, G3_t1, Assembler::greaterUnsigned, Assembler::pn, slow_path);
// if we got here then the TLAB allocation failed, so try
// refilling the TLAB or allocating directly from eden.
@@ -792,13 +782,6 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
}
break;
- case jvmti_exception_throw_id:
- { // Oexception : exception
- __ set_info("jvmti_exception_throw", dont_gc_arguments);
- oop_maps = generate_stub_call(sasm, noreg, CAST_FROM_FN_PTR(address, Runtime1::post_jvmti_exception_throw), I0);
- }
- break;
-
case dtrace_object_alloc_id:
{ // O0: object
__ set_info("dtrace_object_alloc", dont_gc_arguments);
@@ -844,14 +827,16 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
int satb_q_buf_byte_offset =
in_bytes(JavaThread::satb_mark_queue_offset() +
PtrQueue::byte_offset_of_buf());
+
__ bind(restart);
+ // Load the index into the SATB buffer. PtrQueue::_index is a
+ // size_t so ld_ptr is appropriate
__ ld_ptr(G2_thread, satb_q_index_byte_offset, tmp);
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false,
- Assembler::pn, tmp, refill);
+ // index == 0?
+ __ cmp_and_brx_short(tmp, G0, Assembler::equal, Assembler::pn, refill);
- // If the branch is taken, no harm in executing this in the delay slot.
- __ delayed()->ld_ptr(G2_thread, satb_q_buf_byte_offset, tmp2);
+ __ ld_ptr(G2_thread, satb_q_buf_byte_offset, tmp2);
__ sub(tmp, oopSize, tmp);
__ st_ptr(pre_val, tmp2, tmp); // [_buf + index] := <address_of_card>
@@ -911,11 +896,8 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
__ set(rs, cardtable); // cardtable := <card table base>
__ ldub(addr, cardtable, tmp); // tmp := [addr + cardtable]
- __ br_on_reg_cond(Assembler::rc_nz, /*annul*/false, Assembler::pt,
- tmp, not_already_dirty);
- // Get cardtable + tmp into a reg by itself -- useful in the take-the-branch
- // case, harmless if not.
- __ delayed()->add(addr, cardtable, tmp2);
+ assert(CardTableModRefBS::dirty_card_val() == 0, "otherwise check this code");
+ __ cmp_and_br_short(tmp, G0, Assembler::notEqual, Assembler::pt, not_already_dirty);
// We didn't take the branch, so we're already dirty: return.
// Use return-from-leaf
@@ -924,6 +906,10 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
// Not dirty.
__ bind(not_already_dirty);
+
+ // Get cardtable + tmp into a reg by itself
+ __ add(addr, cardtable, tmp2);
+
// First, dirty it.
__ stb(G0, tmp2, 0); // [cardPtr] := 0 (i.e., dirty).
@@ -939,13 +925,17 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
int dirty_card_q_buf_byte_offset =
in_bytes(JavaThread::dirty_card_queue_offset() +
PtrQueue::byte_offset_of_buf());
+
__ bind(restart);
+
+ // Get the index into the update buffer. PtrQueue::_index is
+ // a size_t so ld_ptr is appropriate here.
__ ld_ptr(G2_thread, dirty_card_q_index_byte_offset, tmp3);
- __ br_on_reg_cond(Assembler::rc_z, /*annul*/false, Assembler::pn,
- tmp3, refill);
- // If the branch is taken, no harm in executing this in the delay slot.
- __ delayed()->ld_ptr(G2_thread, dirty_card_q_buf_byte_offset, tmp4);
+ // index == 0?
+ __ cmp_and_brx_short(tmp3, G0, Assembler::equal, Assembler::pn, refill);
+
+ __ ld_ptr(G2_thread, dirty_card_q_buf_byte_offset, tmp4);
__ sub(tmp3, oopSize, tmp3);
__ st_ptr(tmp2, tmp4, tmp3); // [_buf + index] := <address_of_card>
diff --git a/hotspot/src/cpu/sparc/vm/copy_sparc.hpp b/hotspot/src/cpu/sparc/vm/copy_sparc.hpp
index 0267d25..176ed04 100644
--- a/hotspot/src/cpu/sparc/vm/copy_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/copy_sparc.hpp
@@ -156,9 +156,16 @@ static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
#endif // _LP64
}
+typedef void (*_zero_Fn)(HeapWord* to, size_t count);
+
static void pd_fill_to_aligned_words(HeapWord* tohw, size_t count, juint value) {
assert(MinObjAlignmentInBytes >= BytesPerLong, "need alternate implementation");
+ if (value == 0 && UseBlockZeroing &&
+ (count > (BlockZeroingLowLimit >> LogHeapWordSize))) {
+ // Call it only when block zeroing is used
+ ((_zero_Fn)StubRoutines::zero_aligned_words())(tohw, count);
+ } else {
julong* to = (julong*)tohw;
julong v = ((julong)value << 32) | value;
// If count is odd, odd will be equal to 1 on 32-bit platform
@@ -176,6 +183,7 @@ static void pd_fill_to_aligned_words(HeapWord* tohw, size_t count, juint value)
*((juint*)to) = value;
}
+ }
}
static void pd_fill_to_bytes(void* to, size_t count, jubyte value) {
diff --git a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
index 46d7d27..2c2a93f 100644
--- a/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/cppInterpreter_sparc.cpp
@@ -544,7 +544,7 @@ address InterpreterGenerator::generate_accessor_entry(void) {
// Generate regular method entry
__ bind(slow_path);
- __ ba(false, fast_accessor_slow_entry_path);
+ __ ba(fast_accessor_slow_entry_path);
__ delayed()->nop();
return entry;
}
@@ -719,8 +719,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
Address exception_addr(G2_thread, 0, in_bytes(Thread::pending_exception_offset()));
__ ld_ptr(exception_addr, G3_scratch);
- __ br_notnull(G3_scratch, false, Assembler::pn, pending_exception_present);
- __ delayed()->nop();
+ __ br_notnull_short(G3_scratch, Assembler::pn, pending_exception_present);
__ ld_ptr(Address(G5_method, 0, in_bytes(methodOopDesc::signature_handler_offset())), G3_scratch);
__ bind(L);
}
@@ -1292,7 +1291,7 @@ void CppInterpreterGenerator::generate_deopt_handling() {
deopt_frame_manager_return_atos = __ pc();
// O0/O1 live
- __ ba(false, return_from_deopt_common);
+ __ ba(return_from_deopt_common);
__ delayed()->set(AbstractInterpreter::BasicType_as_index(T_OBJECT), L3_scratch); // Result stub address array index
@@ -1300,14 +1299,14 @@ void CppInterpreterGenerator::generate_deopt_handling() {
deopt_frame_manager_return_btos = __ pc();
// O0/O1 live
- __ ba(false, return_from_deopt_common);
+ __ ba(return_from_deopt_common);
__ delayed()->set(AbstractInterpreter::BasicType_as_index(T_BOOLEAN), L3_scratch); // Result stub address array index
// deopt needs to jump to here to enter the interpreter (return a result)
deopt_frame_manager_return_itos = __ pc();
// O0/O1 live
- __ ba(false, return_from_deopt_common);
+ __ ba(return_from_deopt_common);
__ delayed()->set(AbstractInterpreter::BasicType_as_index(T_INT), L3_scratch); // Result stub address array index
// deopt needs to jump to here to enter the interpreter (return a result)
@@ -1327,21 +1326,21 @@ void CppInterpreterGenerator::generate_deopt_handling() {
__ srlx(G1,32,O0);
#endif /* !_LP64 && COMPILER2 */
// O0/O1 live
- __ ba(false, return_from_deopt_common);
+ __ ba(return_from_deopt_common);
__ delayed()->set(AbstractInterpreter::BasicType_as_index(T_LONG), L3_scratch); // Result stub address array index
// deopt needs to jump to here to enter the interpreter (return a result)
deopt_frame_manager_return_ftos = __ pc();
// O0/O1 live
- __ ba(false, return_from_deopt_common);
+ __ ba(return_from_deopt_common);
__ delayed()->set(AbstractInterpreter::BasicType_as_index(T_FLOAT), L3_scratch); // Result stub address array index
// deopt needs to jump to here to enter the interpreter (return a result)
deopt_frame_manager_return_dtos = __ pc();
// O0/O1 live
- __ ba(false, return_from_deopt_common);
+ __ ba(return_from_deopt_common);
__ delayed()->set(AbstractInterpreter::BasicType_as_index(T_DOUBLE), L3_scratch); // Result stub address array index
// deopt needs to jump to here to enter the interpreter (return a result)
@@ -1398,7 +1397,7 @@ void CppInterpreterGenerator::generate_more_monitors() {
__ ld_ptr(STATE(_stack), L1_scratch); // Get current stack top
__ sub(L1_scratch, entry_size, L1_scratch);
__ st_ptr(L1_scratch, STATE(_stack));
- __ ba(false, entry);
+ __ ba(entry);
__ delayed()->add(L1_scratch, wordSize, L1_scratch); // first real entry (undo prepush)
// 2. move expression stack
@@ -1651,7 +1650,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
__ set((int)BytecodeInterpreter::got_monitors, L1_scratch);
VALIDATE_STATE(G3_scratch, 5);
- __ ba(false, call_interpreter);
+ __ ba(call_interpreter);
__ delayed()->st(L1_scratch, STATE(_msg));
// uncommon trap needs to jump to here to enter the interpreter (re-execute current bytecode)
@@ -1659,7 +1658,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
// QQQ what message do we send
- __ ba(false, call_interpreter);
+ __ ba(call_interpreter);
__ delayed()->ld_ptr(STATE(_frame_bottom), SP); // restore to full stack frame
//=============================================================================
@@ -1675,7 +1674,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
// ready to resume the interpreter
__ set((int)BytecodeInterpreter::deopt_resume, L1_scratch);
- __ ba(false, call_interpreter);
+ __ ba(call_interpreter);
__ delayed()->st(L1_scratch, STATE(_msg));
// Current frame has caught an exception we need to dispatch to the
@@ -1763,7 +1762,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
// L1_scratch points to top of stack (prepushed)
- __ ba(false, resume_interpreter);
+ __ ba(resume_interpreter);
__ delayed()->mov(L1_scratch, O1);
// An exception is being caught on return to a vanilla interpreter frame.
@@ -1773,7 +1772,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
__ ld_ptr(STATE(_frame_bottom), SP); // restore to full stack frame
__ ld_ptr(STATE(_stack_base), O1); // empty java expression stack
- __ ba(false, resume_interpreter);
+ __ ba(resume_interpreter);
__ delayed()->sub(O1, wordSize, O1); // account for prepush
// Return from interpreted method we return result appropriate to the caller (i.e. "recursive"
@@ -1852,7 +1851,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
__ set((int)BytecodeInterpreter::method_resume, L1_scratch);
__ st(L1_scratch, STATE(_msg));
- __ ba(false, call_interpreter_2);
+ __ ba(call_interpreter_2);
__ delayed()->st_ptr(O1, STATE(_stack));
@@ -1867,8 +1866,8 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
__ cmp(Gtmp1, O7); // returning to interpreter?
__ brx(Assembler::equal, true, Assembler::pt, re_dispatch); // yep
__ delayed()->nop();
- __ ba(false, re_dispatch);
- __ delayed()->mov(G0, prevState); // initial entry
+ __ ba(re_dispatch);
+ __ delayed()->mov(G0, prevState); // initial entry
}
@@ -2031,8 +2030,8 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
__ brx(Assembler::zero, false, Assembler::pt, unwind_and_forward);
__ delayed()->nop();
- __ ld_ptr(STATE(_locals), O1); // get result of popping callee's args
- __ ba(false, unwind_recursive_activation);
+ __ ld_ptr(STATE(_locals), O1); // get result of popping callee's args
+ __ ba(unwind_recursive_activation);
__ delayed()->nop();
interpreter_frame_manager = entry_point;
diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
index edac2b3..83fd371 100644
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.cpp
@@ -839,3 +839,9 @@ void frame::describe_pd(FrameValues& values, int frame_no) {
}
#endif
+
+intptr_t *frame::initial_deoptimization_info() {
+ // unused... but returns fp() to minimize changes introduced by 7087445
+ return fp();
+}
+
diff --git a/hotspot/src/cpu/sparc/vm/frame_sparc.hpp b/hotspot/src/cpu/sparc/vm/frame_sparc.hpp
index ed30d40..fb0eee6 100644
--- a/hotspot/src/cpu/sparc/vm/frame_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.hpp
@@ -259,13 +259,8 @@
};
#endif /* CC_INTERP */
- // the compiler frame has many of the same fields as the interpreter frame
- // %%%%% factor out declarations of the shared fields
enum compiler_frame_fixed_locals {
- compiler_frame_d_scratch_fp_offset = -2,
- compiler_frame_vm_locals_fp_offset = -2, // should be same as above
-
- compiler_frame_vm_local_words = -compiler_frame_vm_locals_fp_offset
+ compiler_frame_vm_locals_fp_offset = -2
};
private:
@@ -283,9 +278,6 @@
inline void interpreter_frame_set_tos_address(intptr_t* x);
-
- // %%%%% Another idea: instead of defining 3 fns per item, just define one returning a ref
-
// monitors:
// next two fns read and write Lmonitors value,
@@ -298,22 +290,8 @@
return ((interpreterState)sp_at(interpreter_state_ptr_offset));
}
-
#endif /* CC_INTERP */
-
-
- // Compiled frames
-
public:
- // Tells if this register can hold 64 bits on V9 (really, V8+).
- static bool holds_a_doubleword(Register reg) {
-#ifdef _LP64
- // return true;
- return reg->is_out() || reg->is_global();
-#else
- return reg->is_out() || reg->is_global();
-#endif
- }
#endif // CPU_SPARC_VM_FRAME_SPARC_HPP
diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
index 58c4c94..8e3b919 100644
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
@@ -236,17 +236,13 @@ void InterpreterMacroAssembler::check_and_handle_earlyret(Register scratch_reg)
Label L;
Register thr_state = G3_scratch;
ld_ptr(G2_thread, JavaThread::jvmti_thread_state_offset(), thr_state);
- tst(thr_state);
- br(zero, false, pt, L); // if (thread->jvmti_thread_state() == NULL) exit;
- delayed()->nop();
+ br_null_short(thr_state, pt, L); // if (thread->jvmti_thread_state() == NULL) exit;
// Initiate earlyret handling only if it is not already being processed.
// If the flag has the earlyret_processing bit set, it means that this code
// is called *during* earlyret handling - we don't want to reenter.
ld(thr_state, JvmtiThreadState::earlyret_state_offset(), G4_scratch);
- cmp(G4_scratch, JvmtiThreadState::earlyret_pending);
- br(Assembler::notEqual, false, pt, L);
- delayed()->nop();
+ cmp_and_br_short(G4_scratch, JvmtiThreadState::earlyret_pending, Assembler::notEqual, pt, L);
// Call Interpreter::remove_activation_early_entry() to get the address of the
// same-named entrypoint in the generated interpreter code
@@ -566,9 +562,7 @@ void InterpreterMacroAssembler::verify_sp(Register Rsp, Register Rtemp) {
#ifdef _LP64
sub(Rtemp, STACK_BIAS, Rtemp); // Bias Rtemp before cmp to FP
#endif
- cmp(Rtemp, FP);
- brx(Assembler::greaterUnsigned, false, Assembler::pn, Bad);
- delayed()->nop();
+ cmp_and_brx_short(Rtemp, FP, Assembler::greaterUnsigned, Assembler::pn, Bad);
// Saved SP must not be ridiculously below current SP.
size_t maxstack = MAX2(JavaThread::stack_size_at_create(), (size_t) 4*K*K);
@@ -577,12 +571,9 @@ void InterpreterMacroAssembler::verify_sp(Register Rsp, Register Rtemp) {
#ifdef _LP64
add(Rtemp, STACK_BIAS, Rtemp); // Unbias Rtemp before cmp to Rsp
#endif
- cmp(Rsp, Rtemp);
- brx(Assembler::lessUnsigned, false, Assembler::pn, Bad);
- delayed()->nop();
+ cmp_and_brx_short(Rsp, Rtemp, Assembler::lessUnsigned, Assembler::pn, Bad);
- br(Assembler::always, false, Assembler::pn, OK);
- delayed()->nop();
+ ba_short(OK);
bind(Bad);
stop("on return to interpreted call, restored SP is corrupted");
@@ -630,8 +621,7 @@ void InterpreterMacroAssembler::call_from_interpreter(Register target, Register
const Address interp_only(G2_thread, JavaThread::interp_only_mode_offset());
ld(interp_only, scratch);
- tst(scratch);
- br(Assembler::notZero, true, Assembler::pn, skip_compiled_code);
+ cmp_zero_and_br(Assembler::notZero, scratch, skip_compiled_code, true, Assembler::pn);
delayed()->ld_ptr(G5_method, in_bytes(methodOopDesc::interpreter_entry_offset()), target);
bind(skip_compiled_code);
}
@@ -641,8 +631,7 @@ void InterpreterMacroAssembler::call_from_interpreter(Register target, Register
#ifdef ASSERT
{
Label ok;
- br_notnull(target, false, Assembler::pt, ok);
- delayed()->nop();
+ br_notnull_short(target, Assembler::pt, ok);
stop("null entry point");
bind(ok);
}
@@ -769,6 +758,20 @@ void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Regis
}
+void InterpreterMacroAssembler::get_cache_and_index_and_bytecode_at_bcp(Register cache,
+ Register temp,
+ Register bytecode,
+ int byte_no,
+ int bcp_offset,
+ size_t index_size) {
+ get_cache_and_index_at_bcp(cache, temp, bcp_offset, index_size);
+ ld_ptr(cache, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset(), bytecode);
+ const int shift_count = (1 + byte_no) * BitsPerByte;
+ srl( bytecode, shift_count, bytecode);
+ and3(bytecode, 0xFF, bytecode);
+}
+
+
void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register tmp,
int bcp_offset, size_t index_size) {
assert(bcp_offset > 0, "bcp is still pointing to start of bytecode");
@@ -982,8 +985,7 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
// Don't unlock anything if the _do_not_unlock_if_synchronized flag
// is set.
- tstbool(G1_scratch);
- br(Assembler::notZero, false, pn, no_unlock);
+ cmp_zero_and_br(Assembler::notZero, G1_scratch, no_unlock);
delayed()->nop();
// BasicObjectLock will be first in list, since this is a synchronized method. However, need
@@ -997,8 +999,7 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
add( top_most_monitor(), O1 );
ld_ptr(O1, BasicObjectLock::obj_offset_in_bytes(), G3_scratch);
- br_notnull(G3_scratch, false, pt, unlock);
- delayed()->nop();
+ br_notnull_short(G3_scratch, pt, unlock);
if (throw_monitor_exception) {
// Entry already unlocked need to throw an exception
@@ -1011,8 +1012,7 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
if (install_monitor_exception) {
MacroAssembler::call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::new_illegal_monitor_state_exception));
}
- ba(false, unlocked);
- delayed()->nop();
+ ba_short(unlocked);
}
bind(unlock);
@@ -1037,15 +1037,13 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
add(top_most_monitor(), Rmptr, delta);
{ Label L;
// ensure that Rmptr starts out above (or at) Rlimit
- cmp(Rmptr, Rlimit);
- brx(Assembler::greaterEqualUnsigned, false, pn, L);
- delayed()->nop();
+ cmp_and_brx_short(Rmptr, Rlimit, Assembler::greaterEqualUnsigned, pn, L);
stop("monitor stack has negative size");
bind(L);
}
#endif
bind(restart);
- ba(false, entry);
+ ba(entry);
delayed()->
add(top_most_monitor(), Rmptr, delta); // points to current entry, starting with bottom-most entry
@@ -1061,8 +1059,7 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
if (install_monitor_exception) {
MacroAssembler::call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::new_illegal_monitor_state_exception));
}
- ba(false, restart);
- delayed()->nop();
+ ba_short(restart);
}
bind(loop);
@@ -1073,9 +1070,7 @@ void InterpreterMacroAssembler::unlock_if_synchronized_method(TosState state,
#ifdef ASSERT
{ Label L;
// ensure that Rmptr has not somehow stepped below Rlimit
- cmp(Rmptr, Rlimit);
- brx(Assembler::greaterEqualUnsigned, false, pn, L);
- delayed()->nop();
+ cmp_and_brx_short(Rmptr, Rlimit, Assembler::greaterEqualUnsigned, pn, L);
stop("ran off the end of the monitor stack");
bind(L);
}
@@ -1196,9 +1191,7 @@ void InterpreterMacroAssembler::lock_object(Register lock_reg, Register Object)
(address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
// if the compare and exchange succeeded we are done (we saw an unlocked object)
- cmp(mark_reg, temp_reg);
- brx(Assembler::equal, true, Assembler::pt, done);
- delayed()->nop();
+ cmp_and_brx_short(mark_reg, temp_reg, Assembler::equal, Assembler::pt, done);
// We did not see an unlocked object so try the fast recursive case
@@ -1324,13 +1317,7 @@ void InterpreterMacroAssembler::set_method_data_pointer_for_bcp() {
void InterpreterMacroAssembler::test_method_data_pointer(Label& zero_continue) {
assert(ProfileInterpreter, "must be profiling interpreter");
-#ifdef _LP64
- bpr(Assembler::rc_z, false, Assembler::pn, ImethodDataPtr, zero_continue);
-#else
- tst(ImethodDataPtr);
- br(Assembler::zero, false, Assembler::pn, zero_continue);
-#endif
- delayed()->nop();
+ br_null_short(ImethodDataPtr, Assembler::pn, zero_continue);
}
void InterpreterMacroAssembler::verify_method_data_pointer() {
@@ -1376,31 +1363,18 @@ void InterpreterMacroAssembler::test_invocation_counter_for_mdp(Register invocat
Label done;
// if no method data exists, and the counter is high enough, make one
-#ifdef _LP64
- bpr(Assembler::rc_nz, false, Assembler::pn, ImethodDataPtr, done);
-#else
- tst(ImethodDataPtr);
- br(Assembler::notZero, false, Assembler::pn, done);
-#endif
+ br_notnull_short(ImethodDataPtr, Assembler::pn, done);
// Test to see if we should create a method data oop
AddressLiteral profile_limit((address) &InvocationCounter::InterpreterProfileLimit);
-#ifdef _LP64
- delayed()->nop();
sethi(profile_limit, Rtmp);
-#else
- delayed()->sethi(profile_limit, Rtmp);
-#endif
ld(Rtmp, profile_limit.low10(), Rtmp);
- cmp(invocation_count, Rtmp);
- br(Assembler::lessUnsigned, false, Assembler::pn, profile_continue);
- delayed()->nop();
+ cmp_and_br_short(invocation_count, Rtmp, Assembler::lessUnsigned, Assembler::pn, profile_continue);
// Build it now.
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::profile_method));
set_method_data_pointer_for_bcp();
- ba(false, profile_continue);
- delayed()->nop();
+ ba_short(profile_continue);
bind(done);
}
@@ -1632,13 +1606,10 @@ void InterpreterMacroAssembler::profile_virtual_call(Register receiver,
Label skip_receiver_profile;
if (receiver_can_be_null) {
Label not_null;
- tst(receiver);
- brx(Assembler::notZero, false, Assembler::pt, not_null);
- delayed()->nop();
+ br_notnull_short(receiver, Assembler::pt, not_null);
// We are making a call. Increment the count for null receiver.
increment_mdp_data_at(in_bytes(CounterData::count_offset()), scratch);
- ba(false, skip_receiver_profile);
- delayed()->nop();
+ ba_short(skip_receiver_profile);
bind(not_null);
}
@@ -1682,8 +1653,7 @@ void InterpreterMacroAssembler::record_klass_in_profile_helper(
// The receiver is receiver[n]. Increment count[n].
int count_offset = in_bytes(VirtualCallData::receiver_count_offset(row));
increment_mdp_data_at(count_offset, scratch);
- ba(false, done);
- delayed()->nop();
+ ba_short(done);
bind(next_test);
if (test_for_null_also) {
@@ -1697,8 +1667,7 @@ void InterpreterMacroAssembler::record_klass_in_profile_helper(
// Receiver did not match any saved receiver and there is no empty row for it.
// Increment total counter to indicate polymorphic case.
increment_mdp_data_at(in_bytes(CounterData::count_offset()), scratch);
- ba(false, done);
- delayed()->nop();
+ ba_short(done);
bind(found_null);
} else {
brx(Assembler::notZero, false, Assembler::pt, done);
@@ -1729,8 +1698,7 @@ void InterpreterMacroAssembler::record_klass_in_profile_helper(
mov(DataLayout::counter_increment, scratch);
set_mdp_data_at(count_offset, scratch);
if (start_row > 0) {
- ba(false, done);
- delayed()->nop();
+ ba_short(done);
}
}
@@ -1772,8 +1740,7 @@ void InterpreterMacroAssembler::profile_ret(TosState state,
// The method data pointer needs to be updated to reflect the new target.
update_mdp_by_offset(in_bytes(RetData::bci_displacement_offset(row)), scratch);
- ba(false, profile_continue);
- delayed()->nop();
+ ba_short(profile_continue);
bind(next_test);
}
@@ -1922,8 +1889,8 @@ void InterpreterMacroAssembler::add_monitor_to_stack( bool stack_is_empty,
// untested("monitor stack expansion");
compute_stack_base(Rtemp);
- ba( false, start_copying );
- delayed()->cmp( Rtemp, Rlimit); // done? duplicated below
+ ba(start_copying);
+ delayed()->cmp(Rtemp, Rlimit); // done? duplicated below
// note: must copy from low memory upwards
// On entry to loop,
@@ -2010,9 +1977,7 @@ void InterpreterMacroAssembler::check_for_regarea_stomp(Register Rindex, int off
// untested("reg area corruption");
add(Rindex, offset, Rscratch);
add(Rlimit, 64 + STACK_BIAS, Rscratch1);
- cmp(Rscratch, Rscratch1);
- brx(Assembler::greaterEqualUnsigned, false, pn, L);
- delayed()->nop();
+ cmp_and_brx_short(Rscratch, Rscratch1, Assembler::greaterEqualUnsigned, pn, L);
stop("regsave area is being clobbered");
bind(L);
}
@@ -2174,9 +2139,7 @@ void InterpreterMacroAssembler::test_backedge_count_for_osr( Register backedge_c
AddressLiteral limit(&InvocationCounter::InterpreterBackwardBranchLimit);
load_contents(limit, Rtmp);
- cmp(backedge_count, Rtmp);
- br(Assembler::lessUnsigned, false, Assembler::pt, did_not_overflow);
- delayed()->nop();
+ cmp_and_br_short(backedge_count, Rtmp, Assembler::lessUnsigned, Assembler::pt, did_not_overflow);
// When ProfileInterpreter is on, the backedge_count comes from the
// methodDataOop, which value does not get reset on the call to
@@ -2196,15 +2159,11 @@ void InterpreterMacroAssembler::test_backedge_count_for_osr( Register backedge_c
// Was an OSR adapter generated?
// O0 = osr nmethod
- tst(O0);
- brx(Assembler::zero, false, Assembler::pn, overflow_with_error);
- delayed()->nop();
+ br_null_short(O0, Assembler::pn, overflow_with_error);
// Has the nmethod been invalidated already?
ld(O0, nmethod::entry_bci_offset(), O2);
- cmp(O2, InvalidOSREntryBci);
- br(Assembler::equal, false, Assembler::pn, overflow_with_error);
- delayed()->nop();
+ cmp_and_br_short(O2, InvalidOSREntryBci, Assembler::equal, Assembler::pn, overflow_with_error);
// migrate the interpreter frame off of the stack
@@ -2270,8 +2229,7 @@ void InterpreterMacroAssembler::verify_oop_or_return_address(Register reg, Regis
mov(reg, Rtmp);
const int log2_bytecode_size_limit = 16;
srl(Rtmp, log2_bytecode_size_limit, Rtmp);
- br_notnull( Rtmp, false, pt, test );
- delayed()->nop();
+ br_notnull_short( Rtmp, pt, test );
// %%% should use call_VM_leaf here?
save_frame_and_mov(0, Lmethod, O0, reg, O1);
@@ -2320,9 +2278,7 @@ void InterpreterMacroAssembler::notify_method_entry() {
Register temp_reg = O5;
const Address interp_only(G2_thread, JavaThread::interp_only_mode_offset());
ld(interp_only, temp_reg);
- tst(temp_reg);
- br(zero, false, pt, L);
- delayed()->nop();
+ cmp_and_br_short(temp_reg, 0, equal, pt, L);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::post_method_entry));
bind(L);
}
@@ -2372,9 +2328,7 @@ void InterpreterMacroAssembler::notify_method_exit(bool is_native_method,
Register temp_reg = O5;
const Address interp_only(G2_thread, JavaThread::interp_only_mode_offset());
ld(interp_only, temp_reg);
- tst(temp_reg);
- br(zero, false, pt, L);
- delayed()->nop();
+ cmp_and_br_short(temp_reg, 0, equal, pt, L);
// Note: frame::interpreter_frame_result has a dependency on how the
// method result is saved across the call to post_method_exit. For
diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp
index be3840c..8e05e9a 100644
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.hpp
@@ -189,6 +189,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
setCCOrNot should_set_CC = dont_set_CC );
void get_cache_and_index_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
+ void get_cache_and_index_and_bytecode_at_bcp(Register cache, Register temp, Register bytecode, int byte_no, int bcp_offset, size_t index_size = sizeof(u2));
void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
void get_cache_index_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
diff --git a/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp
index 774c3b6..5471ebc 100644
--- a/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/interpreter_sparc.cpp
@@ -191,22 +191,19 @@ address AbstractInterpreterGenerator::generate_slow_signature_handler() {
// Optimization, see if there are any more args and get out prior to checking
// all 16 float registers. My guess is that this is rare.
// If is_register is false, then we are done the first six integer args.
- __ tst(G4_scratch);
- __ brx(Assembler::zero, false, Assembler::pt, done);
- __ delayed()->nop();
-
+ __ br_null_short(G4_scratch, Assembler::pt, done);
}
- __ ba(false, NextArg);
+ __ ba(NextArg);
__ delayed()->srl( G4_scratch, 2, G4_scratch );
__ bind(LoadFloatArg);
__ ldf( FloatRegisterImpl::S, a, ldarg.as_float_register(), 4);
- __ ba(false, NextArg);
+ __ ba(NextArg);
__ delayed()->srl( G4_scratch, 2, G4_scratch );
__ bind(LoadDoubleArg);
__ ldf( FloatRegisterImpl::D, a, ldarg.as_double_register() );
- __ ba(false, NextArg);
+ __ ba(NextArg);
__ delayed()->srl( G4_scratch, 2, G4_scratch );
__ bind(NextArg);
@@ -234,8 +231,7 @@ void InterpreterGenerator::generate_counter_overflow(Label& Lcontinue) {
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), O2, O2, true);
// returns verified_entry_point or NULL
// we ignore it in any case
- __ ba(false, Lcontinue);
- __ delayed()->nop();
+ __ ba_short(Lcontinue);
}
diff --git a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
index 3df5a8e..14030c0 100644
--- a/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/methodHandles_sparc.cpp
@@ -287,9 +287,7 @@ void MethodHandles::RicochetFrame::verify_clean(MacroAssembler* _masm) {
BLOCK_COMMENT("verify_clean {");
// Magic numbers must check out:
__ set((int32_t) MAGIC_NUMBER_1, O7_temp);
- __ cmp(O7_temp, L0_magic_number_1);
- __ br(Assembler::equal, false, Assembler::pt, L_ok_1);
- __ delayed()->nop();
+ __ cmp_and_br_short(O7_temp, L0_magic_number_1, Assembler::equal, Assembler::pt, L_ok_1);
__ stop("damaged ricochet frame: MAGIC_NUMBER_1 not found");
__ BIND(L_ok_1);
@@ -301,9 +299,7 @@ void MethodHandles::RicochetFrame::verify_clean(MacroAssembler* _masm) {
#else
Register FP_temp = FP;
#endif
- __ cmp(L4_saved_args_base, FP_temp);
- __ br(Assembler::greaterEqualUnsigned, false, Assembler::pt, L_ok_2);
- __ delayed()->nop();
+ __ cmp_and_brx_short(L4_saved_args_base, FP_temp, Assembler::greaterEqualUnsigned, Assembler::pt, L_ok_2);
__ stop("damaged ricochet frame: L4 < FP");
__ BIND(L_ok_2);
@@ -316,15 +312,11 @@ void MethodHandles::RicochetFrame::verify_clean(MacroAssembler* _masm) {
__ BIND(L_ok_3);
extract_conversion_dest_type(_masm, L5_conversion, O7_temp);
- __ cmp(O7_temp, T_VOID);
- __ br(Assembler::equal, false, Assembler::pt, L_ok_4);
- __ delayed()->nop();
+ __ cmp_and_br_short(O7_temp, T_VOID, Assembler::equal, Assembler::pt, L_ok_4);
extract_conversion_vminfo(_masm, L5_conversion, O5_temp);
__ ld_ptr(L4_saved_args_base, __ argument_offset(O5_temp, O5_temp), O7_temp);
assert(__ is_simm13(RETURN_VALUE_PLACEHOLDER), "must be simm13");
- __ cmp(O7_temp, (int32_t) RETURN_VALUE_PLACEHOLDER);
- __ brx(Assembler::equal, false, Assembler::pt, L_ok_4);
- __ delayed()->nop();
+ __ cmp_and_brx_short(O7_temp, (int32_t) RETURN_VALUE_PLACEHOLDER, Assembler::equal, Assembler::pt, L_ok_4);
__ stop("damaged ricochet frame: RETURN_VALUE_PLACEHOLDER not found");
__ BIND(L_ok_4);
BLOCK_COMMENT("} verify_clean");
@@ -363,9 +355,7 @@ void MethodHandles::load_stack_move(MacroAssembler* _masm,
if (VerifyMethodHandles) {
Label L_ok, L_bad;
int32_t stack_move_limit = 0x0800; // extra-large
- __ cmp(stack_move_reg, stack_move_limit);
- __ br(Assembler::greaterEqual, false, Assembler::pn, L_bad);
- __ delayed()->nop();
+ __ cmp_and_br_short(stack_move_reg, stack_move_limit, Assembler::greaterEqual, Assembler::pn, L_bad);
__ cmp(stack_move_reg, -stack_move_limit);
__ br(Assembler::greater, false, Assembler::pt, L_ok);
__ delayed()->nop();
@@ -401,13 +391,9 @@ void MethodHandles::verify_argslot(MacroAssembler* _masm, Register argslot_reg,
// Verify that argslot lies within (Gargs, FP].
Label L_ok, L_bad;
BLOCK_COMMENT("verify_argslot {");
+ __ cmp_and_brx_short(Gargs, argslot_reg, Assembler::greaterUnsigned, Assembler::pn, L_bad);
__ add(FP, STACK_BIAS, temp_reg); // STACK_BIAS is zero on !_LP64
- __ cmp(argslot_reg, temp_reg);
- __ brx(Assembler::greaterUnsigned, false, Assembler::pn, L_bad);
- __ delayed()->nop();
- __ cmp(Gargs, argslot_reg);
- __ brx(Assembler::lessEqualUnsigned, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(argslot_reg, temp_reg, Assembler::lessEqualUnsigned, Assembler::pt, L_ok);
__ BIND(L_bad);
__ stop(error_message);
__ BIND(L_ok);
@@ -434,14 +420,10 @@ void MethodHandles::verify_argslots(MacroAssembler* _masm,
}
__ add(arg_slot_base_reg, __ argument_offset(arg_slots, temp_reg), temp_reg);
__ add(FP, STACK_BIAS, temp2_reg); // STACK_BIAS is zero on !_LP64
- __ cmp(temp_reg, temp2_reg);
- __ brx(Assembler::greaterUnsigned, false, Assembler::pn, L_bad);
- __ delayed()->nop();
+ __ cmp_and_brx_short(temp_reg, temp2_reg, Assembler::greaterUnsigned, Assembler::pn, L_bad);
// Gargs points to the first word so adjust by BytesPerWord
__ add(arg_slot_base_reg, BytesPerWord, temp_reg);
- __ cmp(Gargs, temp_reg);
- __ brx(Assembler::lessEqualUnsigned, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(Gargs, temp_reg, Assembler::lessEqualUnsigned, Assembler::pt, L_ok);
__ BIND(L_bad);
__ stop(error_message);
__ BIND(L_ok);
@@ -502,21 +484,16 @@ void MethodHandles::verify_klass(MacroAssembler* _masm,
Label L_ok, L_bad;
BLOCK_COMMENT("verify_klass {");
__ verify_oop(obj_reg);
- __ br_null(obj_reg, false, Assembler::pn, L_bad);
- __ delayed()->nop();
+ __ br_null_short(obj_reg, Assembler::pn, L_bad);
__ load_klass(obj_reg, temp_reg);
__ set(ExternalAddress(klass_addr), temp2_reg);
__ ld_ptr(Address(temp2_reg, 0), temp2_reg);
- __ cmp(temp_reg, temp2_reg);
- __ brx(Assembler::equal, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(temp_reg, temp2_reg, Assembler::equal, Assembler::pt, L_ok);
intptr_t super_check_offset = klass->super_check_offset();
__ ld_ptr(Address(temp_reg, super_check_offset), temp_reg);
__ set(ExternalAddress(klass_addr), temp2_reg);
__ ld_ptr(Address(temp2_reg, 0), temp2_reg);
- __ cmp(temp_reg, temp2_reg);
- __ brx(Assembler::equal, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(temp_reg, temp2_reg, Assembler::equal, Assembler::pt, L_ok);
__ BIND(L_bad);
__ stop(error_message);
__ BIND(L_ok);
@@ -671,9 +648,7 @@ static RegisterOrConstant adjust_SP_and_Gargs_down_by_slots(MacroAssembler* _mas
#ifdef ASSERT
{
Label L_ok;
- __ cmp(arg_slots.as_register(), 0);
- __ br(Assembler::greaterEqual, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_br_short(arg_slots.as_register(), 0, Assembler::greaterEqual, Assembler::pt, L_ok);
__ stop("negative arg_slots");
__ bind(L_ok);
}
@@ -748,9 +723,7 @@ void MethodHandles::insert_arg_slots(MacroAssembler* _masm,
__ ld_ptr( Address(temp_reg, 0 ), temp2_reg);
__ st_ptr(temp2_reg, Address(temp_reg, offset) );
__ add(temp_reg, wordSize, temp_reg);
- __ cmp(temp_reg, argslot_reg);
- __ brx(Assembler::lessUnsigned, false, Assembler::pt, loop);
- __ delayed()->nop(); // FILLME
+ __ cmp_and_brx_short(temp_reg, argslot_reg, Assembler::lessUnsigned, Assembler::pt, loop);
}
// Now move the argslot down, to point to the opened-up space.
@@ -797,9 +770,7 @@ void MethodHandles::remove_arg_slots(MacroAssembler* _masm,
__ ld_ptr( Address(temp_reg, 0 ), temp2_reg);
__ st_ptr(temp2_reg, Address(temp_reg, offset) );
__ sub(temp_reg, wordSize, temp_reg);
- __ cmp(temp_reg, Gargs);
- __ brx(Assembler::greaterEqualUnsigned, false, Assembler::pt, L_loop);
- __ delayed()->nop(); // FILLME
+ __ cmp_and_brx_short(temp_reg, Gargs, Assembler::greaterEqualUnsigned, Assembler::pt, L_loop);
}
// And adjust the argslot address to point at the deletion point.
@@ -848,8 +819,7 @@ void MethodHandles::push_arg_slots(MacroAssembler* _masm,
__ delayed()->nop();
__ ld_ptr( Address(argslot_reg, 0), temp_reg);
__ st_ptr(temp_reg, Address(Gargs, 0));
- __ ba(false, L_break);
- __ delayed()->nop(); // FILLME
+ __ ba_short(L_break);
__ BIND(L_plural);
// Loop for 2 or more:
@@ -863,9 +833,7 @@ void MethodHandles::push_arg_slots(MacroAssembler* _masm,
__ sub(Gargs, wordSize, Gargs );
__ ld_ptr( Address(top_reg, 0), temp2_reg);
__ st_ptr(temp2_reg, Address(Gargs, 0));
- __ cmp(top_reg, argslot_reg);
- __ brx(Assembler::greaterUnsigned, false, Assembler::pt, L_loop);
- __ delayed()->nop(); // FILLME
+ __ cmp_and_brx_short(top_reg, argslot_reg, Assembler::greaterUnsigned, Assembler::pt, L_loop);
__ BIND(L_break);
}
BLOCK_COMMENT("} push_arg_slots");
@@ -897,17 +865,13 @@ void MethodHandles::move_arg_slots_up(MacroAssembler* _masm,
__ br(Assembler::lessEqual, false, Assembler::pn, L_bad);
__ delayed()->nop();
}
- __ cmp(bottom_reg, top_reg);
- __ brx(Assembler::lessUnsigned, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(bottom_reg, top_reg, Assembler::lessUnsigned, Assembler::pt, L_ok);
__ BIND(L_bad);
__ stop("valid bounds (copy up)");
__ BIND(L_ok);
}
#endif
- __ cmp(bottom_reg, top_reg);
- __ brx(Assembler::greaterEqualUnsigned, false, Assembler::pn, L_break);
- __ delayed()->nop();
+ __ cmp_and_brx_short(bottom_reg, top_reg, Assembler::greaterEqualUnsigned, Assembler::pn, L_break);
// work top down to bottom, copying contiguous data upwards
// In pseudo-code:
// while (--top >= bottom) *(top + distance) = *(top + 0);
@@ -916,9 +880,7 @@ void MethodHandles::move_arg_slots_up(MacroAssembler* _masm,
__ sub(top_reg, wordSize, top_reg);
__ ld_ptr( Address(top_reg, 0 ), temp2_reg);
__ st_ptr(temp2_reg, Address(top_reg, offset) );
- __ cmp(top_reg, bottom_reg);
- __ brx(Assembler::greaterUnsigned, false, Assembler::pt, L_loop);
- __ delayed()->nop(); // FILLME
+ __ cmp_and_brx_short(top_reg, bottom_reg, Assembler::greaterUnsigned, Assembler::pt, L_loop);
assert(Interpreter::stackElementSize == wordSize, "else change loop");
__ BIND(L_break);
BLOCK_COMMENT("} move_arg_slots_up");
@@ -951,17 +913,13 @@ void MethodHandles::move_arg_slots_down(MacroAssembler* _masm,
__ br(Assembler::greaterEqual, false, Assembler::pn, L_bad);
__ delayed()->nop();
}
- __ cmp(bottom_reg, top_reg);
- __ brx(Assembler::lessUnsigned, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(bottom_reg, top_reg, Assembler::lessUnsigned, Assembler::pt, L_ok);
__ BIND(L_bad);
__ stop("valid bounds (copy down)");
__ BIND(L_ok);
}
#endif
- __ cmp(bottom_reg, top_reg);
- __ brx(Assembler::greaterEqualUnsigned, false, Assembler::pn, L_break);
- __ delayed()->nop();
+ __ cmp_and_brx_short(bottom_reg, top_reg, Assembler::greaterEqualUnsigned, Assembler::pn, L_break);
// work bottom up to top, copying contiguous data downwards
// In pseudo-code:
// while (bottom < top) *(bottom - distance) = *(bottom + 0), bottom++;
@@ -970,9 +928,7 @@ void MethodHandles::move_arg_slots_down(MacroAssembler* _masm,
__ ld_ptr( Address(bottom_reg, 0 ), temp2_reg);
__ st_ptr(temp2_reg, Address(bottom_reg, offset) );
__ add(bottom_reg, wordSize, bottom_reg);
- __ cmp(bottom_reg, top_reg);
- __ brx(Assembler::lessUnsigned, false, Assembler::pt, L_loop);
- __ delayed()->nop(); // FILLME
+ __ cmp_and_brx_short(bottom_reg, top_reg, Assembler::lessUnsigned, Assembler::pt, L_loop);
assert(Interpreter::stackElementSize == wordSize, "else change loop");
__ BIND(L_break);
BLOCK_COMMENT("} move_arg_slots_down");
@@ -1170,7 +1126,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
adjust_SP_and_Gargs_down_by_slots(_masm, 3, noreg, noreg);
- __ st_ptr(O0_code, __ argument_address(constant(2), noreg, 0));
+ __ st (O0_code, __ argument_address(constant(2), noreg, 0));
__ st_ptr(O1_actual, __ argument_address(constant(1), noreg, 0));
__ st_ptr(O2_required, __ argument_address(constant(0), noreg, 0));
jump_from_method_handle(_masm, G5_method, O1_scratch, O2_scratch);
@@ -1306,6 +1262,15 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
}
break;
+ case _adapter_opt_profiling:
+ if (java_lang_invoke_CountingMethodHandle::vmcount_offset_in_bytes() != 0) {
+ Address G3_mh_vmcount(G3_method_handle, java_lang_invoke_CountingMethodHandle::vmcount_offset_in_bytes());
+ __ ld(G3_mh_vmcount, O1_scratch);
+ __ add(O1_scratch, 1, O1_scratch);
+ __ st(O1_scratch, G3_mh_vmcount);
+ }
+ // fall through
+
case _adapter_retype_only:
case _adapter_retype_raw:
// Immediately jump to the next MH layer:
@@ -1329,9 +1294,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
Label L_done;
__ ld_ptr(vmarg, O2_scratch);
- __ tst(O2_scratch);
- __ brx(Assembler::zero, false, Assembler::pn, L_done); // No cast if null.
- __ delayed()->nop();
+ __ br_null_short(O2_scratch, Assembler::pn, L_done); // No cast if null.
__ load_klass(O2_scratch, O2_scratch);
// Live at this point:
@@ -1436,8 +1399,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
// this path is taken for int->byte, int->short
__ sra(O1_scratch, G5_vminfo, O1_scratch);
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
__ bind(zero_extend);
// this is taken for int->char
@@ -1860,9 +1822,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
BLOCK_COMMENT("verify collect_count_constant {");
__ load_method_handle_vmslots(O3_scratch, G3_method_handle, O2_scratch);
Label L_count_ok;
- __ cmp(O3_scratch, collect_count_constant);
- __ br(Assembler::equal, false, Assembler::pt, L_count_ok);
- __ delayed()->nop();
+ __ cmp_and_br_short(O3_scratch, collect_count_constant, Assembler::equal, Assembler::pt, L_count_ok);
__ stop("bad vminfo in AMH.conv");
__ BIND(L_count_ok);
BLOCK_COMMENT("} verify collect_count_constant");
@@ -1909,9 +1869,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
BLOCK_COMMENT("verify dest_slot_constant {");
extract_conversion_vminfo(_masm, RicochetFrame::L5_conversion, O3_scratch);
Label L_vminfo_ok;
- __ cmp(O3_scratch, dest_slot_constant);
- __ br(Assembler::equal, false, Assembler::pt, L_vminfo_ok);
- __ delayed()->nop();
+ __ cmp_and_br_short(O3_scratch, dest_slot_constant, Assembler::equal, Assembler::pt, L_vminfo_ok);
__ stop("bad vminfo in AMH.conv");
__ BIND(L_vminfo_ok);
BLOCK_COMMENT("} verify dest_slot_constant");
@@ -1951,14 +1909,10 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
// If there are variable parameters, use dynamic checks to skip around the whole mess.
Label L_done;
if (keep3_count.is_register()) {
- __ tst(keep3_count.as_register());
- __ br(Assembler::zero, false, Assembler::pn, L_done);
- __ delayed()->nop();
+ __ cmp_and_br_short(keep3_count.as_register(), 0, Assembler::equal, Assembler::pn, L_done);
}
if (close_count.is_register()) {
- __ cmp(close_count.as_register(), open_count);
- __ br(Assembler::equal, false, Assembler::pn, L_done);
- __ delayed()->nop();
+ __ cmp_and_br_short(close_count.as_register(), open_count, Assembler::equal, Assembler::pn, L_done);
}
if (move_keep3 && fix_arg_base) {
@@ -1999,8 +1953,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
}
if (emit_guard) {
- __ ba(false, L_done); // assumes emit_move_up is true also
- __ delayed()->nop();
+ __ ba_short(L_done); // assumes emit_move_up is true also
__ BIND(L_move_up);
}
@@ -2133,8 +2086,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
#ifdef ASSERT
{ Label L_ok;
- __ br_notnull(O7_temp, false, Assembler::pt, L_ok);
- __ delayed()->nop();
+ __ br_notnull_short(O7_temp, Assembler::pt, L_ok);
__ stop("bad method handle return");
__ BIND(L_ok);
}
@@ -2192,11 +2144,10 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
Label L_skip;
if (length_constant < 0) {
load_conversion_vminfo(_masm, G3_amh_conversion, O3_scratch);
- __ br_zero(Assembler::notZero, false, Assembler::pn, O3_scratch, L_skip);
- __ delayed()->nop();
+ __ cmp_zero_and_br(Assembler::notZero, O3_scratch, L_skip);
+ __ delayed()->nop(); // to avoid back-to-back cbcond instructions
}
- __ br_null(O1_array, false, Assembler::pn, L_array_is_empty);
- __ delayed()->nop();
+ __ br_null_short(O1_array, Assembler::pn, L_array_is_empty);
__ BIND(L_skip);
}
__ null_check(O1_array, oopDesc::klass_offset_in_bytes());
@@ -2210,8 +2161,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
Label L_ok_array_klass, L_bad_array_klass, L_bad_array_length;
__ check_klass_subtype(O2_array_klass, O3_klass, O4_scratch, G5_scratch, L_ok_array_klass);
// If we get here, the type check failed!
- __ ba(false, L_bad_array_klass);
- __ delayed()->nop();
+ __ ba_short(L_bad_array_klass);
__ BIND(L_ok_array_klass);
// Check length.
@@ -2247,8 +2197,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
__ BIND(L_array_is_empty);
remove_arg_slots(_masm, -stack_move_unit() * array_slots,
O0_argslot, O1_scratch, O2_scratch, O3_scratch);
- __ ba(false, L_args_done); // no spreading to do
- __ delayed()->nop();
+ __ ba_short(L_args_done); // no spreading to do
__ BIND(L_insert_arg_space);
// come here in the usual case, stack_move < 0 (2 or more spread arguments)
// Live: O1_array, O2_argslot_limit, O3_stack_move
@@ -2289,9 +2238,7 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
Address(O1_source, 0), Address(O4_fill_ptr, 0),
O2_scratch); // must be an even register for !_LP64 long moves (uses O2/O3)
__ add(O1_source, type2aelembytes(elem_type), O1_source);
- __ cmp(O4_fill_ptr, O0_argslot);
- __ brx(Assembler::greaterUnsigned, false, Assembler::pt, L_loop);
- __ delayed()->nop(); // FILLME
+ __ cmp_and_brx_short(O4_fill_ptr, O0_argslot, Assembler::greaterUnsigned, Assembler::pt, L_loop);
} else if (length_constant == 0) {
// nothing to copy
} else {
diff --git a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
index 277ff70..cb9e429 100644
--- a/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/sharedRuntime_sparc.cpp
@@ -600,7 +600,7 @@ class AdapterGenerator {
void AdapterGenerator::patch_callers_callsite() {
Label L;
__ ld_ptr(G5_method, in_bytes(methodOopDesc::code_offset()), G3_scratch);
- __ br_null(G3_scratch, false, __ pt, L);
+ __ br_null(G3_scratch, false, Assembler::pt, L);
// Schedule the branch target address early.
__ delayed()->ld_ptr(G5_method, in_bytes(methodOopDesc::interpreter_entry_offset()), G3_scratch);
// Call into the VM to patch the caller, then jump to compiled callee
@@ -1127,8 +1127,7 @@ void AdapterGenerator::gen_i2c_adapter(
Label loop;
__ bind(loop);
__ sub(L0, 1, L0);
- __ br_null(L0, false, Assembler::pt, loop);
- __ delayed()->nop();
+ __ br_null_short(L0, Assembler::pt, loop);
__ restore();
}
@@ -1202,7 +1201,7 @@ AdapterHandlerEntry* SharedRuntime::generate_i2c2i_adapters(MacroAssembler *masm
// the call site corrected.
__ ld_ptr(G5_method, in_bytes(methodOopDesc::code_offset()), G3_scratch);
__ bind(ok2);
- __ br_null(G3_scratch, false, __ pt, skip_fixup);
+ __ br_null(G3_scratch, false, Assembler::pt, skip_fixup);
__ delayed()->ld_ptr(G5_method, in_bytes(methodOopDesc::interpreter_entry_offset()), G3_scratch);
__ jump_to(ic_miss, G3_scratch);
__ delayed()->nop();
@@ -1779,9 +1778,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
AddressLiteral ic_miss(SharedRuntime::get_ic_miss_stub());
__ verify_oop(O0);
__ load_klass(O0, temp_reg);
- __ cmp(temp_reg, G5_inline_cache_reg);
- __ brx(Assembler::equal, true, Assembler::pt, L);
- __ delayed()->nop();
+ __ cmp_and_brx_short(temp_reg, G5_inline_cache_reg, Assembler::equal, Assembler::pt, L);
__ jump_to(ic_miss, temp_reg);
__ delayed()->nop();
@@ -2182,8 +2179,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
#ifdef ASSERT
{ Label L;
__ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), O0);
- __ br_null(O0, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_null_short(O0, Assembler::pt, L);
__ stop("no pending exception allowed on exit from IR::monitorenter");
__ bind(L);
}
@@ -2298,9 +2294,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
Address suspend_state(G2_thread, JavaThread::suspend_flags_offset());
__ br(Assembler::notEqual, false, Assembler::pn, L);
__ delayed()->ld(suspend_state, G3_scratch);
- __ cmp(G3_scratch, 0);
- __ br(Assembler::equal, false, Assembler::pt, no_block);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, 0, Assembler::equal, Assembler::pt, no_block);
__ bind(L);
// Block. Save any potential method result value before the operation and
@@ -2328,9 +2322,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
Label no_reguard;
__ ld(G2_thread, JavaThread::stack_guard_state_offset(), G3_scratch);
- __ cmp(G3_scratch, JavaThread::stack_guard_yellow_disabled);
- __ br(Assembler::notEqual, false, Assembler::pt, no_reguard);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, JavaThread::stack_guard_yellow_disabled, Assembler::notEqual, Assembler::pt, no_reguard);
save_native_result(masm, ret_type, stack_slots);
__ call(CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
@@ -2382,8 +2374,7 @@ nmethod *SharedRuntime::generate_native_wrapper(MacroAssembler* masm,
#ifdef ASSERT
{ Label L;
__ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), O0);
- __ br_null(O0, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_null_short(O0, Assembler::pt, L);
__ stop("no pending exception allowed on exit from IR::monitorexit");
__ bind(L);
}
@@ -2639,9 +2630,7 @@ nmethod *SharedRuntime::generate_dtrace_nmethod(
AddressLiteral ic_miss(SharedRuntime::get_ic_miss_stub());
__ verify_oop(O0);
__ ld_ptr(O0, oopDesc::klass_offset_in_bytes(), temp_reg);
- __ cmp(temp_reg, G5_inline_cache_reg);
- __ brx(Assembler::equal, true, Assembler::pt, L);
- __ delayed()->nop();
+ __ cmp_and_brx_short(temp_reg, G5_inline_cache_reg, Assembler::equal, Assembler::pt, L);
__ jump_to(ic_miss, temp_reg);
__ delayed()->nop();
@@ -3143,8 +3132,7 @@ static void make_new_frames(MacroAssembler* masm, bool deopt) {
gen_new_frame(masm, deopt); // allocate an interpreter frame
- __ tst(O4array_size);
- __ br(Assembler::notZero, false, Assembler::pn, loop);
+ __ cmp_zero_and_br(Assembler::notZero, O4array_size, loop);
__ delayed()->add(O3array, wordSize, O3array);
__ ld_ptr(G3pcs, 0, O7); // load final frame new pc
@@ -3221,7 +3209,7 @@ void SharedRuntime::generate_deopt_blob() {
// pc is now in O7. Return values are still in the expected places
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_words);
- __ ba(false, cont);
+ __ ba(cont);
__ delayed()->mov(Deoptimization::Unpack_deopt, L0deopt_mode);
int exception_offset = __ offset() - start;
@@ -3256,8 +3244,7 @@ void SharedRuntime::generate_deopt_blob() {
// verify that there is really an exception oop in exception_oop
Label has_exception;
__ ld_ptr(G2_thread, JavaThread::exception_oop_offset(), Oexception);
- __ br_notnull(Oexception, false, Assembler::pt, has_exception);
- __ delayed()-> nop();
+ __ br_notnull_short(Oexception, Assembler::pt, has_exception);
__ stop("no exception in thread");
__ bind(has_exception);
@@ -3265,14 +3252,13 @@ void SharedRuntime::generate_deopt_blob() {
Label no_pending_exception;
Address exception_addr(G2_thread, Thread::pending_exception_offset());
__ ld_ptr(exception_addr, Oexception);
- __ br_null(Oexception, false, Assembler::pt, no_pending_exception);
- __ delayed()->nop();
+ __ br_null_short(Oexception, Assembler::pt, no_pending_exception);
__ stop("must not have pending exception here");
__ bind(no_pending_exception);
}
#endif
- __ ba(false, cont);
+ __ ba(cont);
__ delayed()->mov(Deoptimization::Unpack_exception, L0deopt_mode);;
//
@@ -3313,9 +3299,7 @@ void SharedRuntime::generate_deopt_blob() {
RegisterSaver::restore_result_registers(masm);
Label noException;
- __ cmp(G4deopt_mode, Deoptimization::Unpack_exception); // Was exception pending?
- __ br(Assembler::notEqual, false, Assembler::pt, noException);
- __ delayed()->nop();
+ __ cmp_and_br_short(G4deopt_mode, Deoptimization::Unpack_exception, Assembler::notEqual, Assembler::pt, noException);
// Move the pending exception from exception_oop to Oexception so
// the pending exception will be picked up the interpreter.
@@ -3359,9 +3343,7 @@ void SharedRuntime::generate_deopt_blob() {
// In 32 bit, C2 returns longs in G1 so restore the saved G1 into
// I0/I1 if the return value is long.
Label not_long;
- __ cmp(O0,T_LONG);
- __ br(Assembler::notEqual, false, Assembler::pt, not_long);
- __ delayed()->nop();
+ __ cmp_and_br_short(O0,T_LONG, Assembler::notEqual, Assembler::pt, not_long);
__ ldd(saved_Greturn1_addr,I0);
__ bind(not_long);
#endif
@@ -3534,9 +3516,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, bool cause
Label pending;
__ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), O1);
- __ tst(O1);
- __ brx(Assembler::notEqual, true, Assembler::pn, pending);
- __ delayed()->nop();
+ __ br_notnull_short(O1, Assembler::pn, pending);
RegisterSaver::restore_live_registers(masm);
@@ -3623,9 +3603,7 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const cha
Label pending;
__ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), O1);
- __ tst(O1);
- __ brx(Assembler::notEqual, true, Assembler::pn, pending);
- __ delayed()->nop();
+ __ br_notnull_short(O1, Assembler::pn, pending);
// get the returned methodOop
diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad
index ff28539..d7bf2d8 100644
--- a/hotspot/src/cpu/sparc/vm/sparc.ad
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad
@@ -460,6 +460,8 @@ source_hpp %{
// Must be visible to the DFA in dfa_sparc.cpp
extern bool can_branch_register( Node *bol, Node *cmp );
+extern bool use_block_zeroing(Node* count);
+
// Macros to extract hi & lo halves from a long pair.
// G0 is not part of any long pair, so assert on that.
// Prevents accidentally using G1 instead of G0.
@@ -471,9 +473,6 @@ extern bool can_branch_register( Node *bol, Node *cmp );
source %{
#define __ _masm.
-// Block initializing store
-#define ASI_BLK_INIT_QUAD_LDD_P 0xE2
-
// tertiary op of a LoadP or StoreP encoding
#define REGP_OP true
@@ -524,6 +523,12 @@ bool can_branch_register( Node *bol, Node *cmp ) {
return false;
}
+bool use_block_zeroing(Node* count) {
+ // Use BIS for zeroing if count is not constant
+ // or it is >= BlockZeroingLowLimit.
+ return UseBlockZeroing && (count->find_intptr_t_con(BlockZeroingLowLimit) >= BlockZeroingLowLimit);
+}
+
// ****************************************************************************
// REQUIRED FUNCTIONALITY
@@ -835,6 +840,7 @@ void emit_form3_mem_reg(CodeBuffer &cbuf, const MachNode* n, int primary, int te
!(n->ideal_Opcode()==Op_ConvI2D && ld_op==Op_LoadF) &&
!(n->ideal_Opcode()==Op_PrefetchRead && ld_op==Op_LoadI) &&
!(n->ideal_Opcode()==Op_PrefetchWrite && ld_op==Op_LoadI) &&
+ !(n->ideal_Opcode()==Op_PrefetchAllocation && ld_op==Op_LoadI) &&
!(n->ideal_Opcode()==Op_Load2I && ld_op==Op_LoadD) &&
!(n->ideal_Opcode()==Op_Load4C && ld_op==Op_LoadD) &&
!(n->ideal_Opcode()==Op_Load4S && ld_op==Op_LoadD) &&
@@ -1693,7 +1699,6 @@ void MachUEPNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
void MachUEPNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
MacroAssembler _masm(&cbuf);
- Label L;
Register G5_ic_reg = reg_to_register_object(Matcher::inline_cache_reg_encode());
Register temp_reg = G3;
assert( G5_ic_reg != temp_reg, "conflicting registers" );
@@ -1835,8 +1840,10 @@ const bool Matcher::convL2FSupported(void) {
//
// NOTE: If the platform does not provide any short branch variants, then
// this method should return false for offset 0.
-bool Matcher::is_short_branch_offset(int rule, int offset) {
- return false;
+bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
+ // The passed offset is relative to address of the branch.
+ // Don't need to adjust the offset.
+ return UseCBCond && Assembler::is_simm(offset, 12);
}
const bool Matcher::isSimpleConstant64(jlong value) {
@@ -2315,60 +2322,23 @@ encode %{
__ delayed()->nop();
%}
- enc_class enc_bp( Label labl, cmpOp cmp, flagsReg cc ) %{
+ enc_class enc_bp( label labl, cmpOp cmp, flagsReg cc ) %{
MacroAssembler _masm(&cbuf);
- Label &L = *($labl$$label);
+ Label* L = $labl$$label;
Assembler::Predict predict_taken =
- cbuf.is_backward_branch(L) ? Assembler::pt : Assembler::pn;
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
- __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, L);
+ __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
__ delayed()->nop();
%}
- enc_class enc_bpl( Label labl, cmpOp cmp, flagsRegL cc ) %{
+ enc_class enc_bpr( label labl, cmpOp_reg cmp, iRegI op1 ) %{
MacroAssembler _masm(&cbuf);
- Label &L = *($labl$$label);
+ Label* L = $labl$$label;
Assembler::Predict predict_taken =
- cbuf.is_backward_branch(L) ? Assembler::pt : Assembler::pn;
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
- __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, L);
- __ delayed()->nop();
- %}
-
- enc_class enc_bpx( Label labl, cmpOp cmp, flagsRegP cc ) %{
- MacroAssembler _masm(&cbuf);
- Label &L = *($labl$$label);
- Assembler::Predict predict_taken =
- cbuf.is_backward_branch(L) ? Assembler::pt : Assembler::pn;
-
- __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::ptr_cc, predict_taken, L);
- __ delayed()->nop();
- %}
-
- enc_class enc_fbp( Label labl, cmpOpF cmp, flagsRegF cc ) %{
- MacroAssembler _masm(&cbuf);
- Label &L = *($labl$$label);
- Assembler::Predict predict_taken =
- cbuf.is_backward_branch(L) ? Assembler::pt : Assembler::pn;
-
- __ fbp( (Assembler::Condition)($cmp$$cmpcode), false, (Assembler::CC)($cc$$reg), predict_taken, L);
- __ delayed()->nop();
- %}
-
- enc_class enc_ba( Label labl ) %{
- MacroAssembler _masm(&cbuf);
- Label &L = *($labl$$label);
- __ ba(false, L);
- __ delayed()->nop();
- %}
-
- enc_class enc_bpr( Label labl, cmpOp_reg cmp, iRegI op1 ) %{
- MacroAssembler _masm(&cbuf);
- Label &L = *$labl$$label;
- Assembler::Predict predict_taken =
- cbuf.is_backward_branch(L) ? Assembler::pt : Assembler::pn;
-
- __ bpr( (Assembler::RCondition)($cmp$$cmpcode), false, predict_taken, as_Register($op1$$reg), L);
+ __ bpr( (Assembler::RCondition)($cmp$$cmpcode), false, predict_taken, as_Register($op1$$reg), *L);
__ delayed()->nop();
%}
@@ -2849,25 +2819,6 @@ enc_class Fast_Unlock(iRegP oop, iRegP box, o7RegP scratch, iRegP scratch2) %{
__ float_cmp( $primary, -1, Fsrc1, Fsrc2, Rdst);
%}
- // Compiler ensures base is doubleword aligned and cnt is count of doublewords
- enc_class enc_Clear_Array(iRegX cnt, iRegP base, iRegX temp) %{
- MacroAssembler _masm(&cbuf);
- Register nof_bytes_arg = reg_to_register_object($cnt$$reg);
- Register nof_bytes_tmp = reg_to_register_object($temp$$reg);
- Register base_pointer_arg = reg_to_register_object($base$$reg);
-
- Label loop;
- __ mov(nof_bytes_arg, nof_bytes_tmp);
-
- // Loop and clear, walking backwards through the array.
- // nof_bytes_tmp (if >0) is always the number of bytes to zero
- __ bind(loop);
- __ deccc(nof_bytes_tmp, 8);
- __ br(Assembler::greaterEqual, true, Assembler::pt, loop);
- __ delayed()-> stx(G0, base_pointer_arg, nof_bytes_tmp);
- // %%%% this mini-loop must not cross a cache boundary!
- %}
-
enc_class enc_String_Compare(o0RegP str1, o1RegP str2, g3RegI cnt1, g4RegI cnt2, notemp_iRegI result) %{
Label Ldone, Lloop;
@@ -2986,7 +2937,7 @@ enc_class enc_String_Equals(o0RegP str1, o1RegP str2, g3RegI cnt, notemp_iRegI r
__ brx(Assembler::equal, true, Assembler::pn, Ldone);
__ delayed()->add(G0, 1, result_reg);
- __ br_on_reg_cond(Assembler::rc_z, true, Assembler::pn, cnt_reg, Ldone);
+ __ cmp_zero_and_br(Assembler::zero, cnt_reg, Ldone, true, Assembler::pn);
__ delayed()->add(G0, 1, result_reg); // count == 0
//rename registers
@@ -3006,7 +2957,7 @@ enc_class enc_String_Equals(o0RegP str1, o1RegP str2, g3RegI cnt, notemp_iRegI r
// Compare char[] arrays aligned to 4 bytes.
__ char_arrays_equals(str1_reg, str2_reg, limit_reg, result_reg,
chr1_reg, chr2_reg, Ldone);
- __ ba(false,Ldone);
+ __ ba(Ldone);
__ delayed()->add(G0, 1, result_reg);
// char by char compare
@@ -3065,7 +3016,7 @@ enc_class enc_Array_Equals(o0RegP ary1, o1RegP ary2, g3RegP tmp1, notemp_iRegI r
__ br(Assembler::notEqual, true, Assembler::pn, Ldone);
__ delayed()->mov(G0, result_reg); // not equal
- __ br_on_reg_cond(Assembler::rc_z, true, Assembler::pn, tmp1_reg, Ldone);
+ __ cmp_zero_and_br(Assembler::zero, tmp1_reg, Ldone, true, Assembler::pn);
__ delayed()->add(G0, 1, result_reg); // zero-length arrays are equal
// load array addresses
@@ -3352,10 +3303,10 @@ op_attrib op_cost(1); // Required cost attribute
//----------Instruction Attributes---------------------------------------------
ins_attrib ins_cost(DEFAULT_COST); // Required cost attribute
-ins_attrib ins_size(32); // Required size attribute (in bits)
-ins_attrib ins_pc_relative(0); // Required PC Relative flag
-ins_attrib ins_short_branch(0); // Required flag: is this instruction a
- // non-matching short branch variant of some
+ins_attrib ins_size(32); // Required size attribute (in bits)
+ins_attrib ins_avoid_back_to_back(0); // instruction should not be generated back to back
+ins_attrib ins_short_branch(0); // Required flag: is this instruction a
+ // non-matching short branch variant of some
// long branch?
//----------OPERANDS-----------------------------------------------------------
@@ -3441,6 +3392,15 @@ operand immI11() %{
interface(CONST_INTER);
%}
+// Integer Immediate: 5-bit
+operand immI5() %{
+ predicate(Assembler::is_simm(n->get_int(), 5));
+ match(ConI);
+ op_cost(0);
+ format %{ %}
+ interface(CONST_INTER);
+%}
+
// Integer Immediate: 0-bit
operand immI0() %{
predicate(n->get_int() == 0);
@@ -3664,6 +3624,15 @@ operand immL0() %{
interface(CONST_INTER);
%}
+// Integer Immediate: 5-bit
+operand immL5() %{
+ predicate(n->get_long() == (int)n->get_long() && Assembler::is_simm((int)n->get_long(), 5));
+ match(ConL);
+ op_cost(0);
+ format %{ %}
+ interface(CONST_INTER);
+%}
+
// Long Immediate: 13-bit
operand immL13() %{
predicate((-4096L < n->get_long()) && (n->get_long() <= 4095L));
@@ -5196,6 +5165,42 @@ pipe_class br_reg(Universe br, cmpOp cmp, iRegI op1, label labl) %{
MS : R;
%}
+// Compare and branch
+pipe_class cmp_br_reg_reg(Universe br, cmpOp cmp, iRegI src1, iRegI src2, label labl, flagsReg cr) %{
+ instruction_count(2); has_delay_slot;
+ cr : E(write);
+ src1 : R(read);
+ src2 : R(read);
+ IALU : R;
+ BR : R;
+%}
+
+// Compare and branch
+pipe_class cmp_br_reg_imm(Universe br, cmpOp cmp, iRegI src1, immI13 src2, label labl, flagsReg cr) %{
+ instruction_count(2); has_delay_slot;
+ cr : E(write);
+ src1 : R(read);
+ IALU : R;
+ BR : R;
+%}
+
+// Compare and branch using cbcond
+pipe_class cbcond_reg_reg(Universe br, cmpOp cmp, iRegI src1, iRegI src2, label labl) %{
+ single_instruction;
+ src1 : E(read);
+ src2 : E(read);
+ IALU : R;
+ BR : R;
+%}
+
+// Compare and branch using cbcond
+pipe_class cbcond_reg_imm(Universe br, cmpOp cmp, iRegI src1, immI5 src2, label labl) %{
+ single_instruction;
+ src1 : E(read);
+ IALU : R;
+ BR : R;
+%}
+
pipe_class br_fcc(Universe br, cmpOpF cc, flagsReg cr, label labl) %{
single_instruction_with_delay_slot;
cr : E(read);
@@ -6251,6 +6256,7 @@ instruct loadConD(regD dst, immD con, o7RegI tmp) %{
instruct prefetchr( memory mem ) %{
match( PrefetchRead mem );
ins_cost(MEMORY_REF_COST);
+ size(4);
format %{ "PREFETCH $mem,0\t! Prefetch read-many" %}
opcode(Assembler::prefetch_op3);
@@ -6259,9 +6265,9 @@ instruct prefetchr( memory mem ) %{
%}
instruct prefetchw( memory mem ) %{
- predicate(AllocatePrefetchStyle != 3 );
match( PrefetchWrite mem );
ins_cost(MEMORY_REF_COST);
+ size(4);
format %{ "PREFETCH $mem,2\t! Prefetch write-many (and read)" %}
opcode(Assembler::prefetch_op3);
@@ -6269,24 +6275,62 @@ instruct prefetchw( memory mem ) %{
ins_pipe(iload_mem);
%}
-// Use BIS instruction to prefetch.
-instruct prefetchw_bis( memory mem ) %{
- predicate(AllocatePrefetchStyle == 3);
- match( PrefetchWrite mem );
+// Prefetch instructions for allocation.
+
+instruct prefetchAlloc( memory mem ) %{
+ predicate(AllocatePrefetchInstr == 0);
+ match( PrefetchAllocation mem );
+ ins_cost(MEMORY_REF_COST);
+ size(4);
+
+ format %{ "PREFETCH $mem,2\t! Prefetch allocation" %}
+ opcode(Assembler::prefetch_op3);
+ ins_encode( form3_mem_prefetch_write( mem ) );
+ ins_pipe(iload_mem);
+%}
+
+// Use BIS instruction to prefetch for allocation.
+// Could fault, need space at the end of TLAB.
+instruct prefetchAlloc_bis( iRegP dst ) %{
+ predicate(AllocatePrefetchInstr == 1);
+ match( PrefetchAllocation dst );
ins_cost(MEMORY_REF_COST);
+ size(4);
- format %{ "STXA G0,$mem\t! // Block initializing store" %}
+ format %{ "STXA [$dst]\t! // Prefetch allocation using BIS" %}
ins_encode %{
- Register base = as_Register($mem$$base);
- int disp = $mem$$disp;
- if (disp != 0) {
- __ add(base, AllocatePrefetchStepSize, base);
- }
- __ stxa(G0, base, G0, ASI_BLK_INIT_QUAD_LDD_P);
+ __ stxa(G0, $dst$$Register, G0, Assembler::ASI_ST_BLKINIT_PRIMARY);
%}
ins_pipe(istore_mem_reg);
%}
+// Next code is used for finding next cache line address to prefetch.
+#ifndef _LP64
+instruct cacheLineAdr( iRegP dst, iRegP src, immI13 mask ) %{
+ match(Set dst (CastX2P (AndI (CastP2X src) mask)));
+ ins_cost(DEFAULT_COST);
+ size(4);
+
+ format %{ "AND $src,$mask,$dst\t! next cache line address" %}
+ ins_encode %{
+ __ and3($src$$Register, $mask$$constant, $dst$$Register);
+ %}
+ ins_pipe(ialu_reg_imm);
+%}
+#else
+instruct cacheLineAdr( iRegP dst, iRegP src, immL13 mask ) %{
+ match(Set dst (CastX2P (AndL (CastP2X src) mask)));
+ ins_cost(DEFAULT_COST);
+ size(4);
+
+ format %{ "AND $src,$mask,$dst\t! next cache line address" %}
+ ins_encode %{
+ __ and3($src$$Register, $mask$$constant, $dst$$Register);
+ %}
+ ins_pipe(ialu_reg_imm);
+%}
+#endif
+
//----------Store Instructions-------------------------------------------------
// Store Byte
instruct storeB(memory mem, iRegI src) %{
@@ -6644,8 +6688,7 @@ instruct membar_acquire() %{
%}
instruct membar_acquire_lock() %{
- match(MemBarAcquire);
- predicate(Matcher::prior_fast_lock(n));
+ match(MemBarAcquireLock);
ins_cost(0);
size(0);
@@ -6665,8 +6708,7 @@ instruct membar_release() %{
%}
instruct membar_release_lock() %{
- match(MemBarRelease);
- predicate(Matcher::post_fast_unlock(n));
+ match(MemBarReleaseLock);
ins_cost(0);
size(0);
@@ -9220,7 +9262,6 @@ instruct jumpXtnd(iRegX switch_val, o7RegI table) %{
__ jmp(label_reg, G0);
__ delayed()->nop();
%}
- ins_pc_relative(1);
ins_pipe(ialu_reg_reg);
%}
@@ -9232,13 +9273,33 @@ instruct branch(label labl) %{
size(8);
ins_cost(BRANCH_COST);
format %{ "BA $labl" %}
- // Prim = bits 24-22, Secnd = bits 31-30, Tert = cond
- opcode(Assembler::br_op2, Assembler::branch_op, Assembler::always);
- ins_encode( enc_ba( labl ) );
- ins_pc_relative(1);
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ ba(*L);
+ __ delayed()->nop();
+ %}
ins_pipe(br);
%}
+// Direct Branch, short with no delay slot
+instruct branch_short(label labl) %{
+ match(Goto);
+ predicate(UseCBCond);
+ effect(USE labl);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "BA $labl\t! short branch" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ ba_short(*L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_imm);
+%}
+
// Conditional Direct Branch
instruct branchCon(cmpOp cmp, flagsReg icc, label labl) %{
match(If cmp icc);
@@ -9249,61 +9310,17 @@ instruct branchCon(cmpOp cmp, flagsReg icc, label labl) %{
format %{ "BP$cmp $icc,$labl" %}
// Prim = bits 24-22, Secnd = bits 31-30
ins_encode( enc_bp( labl, cmp, icc ) );
- ins_pc_relative(1);
ins_pipe(br_cc);
%}
-// Branch-on-register tests all 64 bits. We assume that values
-// in 64-bit registers always remains zero or sign extended
-// unless our code munges the high bits. Interrupts can chop
-// the high order bits to zero or sign at any time.
-instruct branchCon_regI(cmpOp_reg cmp, iRegI op1, immI0 zero, label labl) %{
- match(If cmp (CmpI op1 zero));
- predicate(can_branch_register(_kids[0]->_leaf, _kids[1]->_leaf));
- effect(USE labl);
-
- size(8);
- ins_cost(BRANCH_COST);
- format %{ "BR$cmp $op1,$labl" %}
- ins_encode( enc_bpr( labl, cmp, op1 ) );
- ins_pc_relative(1);
- ins_pipe(br_reg);
-%}
-
-instruct branchCon_regP(cmpOp_reg cmp, iRegP op1, immP0 null, label labl) %{
- match(If cmp (CmpP op1 null));
- predicate(can_branch_register(_kids[0]->_leaf, _kids[1]->_leaf));
- effect(USE labl);
-
- size(8);
- ins_cost(BRANCH_COST);
- format %{ "BR$cmp $op1,$labl" %}
- ins_encode( enc_bpr( labl, cmp, op1 ) );
- ins_pc_relative(1);
- ins_pipe(br_reg);
-%}
-
-instruct branchCon_regL(cmpOp_reg cmp, iRegL op1, immL0 zero, label labl) %{
- match(If cmp (CmpL op1 zero));
- predicate(can_branch_register(_kids[0]->_leaf, _kids[1]->_leaf));
- effect(USE labl);
-
- size(8);
- ins_cost(BRANCH_COST);
- format %{ "BR$cmp $op1,$labl" %}
- ins_encode( enc_bpr( labl, cmp, op1 ) );
- ins_pc_relative(1);
- ins_pipe(br_reg);
-%}
-
instruct branchConU(cmpOpU cmp, flagsRegU icc, label labl) %{
match(If cmp icc);
effect(USE labl);
+ ins_cost(BRANCH_COST);
format %{ "BP$cmp $icc,$labl" %}
// Prim = bits 24-22, Secnd = bits 31-30
ins_encode( enc_bp( labl, cmp, icc ) );
- ins_pc_relative(1);
ins_pipe(br_cc);
%}
@@ -9314,9 +9331,14 @@ instruct branchConP(cmpOpP cmp, flagsRegP pcc, label labl) %{
size(8);
ins_cost(BRANCH_COST);
format %{ "BP$cmp $pcc,$labl" %}
- // Prim = bits 24-22, Secnd = bits 31-30
- ins_encode( enc_bpx( labl, cmp, pcc ) );
- ins_pc_relative(1);
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+
+ __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::ptr_cc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
ins_pipe(br_cc);
%}
@@ -9327,9 +9349,14 @@ instruct branchConF(cmpOpF cmp, flagsRegF fcc, label labl) %{
size(8);
ins_cost(BRANCH_COST);
format %{ "FBP$cmp $fcc,$labl" %}
- // Prim = bits 24-22, Secnd = bits 31-30
- ins_encode( enc_fbp( labl, cmp, fcc ) );
- ins_pc_relative(1);
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+
+ __ fbp( (Assembler::Condition)($cmp$$cmpcode), false, (Assembler::CC)($fcc$$reg), predict_taken, *L);
+ __ delayed()->nop();
+ %}
ins_pipe(br_fcc);
%}
@@ -9342,7 +9369,6 @@ instruct branchLoopEnd(cmpOp cmp, flagsReg icc, label labl) %{
format %{ "BP$cmp $icc,$labl\t! Loop end" %}
// Prim = bits 24-22, Secnd = bits 31-30
ins_encode( enc_bp( labl, cmp, icc ) );
- ins_pc_relative(1);
ins_pipe(br_cc);
%}
@@ -9355,10 +9381,509 @@ instruct branchLoopEndU(cmpOpU cmp, flagsRegU icc, label labl) %{
format %{ "BP$cmp $icc,$labl\t! Loop end" %}
// Prim = bits 24-22, Secnd = bits 31-30
ins_encode( enc_bp( labl, cmp, icc ) );
- ins_pc_relative(1);
ins_pipe(br_cc);
%}
+// Compare and branch instructions
+instruct cmpI_reg_branch(cmpOp cmp, iRegI op1, iRegI op2, label labl, flagsReg icc) %{
+ match(If cmp (CmpI op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! int\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$Register);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpI_imm_branch(cmpOp cmp, iRegI op1, immI5 op2, label labl, flagsReg icc) %{
+ match(If cmp (CmpI op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! int\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$constant);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_imm);
+%}
+
+instruct cmpU_reg_branch(cmpOpU cmp, iRegI op1, iRegI op2, label labl, flagsRegU icc) %{
+ match(If cmp (CmpU op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! unsigned\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$Register);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpU_imm_branch(cmpOpU cmp, iRegI op1, immI5 op2, label labl, flagsRegU icc) %{
+ match(If cmp (CmpU op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! unsigned\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$constant);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_imm);
+%}
+
+instruct cmpL_reg_branch(cmpOp cmp, iRegL op1, iRegL op2, label labl, flagsRegL xcc) %{
+ match(If cmp (CmpL op1 op2));
+ effect(USE labl, KILL xcc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! long\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$Register);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpL_imm_branch(cmpOp cmp, iRegL op1, immL5 op2, label labl, flagsRegL xcc) %{
+ match(If cmp (CmpL op1 op2));
+ effect(USE labl, KILL xcc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! long\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$constant);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_imm);
+%}
+
+// Compare Pointers and branch
+instruct cmpP_reg_branch(cmpOpP cmp, iRegP op1, iRegP op2, label labl, flagsRegP pcc) %{
+ match(If cmp (CmpP op1 op2));
+ effect(USE labl, KILL pcc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! ptr\n\t"
+ "B$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$Register);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::ptr_cc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpP_null_branch(cmpOpP cmp, iRegP op1, immP0 null, label labl, flagsRegP pcc) %{
+ match(If cmp (CmpP op1 null));
+ effect(USE labl, KILL pcc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,0\t! ptr\n\t"
+ "B$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, G0);
+ // bpr() is not used here since it has shorter distance.
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::ptr_cc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpN_reg_branch(cmpOp cmp, iRegN op1, iRegN op2, label labl, flagsReg icc) %{
+ match(If cmp (CmpN op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! compressed ptr\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$Register);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpN_null_branch(cmpOp cmp, iRegN op1, immN0 null, label labl, flagsReg icc) %{
+ match(If cmp (CmpN op1 null));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,0\t! compressed ptr\n\t"
+ "BP$cmp $labl" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, G0);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+// Loop back branch
+instruct cmpI_reg_branchLoopEnd(cmpOp cmp, iRegI op1, iRegI op2, label labl, flagsReg icc) %{
+ match(CountedLoopEnd cmp (CmpI op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! int\n\t"
+ "BP$cmp $labl\t! Loop end" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$Register);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_reg);
+%}
+
+instruct cmpI_imm_branchLoopEnd(cmpOp cmp, iRegI op1, immI5 op2, label labl, flagsReg icc) %{
+ match(CountedLoopEnd cmp (CmpI op1 op2));
+ effect(USE labl, KILL icc);
+
+ size(12);
+ ins_cost(BRANCH_COST);
+ format %{ "CMP $op1,$op2\t! int\n\t"
+ "BP$cmp $labl\t! Loop end" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+ __ cmp($op1$$Register, $op2$$constant);
+ __ bp((Assembler::Condition)($cmp$$cmpcode), false, Assembler::icc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
+ ins_pipe(cmp_br_reg_imm);
+%}
+
+// Short compare and branch instructions
+instruct cmpI_reg_branch_short(cmpOp cmp, iRegI op1, iRegI op2, label labl, flagsReg icc) %{
+ match(If cmp (CmpI op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,$op2,$labl\t! int" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$Register, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpI_imm_branch_short(cmpOp cmp, iRegI op1, immI5 op2, label labl, flagsReg icc) %{
+ match(If cmp (CmpI op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,$op2,$labl\t! int" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$constant, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_imm);
+%}
+
+instruct cmpU_reg_branch_short(cmpOpU cmp, iRegI op1, iRegI op2, label labl, flagsRegU icc) %{
+ match(If cmp (CmpU op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,$op2,$labl\t! unsigned" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$Register, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpU_imm_branch_short(cmpOpU cmp, iRegI op1, immI5 op2, label labl, flagsRegU icc) %{
+ match(If cmp (CmpU op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,$op2,$labl\t! unsigned" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$constant, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_imm);
+%}
+
+instruct cmpL_reg_branch_short(cmpOp cmp, iRegL op1, iRegL op2, label labl, flagsRegL xcc) %{
+ match(If cmp (CmpL op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL xcc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CXB$cmp $op1,$op2,$labl\t! long" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::xcc, $op1$$Register, $op2$$Register, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpL_imm_branch_short(cmpOp cmp, iRegL op1, immL5 op2, label labl, flagsRegL xcc) %{
+ match(If cmp (CmpL op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL xcc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CXB$cmp $op1,$op2,$labl\t! long" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::xcc, $op1$$Register, $op2$$constant, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_imm);
+%}
+
+// Compare Pointers and branch
+instruct cmpP_reg_branch_short(cmpOpP cmp, iRegP op1, iRegP op2, label labl, flagsRegP pcc) %{
+ match(If cmp (CmpP op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL pcc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+#ifdef _LP64
+ format %{ "CXB$cmp $op1,$op2,$labl\t! ptr" %}
+#else
+ format %{ "CWB$cmp $op1,$op2,$labl\t! ptr" %}
+#endif
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::ptr_cc, $op1$$Register, $op2$$Register, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpP_null_branch_short(cmpOpP cmp, iRegP op1, immP0 null, label labl, flagsRegP pcc) %{
+ match(If cmp (CmpP op1 null));
+ predicate(UseCBCond);
+ effect(USE labl, KILL pcc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+#ifdef _LP64
+ format %{ "CXB$cmp $op1,0,$labl\t! ptr" %}
+#else
+ format %{ "CWB$cmp $op1,0,$labl\t! ptr" %}
+#endif
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::ptr_cc, $op1$$Register, G0, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpN_reg_branch_short(cmpOp cmp, iRegN op1, iRegN op2, label labl, flagsReg icc) %{
+ match(If cmp (CmpN op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,op2,$labl\t! compressed ptr" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$Register, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpN_null_branch_short(cmpOp cmp, iRegN op1, immN0 null, label labl, flagsReg icc) %{
+ match(If cmp (CmpN op1 null));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,0,$labl\t! compressed ptr" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, G0, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+// Loop back branch
+instruct cmpI_reg_branchLoopEnd_short(cmpOp cmp, iRegI op1, iRegI op2, label labl, flagsReg icc) %{
+ match(CountedLoopEnd cmp (CmpI op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,$op2,$labl\t! Loop end" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$Register, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_reg);
+%}
+
+instruct cmpI_imm_branchLoopEnd_short(cmpOp cmp, iRegI op1, immI5 op2, label labl, flagsReg icc) %{
+ match(CountedLoopEnd cmp (CmpI op1 op2));
+ predicate(UseCBCond);
+ effect(USE labl, KILL icc);
+
+ size(4);
+ ins_cost(BRANCH_COST);
+ format %{ "CWB$cmp $op1,$op2,$labl\t! Loop end" %}
+ ins_encode %{
+ Label* L = $labl$$label;
+ assert(__ use_cbcond(*L), "back to back cbcond");
+ __ cbcond((Assembler::Condition)($cmp$$cmpcode), Assembler::icc, $op1$$Register, $op2$$constant, *L);
+ %}
+ ins_short_branch(1);
+ ins_avoid_back_to_back(1);
+ ins_pipe(cbcond_reg_imm);
+%}
+
+// Branch-on-register tests all 64 bits. We assume that values
+// in 64-bit registers always remains zero or sign extended
+// unless our code munges the high bits. Interrupts can chop
+// the high order bits to zero or sign at any time.
+instruct branchCon_regI(cmpOp_reg cmp, iRegI op1, immI0 zero, label labl) %{
+ match(If cmp (CmpI op1 zero));
+ predicate(can_branch_register(_kids[0]->_leaf, _kids[1]->_leaf));
+ effect(USE labl);
+
+ size(8);
+ ins_cost(BRANCH_COST);
+ format %{ "BR$cmp $op1,$labl" %}
+ ins_encode( enc_bpr( labl, cmp, op1 ) );
+ ins_pipe(br_reg);
+%}
+
+instruct branchCon_regP(cmpOp_reg cmp, iRegP op1, immP0 null, label labl) %{
+ match(If cmp (CmpP op1 null));
+ predicate(can_branch_register(_kids[0]->_leaf, _kids[1]->_leaf));
+ effect(USE labl);
+
+ size(8);
+ ins_cost(BRANCH_COST);
+ format %{ "BR$cmp $op1,$labl" %}
+ ins_encode( enc_bpr( labl, cmp, op1 ) );
+ ins_pipe(br_reg);
+%}
+
+instruct branchCon_regL(cmpOp_reg cmp, iRegL op1, immL0 zero, label labl) %{
+ match(If cmp (CmpL op1 zero));
+ predicate(can_branch_register(_kids[0]->_leaf, _kids[1]->_leaf));
+ effect(USE labl);
+
+ size(8);
+ ins_cost(BRANCH_COST);
+ format %{ "BR$cmp $op1,$labl" %}
+ ins_encode( enc_bpr( labl, cmp, op1 ) );
+ ins_pipe(br_reg);
+%}
+
+
// ============================================================================
// Long Compare
//
@@ -9387,9 +9912,14 @@ instruct branchCon_long(cmpOp cmp, flagsRegL xcc, label labl) %{
size(8);
ins_cost(BRANCH_COST);
format %{ "BP$cmp $xcc,$labl" %}
- // Prim = bits 24-22, Secnd = bits 31-30
- ins_encode( enc_bpl( labl, cmp, xcc ) );
- ins_pc_relative(1);
+ ins_encode %{
+ Label* L = $labl$$label;
+ Assembler::Predict predict_taken =
+ cbuf.is_backward_branch(*L) ? Assembler::pt : Assembler::pn;
+
+ __ bp( (Assembler::Condition)($cmp$$cmpcode), false, Assembler::xcc, predict_taken, *L);
+ __ delayed()->nop();
+ %}
ins_pipe(br_cc);
%}
@@ -9517,7 +10047,6 @@ instruct CallStaticJavaDirect( method meth ) %{
ins_cost(CALL_COST);
format %{ "CALL,static ; NOP ==> " %}
ins_encode( Java_Static_Call( meth ), call_epilog );
- ins_pc_relative(1);
ins_pipe(simple_call);
%}
@@ -9527,11 +10056,10 @@ instruct CallStaticJavaHandle(method meth, l7RegP l7_mh_SP_save) %{
predicate(((CallStaticJavaNode*)n)->is_method_handle_invoke());
effect(USE meth, KILL l7_mh_SP_save);
- size(8);
+ size(16);
ins_cost(CALL_COST);
format %{ "CALL,static/MethodHandle" %}
ins_encode(preserve_SP, Java_Static_Call(meth), restore_SP, call_epilog);
- ins_pc_relative(1);
ins_pipe(simple_call);
%}
@@ -9544,7 +10072,6 @@ instruct CallDynamicJavaDirect( method meth ) %{
format %{ "SET (empty),R_G5\n\t"
"CALL,dynamic ; NOP ==> " %}
ins_encode( Java_Dynamic_Call( meth ), call_epilog );
- ins_pc_relative(1);
ins_pipe(call);
%}
@@ -9556,7 +10083,6 @@ instruct CallRuntimeDirect(method meth, l7RegP l7) %{
format %{ "CALL,runtime" %}
ins_encode( Java_To_Runtime( meth ),
call_epilog, adjust_long_from_native_call );
- ins_pc_relative(1);
ins_pipe(simple_call);
%}
@@ -9569,7 +10095,6 @@ instruct CallLeafDirect(method meth, l7RegP l7) %{
ins_encode( Java_To_Runtime( meth ),
call_epilog,
adjust_long_from_native_call );
- ins_pc_relative(1);
ins_pipe(simple_call);
%}
@@ -9582,7 +10107,6 @@ instruct CallLeafNoFPDirect(method meth, l7RegP l7) %{
ins_encode( Java_To_Runtime( meth ),
call_epilog,
adjust_long_from_native_call );
- ins_pc_relative(1);
ins_pipe(simple_call);
%}
@@ -9707,7 +10231,6 @@ instruct cmpFastLock(flagsRegP pcc, iRegP object, iRegP box, iRegP scratch2, o7R
effect(KILL scratch, TEMP scratch2);
ins_cost(100);
- size(4*112); // conservative overestimation ...
format %{ "FASTLOCK $object, $box; KILL $scratch, $scratch2, $box" %}
ins_encode( Fast_Lock(object, box, scratch, scratch2) );
ins_pipe(long_memory_op);
@@ -9719,15 +10242,14 @@ instruct cmpFastUnlock(flagsRegP pcc, iRegP object, iRegP box, iRegP scratch2, o
effect(KILL scratch, TEMP scratch2);
ins_cost(100);
- size(4*120); // conservative overestimation ...
format %{ "FASTUNLOCK $object, $box; KILL $scratch, $scratch2, $box" %}
ins_encode( Fast_Unlock(object, box, scratch, scratch2) );
ins_pipe(long_memory_op);
%}
-// Count and Base registers are fixed because the allocator cannot
-// kill unknown registers. The encodings are generic.
+// The encodings are generic.
instruct clear_array(iRegX cnt, iRegP base, iRegX temp, Universe dummy, flagsReg ccr) %{
+ predicate(!use_block_zeroing(n->in(2)) );
match(Set dummy (ClearArray cnt base));
effect(TEMP temp, KILL ccr);
ins_cost(300);
@@ -9735,7 +10257,71 @@ instruct clear_array(iRegX cnt, iRegP base, iRegX temp, Universe dummy, flagsReg
"loop: SUBcc $temp,8,$temp\t! Count down a dword of bytes\n"
" BRge loop\t\t! Clearing loop\n"
" STX G0,[$base+$temp]\t! delay slot" %}
- ins_encode( enc_Clear_Array(cnt, base, temp) );
+
+ ins_encode %{
+ // Compiler ensures base is doubleword aligned and cnt is count of doublewords
+ Register nof_bytes_arg = $cnt$$Register;
+ Register nof_bytes_tmp = $temp$$Register;
+ Register base_pointer_arg = $base$$Register;
+
+ Label loop;
+ __ mov(nof_bytes_arg, nof_bytes_tmp);
+
+ // Loop and clear, walking backwards through the array.
+ // nof_bytes_tmp (if >0) is always the number of bytes to zero
+ __ bind(loop);
+ __ deccc(nof_bytes_tmp, 8);
+ __ br(Assembler::greaterEqual, true, Assembler::pt, loop);
+ __ delayed()-> stx(G0, base_pointer_arg, nof_bytes_tmp);
+ // %%%% this mini-loop must not cross a cache boundary!
+ %}
+ ins_pipe(long_memory_op);
+%}
+
+instruct clear_array_bis(g1RegX cnt, o0RegP base, Universe dummy, flagsReg ccr) %{
+ predicate(use_block_zeroing(n->in(2)));
+ match(Set dummy (ClearArray cnt base));
+ effect(USE_KILL cnt, USE_KILL base, KILL ccr);
+ ins_cost(300);
+ format %{ "CLEAR [$base, $cnt]\t! ClearArray" %}
+
+ ins_encode %{
+
+ assert(MinObjAlignmentInBytes >= BytesPerLong, "need alternate implementation");
+ Register to = $base$$Register;
+ Register count = $cnt$$Register;
+
+ Label Ldone;
+ __ nop(); // Separate short branches
+ // Use BIS for zeroing (temp is not used).
+ __ bis_zeroing(to, count, G0, Ldone);
+ __ bind(Ldone);
+
+ %}
+ ins_pipe(long_memory_op);
+%}
+
+instruct clear_array_bis_2(g1RegX cnt, o0RegP base, iRegX tmp, Universe dummy, flagsReg ccr) %{
+ predicate(use_block_zeroing(n->in(2)) && !Assembler::is_simm13((int)BlockZeroingLowLimit));
+ match(Set dummy (ClearArray cnt base));
+ effect(TEMP tmp, USE_KILL cnt, USE_KILL base, KILL ccr);
+ ins_cost(300);
+ format %{ "CLEAR [$base, $cnt]\t! ClearArray" %}
+
+ ins_encode %{
+
+ assert(MinObjAlignmentInBytes >= BytesPerLong, "need alternate implementation");
+ Register to = $base$$Register;
+ Register count = $cnt$$Register;
+ Register temp = $tmp$$Register;
+
+ Label Ldone;
+ __ nop(); // Separate short branches
+ // Use BIS for zeroing
+ __ bis_zeroing(to, count, temp, Ldone);
+ __ bind(Ldone);
+
+ %}
ins_pipe(long_memory_op);
%}
diff --git a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp
index 69ed909..9415c7b 100644
--- a/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/stubGenerator_sparc.cpp
@@ -150,8 +150,7 @@ class StubGenerator: public StubCodeGenerator {
{ const Register t = G3_scratch;
Label L;
__ ld_ptr(G2_thread, in_bytes(Thread::pending_exception_offset()), t);
- __ br_null(t, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_null_short(t, Assembler::pt, L);
__ stop("StubRoutines::call_stub: entered with pending exception");
__ bind(L);
}
@@ -207,8 +206,7 @@ class StubGenerator: public StubCodeGenerator {
Label exit;
__ ld_ptr(parameter_size.as_in().as_address(), cnt); // parameter counter
__ add( FP, STACK_BIAS, dst );
- __ tst(cnt);
- __ br(Assembler::zero, false, Assembler::pn, exit);
+ __ cmp_zero_and_br(Assembler::zero, cnt, exit);
__ delayed()->sub(dst, BytesPerWord, dst); // setup Lentry_args
// copy parameters if any
@@ -282,20 +280,20 @@ class StubGenerator: public StubCodeGenerator {
__ delayed()->restore();
__ BIND(is_object);
- __ ba(false, exit);
+ __ ba(exit);
__ delayed()->st_ptr(O0, addr, G0);
__ BIND(is_float);
- __ ba(false, exit);
+ __ ba(exit);
__ delayed()->stf(FloatRegisterImpl::S, F0, addr, G0);
__ BIND(is_double);
- __ ba(false, exit);
+ __ ba(exit);
__ delayed()->stf(FloatRegisterImpl::D, F0, addr, G0);
__ BIND(is_long);
#ifdef _LP64
- __ ba(false, exit);
+ __ ba(exit);
__ delayed()->st_long(O0, addr, G0); // store entire long
#else
#if defined(COMPILER2)
@@ -307,11 +305,11 @@ class StubGenerator: public StubCodeGenerator {
// do this here. Unfortunately if we did a rethrow we'd see an machepilog node
// first which would move g1 -> O0/O1 and destroy the exception we were throwing.
- __ ba(false, exit);
+ __ ba(exit);
__ delayed()->stx(G1, addr, G0); // store entire long
#else
__ st(O1, addr, BytesPerInt);
- __ ba(false, exit);
+ __ ba(exit);
__ delayed()->st(O0, addr, G0);
#endif /* COMPILER2 */
#endif /* _LP64 */
@@ -382,8 +380,7 @@ class StubGenerator: public StubCodeGenerator {
// make sure that this code is only executed if there is a pending exception
{ Label L;
__ ld_ptr(exception_addr, Gtemp);
- __ br_notnull(Gtemp, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(Gtemp, Assembler::pt, L);
__ stop("StubRoutines::forward exception: no pending exception (1)");
__ bind(L);
}
@@ -406,8 +403,7 @@ class StubGenerator: public StubCodeGenerator {
#ifdef ASSERT
// make sure exception is set
{ Label L;
- __ br_notnull(Oexception, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(Oexception, Assembler::pt, L);
__ stop("StubRoutines::forward exception: no pending exception (2)");
__ bind(L);
}
@@ -440,7 +436,7 @@ class StubGenerator: public StubCodeGenerator {
#undef __
#define __ masm->
- address generate_throw_exception(const char* name, address runtime_entry, bool restore_saved_exception_pc,
+ address generate_throw_exception(const char* name, address runtime_entry,
Register arg1 = noreg, Register arg2 = noreg) {
#ifdef ASSERT
int insts_size = VerifyThread ? 1 * K : 600;
@@ -466,11 +462,6 @@ class StubGenerator: public StubCodeGenerator {
int frame_complete = __ offset();
- if (restore_saved_exception_pc) {
- __ ld_ptr(G2_thread, JavaThread::saved_exception_pc_offset(), I7);
- __ sub(I7, frame::pc_return_offset, I7);
- }
-
// Note that we always have a runtime stub frame on the top of stack by this point
Register last_java_sp = SP;
// 64-bit last_java_sp is biased!
@@ -501,8 +492,7 @@ class StubGenerator: public StubCodeGenerator {
Address exception_addr(G2_thread, Thread::pending_exception_offset());
Register scratch_reg = Gtemp;
__ ld_ptr(exception_addr, scratch_reg);
- __ br_notnull(scratch_reg, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(scratch_reg, Assembler::pt, L);
__ should_not_reach_here();
__ bind(L);
#endif // ASSERT
@@ -614,9 +604,7 @@ class StubGenerator: public StubCodeGenerator {
__ mov(G0,yield_reg);
__ BIND(retry);
- __ cmp(yield_reg, V8AtomicOperationUnderLockSpinCount);
- __ br(Assembler::less, false, Assembler::pt, dontyield);
- __ delayed()->nop();
+ __ cmp_and_br_short(yield_reg, V8AtomicOperationUnderLockSpinCount, Assembler::less, Assembler::pt, dontyield);
// This code can only be called from inside the VM, this
// stub is only invoked from Atomic::add(). We do not
@@ -676,9 +664,7 @@ class StubGenerator: public StubCodeGenerator {
// try to replace O2 with O3
__ cas_under_lock(O1, O2, O3,
(address)StubRoutines::Sparc::atomic_memory_operation_lock_addr(),false);
- __ cmp(O2, O3);
- __ br(Assembler::notEqual, false, Assembler::pn, retry);
- __ delayed()->nop();
+ __ cmp_and_br_short(O2, O3, Assembler::notEqual, Assembler::pn, retry);
__ retl(false);
__ delayed()->mov(O2, O0); // report previous value to caller
@@ -798,11 +784,9 @@ class StubGenerator: public StubCodeGenerator {
__ BIND(retry);
__ lduw(O1, 0, O2);
- __ add(O0, O2, O3);
- __ cas(O1, O2, O3);
- __ cmp( O2, O3);
- __ br(Assembler::notEqual, false, Assembler::pn, retry);
- __ delayed()->nop();
+ __ add(O0, O2, O3);
+ __ cas(O1, O2, O3);
+ __ cmp_and_br_short(O2, O3, Assembler::notEqual, Assembler::pn, retry);
__ retl(false);
__ delayed()->add(O0, O2, O0); // note that cas made O2==O3
} else {
@@ -1135,6 +1119,126 @@ class StubGenerator: public StubCodeGenerator {
}
}
+ //
+ // Generate main code for disjoint arraycopy
+ //
+ typedef void (StubGenerator::*CopyLoopFunc)(Register from, Register to, Register count, int count_dec,
+ Label& L_loop, bool use_prefetch, bool use_bis);
+
+ void disjoint_copy_core(Register from, Register to, Register count, int log2_elem_size,
+ int iter_size, CopyLoopFunc copy_loop_func) {
+ Label L_copy;
+
+ assert(log2_elem_size <= 3, "the following code should be changed");
+ int count_dec = 16>>log2_elem_size;
+
+ int prefetch_dist = MAX2(ArraycopySrcPrefetchDistance, ArraycopyDstPrefetchDistance);
+ assert(prefetch_dist < 4096, "invalid value");
+ prefetch_dist = (prefetch_dist + (iter_size-1)) & (-iter_size); // round up to one iteration copy size
+ int prefetch_count = (prefetch_dist >> log2_elem_size); // elements count
+
+ if (UseBlockCopy) {
+ Label L_block_copy, L_block_copy_prefetch, L_skip_block_copy;
+
+ // 64 bytes tail + bytes copied in one loop iteration
+ int tail_size = 64 + iter_size;
+ int block_copy_count = (MAX2(tail_size, (int)BlockCopyLowLimit)) >> log2_elem_size;
+ // Use BIS copy only for big arrays since it requires membar.
+ __ set(block_copy_count, O4);
+ __ cmp_and_br_short(count, O4, Assembler::lessUnsigned, Assembler::pt, L_skip_block_copy);
+ // This code is for disjoint source and destination:
+ // to <= from || to >= from+count
+ // but BIS will stomp over 'from' if (to > from-tail_size && to <= from)
+ __ sub(from, to, O4);
+ __ srax(O4, 4, O4); // divide by 16 since following short branch have only 5 bits for imm.
+ __ cmp_and_br_short(O4, (tail_size>>4), Assembler::lessEqualUnsigned, Assembler::pn, L_skip_block_copy);
+
+ __ wrasi(G0, Assembler::ASI_ST_BLKINIT_PRIMARY);
+ // BIS should not be used to copy tail (64 bytes+iter_size)
+ // to avoid zeroing of following values.
+ __ sub(count, (tail_size>>log2_elem_size), count); // count is still positive >= 0
+
+ if (prefetch_count > 0) { // rounded up to one iteration count
+ // Do prefetching only if copy size is bigger
+ // than prefetch distance.
+ __ set(prefetch_count, O4);
+ __ cmp_and_brx_short(count, O4, Assembler::less, Assembler::pt, L_block_copy);
+ __ sub(count, prefetch_count, count);
+
+ (this->*copy_loop_func)(from, to, count, count_dec, L_block_copy_prefetch, true, true);
+ __ add(count, prefetch_count, count); // restore count
+
+ } // prefetch_count > 0
+
+ (this->*copy_loop_func)(from, to, count, count_dec, L_block_copy, false, true);
+ __ add(count, (tail_size>>log2_elem_size), count); // restore count
+
+ __ wrasi(G0, Assembler::ASI_PRIMARY_NOFAULT);
+ // BIS needs membar.
+ __ membar(Assembler::StoreLoad);
+ // Copy tail
+ __ ba_short(L_copy);
+
+ __ BIND(L_skip_block_copy);
+ } // UseBlockCopy
+
+ if (prefetch_count > 0) { // rounded up to one iteration count
+ // Do prefetching only if copy size is bigger
+ // than prefetch distance.
+ __ set(prefetch_count, O4);
+ __ cmp_and_brx_short(count, O4, Assembler::lessUnsigned, Assembler::pt, L_copy);
+ __ sub(count, prefetch_count, count);
+
+ Label L_copy_prefetch;
+ (this->*copy_loop_func)(from, to, count, count_dec, L_copy_prefetch, true, false);
+ __ add(count, prefetch_count, count); // restore count
+
+ } // prefetch_count > 0
+
+ (this->*copy_loop_func)(from, to, count, count_dec, L_copy, false, false);
+ }
+
+
+
+ //
+ // Helper methods for copy_16_bytes_forward_with_shift()
+ //
+ void copy_16_bytes_shift_loop(Register from, Register to, Register count, int count_dec,
+ Label& L_loop, bool use_prefetch, bool use_bis) {
+
+ const Register left_shift = G1; // left shift bit counter
+ const Register right_shift = G5; // right shift bit counter
+
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loop);
+ if (use_prefetch) {
+ if (ArraycopySrcPrefetchDistance > 0) {
+ __ prefetch(from, ArraycopySrcPrefetchDistance, Assembler::severalReads);
+ }
+ if (ArraycopyDstPrefetchDistance > 0) {
+ __ prefetch(to, ArraycopyDstPrefetchDistance, Assembler::severalWritesAndPossiblyReads);
+ }
+ }
+ __ ldx(from, 0, O4);
+ __ ldx(from, 8, G4);
+ __ inc(to, 16);
+ __ inc(from, 16);
+ __ deccc(count, count_dec); // Can we do next iteration after this one?
+ __ srlx(O4, right_shift, G3);
+ __ bset(G3, O3);
+ __ sllx(O4, left_shift, O4);
+ __ srlx(G4, right_shift, G3);
+ __ bset(G3, O4);
+ if (use_bis) {
+ __ stxa(O3, to, -16);
+ __ stxa(O4, to, -8);
+ } else {
+ __ stx(O3, to, -16);
+ __ stx(O4, to, -8);
+ }
+ __ brx(Assembler::greaterEqual, false, Assembler::pt, L_loop);
+ __ delayed()->sllx(G4, left_shift, O3);
+ }
// Copy big chunks forward with shift
//
@@ -1146,64 +1250,51 @@ class StubGenerator: public StubCodeGenerator {
// L_copy_bytes - copy exit label
//
void copy_16_bytes_forward_with_shift(Register from, Register to,
- Register count, int count_dec, Label& L_copy_bytes) {
- Label L_loop, L_aligned_copy, L_copy_last_bytes;
+ Register count, int log2_elem_size, Label& L_copy_bytes) {
+ Label L_aligned_copy, L_copy_last_bytes;
+ assert(log2_elem_size <= 3, "the following code should be changed");
+ int count_dec = 16>>log2_elem_size;
// if both arrays have the same alignment mod 8, do 8 bytes aligned copy
- __ andcc(from, 7, G1); // misaligned bytes
- __ br(Assembler::zero, false, Assembler::pt, L_aligned_copy);
- __ delayed()->nop();
+ __ andcc(from, 7, G1); // misaligned bytes
+ __ br(Assembler::zero, false, Assembler::pt, L_aligned_copy);
+ __ delayed()->nop();
const Register left_shift = G1; // left shift bit counter
const Register right_shift = G5; // right shift bit counter
- __ sll(G1, LogBitsPerByte, left_shift);
- __ mov(64, right_shift);
- __ sub(right_shift, left_shift, right_shift);
+ __ sll(G1, LogBitsPerByte, left_shift);
+ __ mov(64, right_shift);
+ __ sub(right_shift, left_shift, right_shift);
//
// Load 2 aligned 8-bytes chunks and use one from previous iteration
// to form 2 aligned 8-bytes chunks to store.
//
- __ deccc(count, count_dec); // Pre-decrement 'count'
- __ andn(from, 7, from); // Align address
- __ ldx(from, 0, O3);
- __ inc(from, 8);
- __ align(OptoLoopAlignment);
- __ BIND(L_loop);
- __ ldx(from, 0, O4);
- __ deccc(count, count_dec); // Can we do next iteration after this one?
- __ ldx(from, 8, G4);
- __ inc(to, 16);
- __ inc(from, 16);
- __ sllx(O3, left_shift, O3);
- __ srlx(O4, right_shift, G3);
- __ bset(G3, O3);
- __ stx(O3, to, -16);
- __ sllx(O4, left_shift, O4);
- __ srlx(G4, right_shift, G3);
- __ bset(G3, O4);
- __ stx(O4, to, -8);
- __ brx(Assembler::greaterEqual, false, Assembler::pt, L_loop);
- __ delayed()->mov(G4, O3);
-
- __ inccc(count, count_dec>>1 ); // + 8 bytes
- __ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
- __ delayed()->inc(count, count_dec>>1); // restore 'count'
-
- // copy 8 bytes, part of them already loaded in O3
- __ ldx(from, 0, O4);
- __ inc(to, 8);
- __ inc(from, 8);
- __ sllx(O3, left_shift, O3);
- __ srlx(O4, right_shift, G3);
- __ bset(O3, G3);
- __ stx(G3, to, -8);
+ __ dec(count, count_dec); // Pre-decrement 'count'
+ __ andn(from, 7, from); // Align address
+ __ ldx(from, 0, O3);
+ __ inc(from, 8);
+ __ sllx(O3, left_shift, O3);
+
+ disjoint_copy_core(from, to, count, log2_elem_size, 16, copy_16_bytes_shift_loop);
+
+ __ inccc(count, count_dec>>1 ); // + 8 bytes
+ __ brx(Assembler::negative, true, Assembler::pn, L_copy_last_bytes);
+ __ delayed()->inc(count, count_dec>>1); // restore 'count'
+
+ // copy 8 bytes, part of them already loaded in O3
+ __ ldx(from, 0, O4);
+ __ inc(to, 8);
+ __ inc(from, 8);
+ __ srlx(O4, right_shift, G3);
+ __ bset(O3, G3);
+ __ stx(G3, to, -8);
__ BIND(L_copy_last_bytes);
- __ srl(right_shift, LogBitsPerByte, right_shift); // misaligned bytes
- __ br(Assembler::always, false, Assembler::pt, L_copy_bytes);
- __ delayed()->sub(from, right_shift, from); // restore address
+ __ srl(right_shift, LogBitsPerByte, right_shift); // misaligned bytes
+ __ br(Assembler::always, false, Assembler::pt, L_copy_bytes);
+ __ delayed()->sub(from, right_shift, from); // restore address
__ BIND(L_aligned_copy);
}
@@ -1359,7 +1450,7 @@ class StubGenerator: public StubCodeGenerator {
// The compare above (count >= 23) guarantes 'count' >= 16 bytes.
// Also jump over aligned copy after the copy with shift completed.
- copy_16_bytes_forward_with_shift(from, to, count, 16, L_copy_byte);
+ copy_16_bytes_forward_with_shift(from, to, count, 0, L_copy_byte);
}
// Both array are 8 bytes aligned, copy 16 bytes at a time
@@ -1370,8 +1461,7 @@ class StubGenerator: public StubCodeGenerator {
// copy tailing bytes
__ BIND(L_copy_byte);
- __ br_zero(Assembler::zero, false, Assembler::pt, count, L_exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(count, 0, Assembler::equal, Assembler::pt, L_exit);
__ align(OptoLoopAlignment);
__ BIND(L_copy_byte_loop);
__ ldub(from, offset, O3);
@@ -1482,8 +1572,7 @@ class StubGenerator: public StubCodeGenerator {
// copy 1 element (2 bytes) at a time
__ BIND(L_copy_byte);
- __ br_zero(Assembler::zero, false, Assembler::pt, count, L_exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(count, 0, Assembler::equal, Assembler::pt, L_exit);
__ align(OptoLoopAlignment);
__ BIND(L_copy_byte_loop);
__ dec(end_from);
@@ -1589,7 +1678,7 @@ class StubGenerator: public StubCodeGenerator {
// The compare above (count >= 11) guarantes 'count' >= 16 bytes.
// Also jump over aligned copy after the copy with shift completed.
- copy_16_bytes_forward_with_shift(from, to, count, 8, L_copy_2_bytes);
+ copy_16_bytes_forward_with_shift(from, to, count, 1, L_copy_2_bytes);
}
// Both array are 8 bytes aligned, copy 16 bytes at a time
@@ -1600,8 +1689,7 @@ class StubGenerator: public StubCodeGenerator {
// copy 1 element at a time
__ BIND(L_copy_2_bytes);
- __ br_zero(Assembler::zero, false, Assembler::pt, count, L_exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(count, 0, Assembler::equal, Assembler::pt, L_exit);
__ align(OptoLoopAlignment);
__ BIND(L_copy_2_bytes_loop);
__ lduh(from, offset, O3);
@@ -1946,8 +2034,7 @@ class StubGenerator: public StubCodeGenerator {
// copy 1 element (2 bytes) at a time
__ BIND(L_copy_2_bytes);
- __ br_zero(Assembler::zero, false, Assembler::pt, count, L_exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(count, 0, Assembler::equal, Assembler::pt, L_exit);
__ BIND(L_copy_2_bytes_loop);
__ dec(end_from, 2);
__ dec(end_to, 2);
@@ -1965,6 +2052,45 @@ class StubGenerator: public StubCodeGenerator {
}
//
+ // Helper methods for generate_disjoint_int_copy_core()
+ //
+ void copy_16_bytes_loop(Register from, Register to, Register count, int count_dec,
+ Label& L_loop, bool use_prefetch, bool use_bis) {
+
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loop);
+ if (use_prefetch) {
+ if (ArraycopySrcPrefetchDistance > 0) {
+ __ prefetch(from, ArraycopySrcPrefetchDistance, Assembler::severalReads);
+ }
+ if (ArraycopyDstPrefetchDistance > 0) {
+ __ prefetch(to, ArraycopyDstPrefetchDistance, Assembler::severalWritesAndPossiblyReads);
+ }
+ }
+ __ ldx(from, 4, O4);
+ __ ldx(from, 12, G4);
+ __ inc(to, 16);
+ __ inc(from, 16);
+ __ deccc(count, 4); // Can we do next iteration after this one?
+
+ __ srlx(O4, 32, G3);
+ __ bset(G3, O3);
+ __ sllx(O4, 32, O4);
+ __ srlx(G4, 32, G3);
+ __ bset(G3, O4);
+ if (use_bis) {
+ __ stxa(O3, to, -16);
+ __ stxa(O4, to, -8);
+ } else {
+ __ stx(O3, to, -16);
+ __ stx(O4, to, -8);
+ }
+ __ brx(Assembler::greaterEqual, false, Assembler::pt, L_loop);
+ __ delayed()->sllx(G4, 32, O3);
+
+ }
+
+ //
// Generate core code for disjoint int copy (and oop copy on 32-bit).
// If "aligned" is true, the "from" and "to" addresses are assumed
// to be heapword aligned.
@@ -1977,7 +2103,7 @@ class StubGenerator: public StubCodeGenerator {
void generate_disjoint_int_copy_core(bool aligned) {
Label L_skip_alignment, L_aligned_copy;
- Label L_copy_16_bytes, L_copy_4_bytes, L_copy_4_bytes_loop, L_exit;
+ Label L_copy_4_bytes, L_copy_4_bytes_loop, L_exit;
const Register from = O0; // source array address
const Register to = O1; // destination array address
@@ -2028,30 +2154,16 @@ class StubGenerator: public StubCodeGenerator {
// copy with shift 4 elements (16 bytes) at a time
__ dec(count, 4); // The cmp at the beginning guaranty count >= 4
+ __ sllx(O3, 32, O3);
- __ align(OptoLoopAlignment);
- __ BIND(L_copy_16_bytes);
- __ ldx(from, 4, O4);
- __ deccc(count, 4); // Can we do next iteration after this one?
- __ ldx(from, 12, G4);
- __ inc(to, 16);
- __ inc(from, 16);
- __ sllx(O3, 32, O3);
- __ srlx(O4, 32, G3);
- __ bset(G3, O3);
- __ stx(O3, to, -16);
- __ sllx(O4, 32, O4);
- __ srlx(G4, 32, G3);
- __ bset(G3, O4);
- __ stx(O4, to, -8);
- __ brx(Assembler::greaterEqual, false, Assembler::pt, L_copy_16_bytes);
- __ delayed()->mov(G4, O3);
+ disjoint_copy_core(from, to, count, 2, 16, copy_16_bytes_loop);
__ br(Assembler::always, false, Assembler::pt, L_copy_4_bytes);
__ delayed()->inc(count, 4); // restore 'count'
__ BIND(L_aligned_copy);
- }
+ } // !aligned
+
// copy 4 elements (16 bytes) at a time
__ and3(count, 1, G4); // Save
__ srl(count, 1, count);
@@ -2060,8 +2172,7 @@ class StubGenerator: public StubCodeGenerator {
// copy 1 element at a time
__ BIND(L_copy_4_bytes);
- __ br_zero(Assembler::zero, false, Assembler::pt, count, L_exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(count, 0, Assembler::equal, Assembler::pt, L_exit);
__ BIND(L_copy_4_bytes_loop);
__ ld(from, offset, O3);
__ deccc(count);
@@ -2193,8 +2304,7 @@ class StubGenerator: public StubCodeGenerator {
// copy 1 element (4 bytes) at a time
__ BIND(L_copy_4_bytes);
- __ br_zero(Assembler::zero, false, Assembler::pt, count, L_exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(count, 0, Assembler::equal, Assembler::pt, L_exit);
__ BIND(L_copy_4_bytes_loop);
__ dec(end_from, 4);
__ dec(end_to, 4);
@@ -2240,6 +2350,38 @@ class StubGenerator: public StubCodeGenerator {
}
//
+ // Helper methods for generate_disjoint_long_copy_core()
+ //
+ void copy_64_bytes_loop(Register from, Register to, Register count, int count_dec,
+ Label& L_loop, bool use_prefetch, bool use_bis) {
+ __ align(OptoLoopAlignment);
+ __ BIND(L_loop);
+ for (int off = 0; off < 64; off += 16) {
+ if (use_prefetch && (off & 31) == 0) {
+ if (ArraycopySrcPrefetchDistance > 0) {
+ __ prefetch(from, ArraycopySrcPrefetchDistance+off, Assembler::severalReads);
+ }
+ if (ArraycopyDstPrefetchDistance > 0) {
+ __ prefetch(to, ArraycopyDstPrefetchDistance+off, Assembler::severalWritesAndPossiblyReads);
+ }
+ }
+ __ ldx(from, off+0, O4);
+ __ ldx(from, off+8, O5);
+ if (use_bis) {
+ __ stxa(O4, to, off+0);
+ __ stxa(O5, to, off+8);
+ } else {
+ __ stx(O4, to, off+0);
+ __ stx(O5, to, off+8);
+ }
+ }
+ __ deccc(count, 8);
+ __ inc(from, 64);
+ __ brx(Assembler::greaterEqual, false, Assembler::pt, L_loop);
+ __ delayed()->inc(to, 64);
+ }
+
+ //
// Generate core code for disjoint long copy (and oop copy on 64-bit).
// "aligned" is ignored, because we must make the stronger
// assumption that both addresses are always 64-bit aligned.
@@ -2278,38 +2420,28 @@ class StubGenerator: public StubCodeGenerator {
const Register offset0 = O4; // element offset
const Register offset8 = O5; // next element offset
- __ deccc(count, 2);
- __ mov(G0, offset0); // offset from start of arrays (0)
- __ brx(Assembler::negative, false, Assembler::pn, L_copy_8_bytes );
- __ delayed()->add(offset0, 8, offset8);
+ __ deccc(count, 2);
+ __ mov(G0, offset0); // offset from start of arrays (0)
+ __ brx(Assembler::negative, false, Assembler::pn, L_copy_8_bytes );
+ __ delayed()->add(offset0, 8, offset8);
// Copy by 64 bytes chunks
- Label L_copy_64_bytes;
+
const Register from64 = O3; // source address
const Register to64 = G3; // destination address
- __ subcc(count, 6, O3);
- __ brx(Assembler::negative, false, Assembler::pt, L_copy_16_bytes );
- __ delayed()->mov(to, to64);
- // Now we can use O4(offset0), O5(offset8) as temps
- __ mov(O3, count);
- __ mov(from, from64);
+ __ subcc(count, 6, O3);
+ __ brx(Assembler::negative, false, Assembler::pt, L_copy_16_bytes );
+ __ delayed()->mov(to, to64);
+ // Now we can use O4(offset0), O5(offset8) as temps
+ __ mov(O3, count);
+ // count >= 0 (original count - 8)
+ __ mov(from, from64);
- __ align(OptoLoopAlignment);
- __ BIND(L_copy_64_bytes);
- for( int off = 0; off < 64; off += 16 ) {
- __ ldx(from64, off+0, O4);
- __ ldx(from64, off+8, O5);
- __ stx(O4, to64, off+0);
- __ stx(O5, to64, off+8);
- }
- __ deccc(count, 8);
- __ inc(from64, 64);
- __ brx(Assembler::greaterEqual, false, Assembler::pt, L_copy_64_bytes);
- __ delayed()->inc(to64, 64);
+ disjoint_copy_core(from64, to64, count, 3, 64, copy_64_bytes_loop);
// Restore O4(offset0), O5(offset8)
__ sub(from64, from, offset0);
- __ inccc(count, 6);
+ __ inccc(count, 6); // restore count
__ brx(Assembler::negative, false, Assembler::pn, L_copy_8_bytes );
__ delayed()->add(offset0, 8, offset8);
@@ -2576,7 +2708,7 @@ class StubGenerator: public StubCodeGenerator {
super_klass->after_save(),
L0, L1, L2, L4,
NULL, &L_pop_to_miss);
- __ ba(false, L_success);
+ __ ba(L_success);
__ delayed()->restore();
__ bind(L_pop_to_miss);
@@ -2673,8 +2805,7 @@ class StubGenerator: public StubCodeGenerator {
// ======== loop entry is here ========
__ BIND(load_element);
__ load_heap_oop(O0_from, O5_offset, G3_oop); // load the oop
- __ br_null(G3_oop, true, Assembler::pt, store_element);
- __ delayed()->nop();
+ __ br_null_short(G3_oop, Assembler::pt, store_element);
__ load_klass(G3_oop, G4_klass); // query the object klass
@@ -2896,8 +3027,7 @@ class StubGenerator: public StubCodeGenerator {
// assert(src->klass() != NULL);
BLOCK_COMMENT("assert klasses not null");
{ Label L_a, L_b;
- __ br_notnull(G3_src_klass, false, Assembler::pt, L_b); // it is broken if klass is NULL
- __ delayed()->nop();
+ __ br_notnull_short(G3_src_klass, Assembler::pt, L_b); // it is broken if klass is NULL
__ bind(L_a);
__ stop("broken null klass");
__ bind(L_b);
@@ -2937,9 +3067,7 @@ class StubGenerator: public StubCodeGenerator {
}
// if (src->klass() != dst->klass()) return -1;
- __ cmp(G3_src_klass, G4_dst_klass);
- __ brx(Assembler::notEqual, false, Assembler::pn, L_failed);
- __ delayed()->nop();
+ __ cmp_and_brx_short(G3_src_klass, G4_dst_klass, Assembler::notEqual, Assembler::pn, L_failed);
// if (!src->is_Array()) return -1;
__ cmp(G5_lh, Klass::_lh_neutral_value); // < 0
@@ -3007,9 +3135,7 @@ class StubGenerator: public StubCodeGenerator {
__ delayed()->signx(length, count); // length
#ifdef ASSERT
{ Label L;
- __ cmp(G3_elsize, LogBytesPerLong);
- __ br(Assembler::equal, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_elsize, LogBytesPerLong, Assembler::equal, Assembler::pt, L);
__ stop("must be long copy, but elsize is wrong");
__ bind(L);
}
@@ -3092,6 +3218,34 @@ class StubGenerator: public StubCodeGenerator {
return start;
}
+ //
+ // Generate stub for heap zeroing.
+ // "to" address is aligned to jlong (8 bytes).
+ //
+ // Arguments for generated stub:
+ // to: O0
+ // count: O1 treated as signed (count of HeapWord)
+ // count could be 0
+ //
+ address generate_zero_aligned_words(const char* name) {
+ __ align(CodeEntryAlignment);
+ StubCodeMark mark(this, "StubRoutines", name);
+ address start = __ pc();
+
+ const Register to = O0; // source array address
+ const Register count = O1; // HeapWords count
+ const Register temp = O2; // scratch
+
+ Label Ldone;
+ __ sllx(count, LogHeapWordSize, count); // to bytes count
+ // Use BIS for zeroing
+ __ bis_zeroing(to, count, temp, Ldone);
+ __ bind(Ldone);
+ __ retl();
+ __ delayed()->nop();
+ return start;
+}
+
void generate_arraycopy_stubs() {
address entry;
address entry_jbyte_arraycopy;
@@ -3218,6 +3372,10 @@ class StubGenerator: public StubCodeGenerator {
StubRoutines::_arrayof_jbyte_fill = generate_fill(T_BYTE, true, "arrayof_jbyte_fill");
StubRoutines::_arrayof_jshort_fill = generate_fill(T_SHORT, true, "arrayof_jshort_fill");
StubRoutines::_arrayof_jint_fill = generate_fill(T_INT, true, "arrayof_jint_fill");
+
+ if (UseBlockZeroing) {
+ StubRoutines::_zero_aligned_words = generate_zero_aligned_words("zero_aligned_words");
+ }
}
void generate_initial() {
@@ -3255,7 +3413,7 @@ class StubGenerator: public StubCodeGenerator {
StubRoutines::_throw_WrongMethodTypeException_entry =
generate_throw_exception("WrongMethodTypeException throw_exception",
CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException),
- false, G5_method_type, G3_method_handle);
+ G5_method_type, G3_method_handle);
}
@@ -3266,12 +3424,10 @@ class StubGenerator: public StubCodeGenerator {
// UseZeroBaseCompressedOops which is defined after heap initialization.
StubRoutines::Sparc::_partial_subtype_check = generate_partial_subtype_check();
// These entry points require SharedInfo::stack0 to be set up in non-core builds
- StubRoutines::_throw_AbstractMethodError_entry = generate_throw_exception("AbstractMethodError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_AbstractMethodError), false);
- StubRoutines::_throw_IncompatibleClassChangeError_entry= generate_throw_exception("IncompatibleClassChangeError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_IncompatibleClassChangeError), false);
- StubRoutines::_throw_ArithmeticException_entry = generate_throw_exception("ArithmeticException throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_ArithmeticException), true);
- StubRoutines::_throw_NullPointerException_entry = generate_throw_exception("NullPointerException throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException), true);
- StubRoutines::_throw_NullPointerException_at_call_entry= generate_throw_exception("NullPointerException at call throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call), false);
- StubRoutines::_throw_StackOverflowError_entry = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError), false);
+ StubRoutines::_throw_AbstractMethodError_entry = generate_throw_exception("AbstractMethodError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_AbstractMethodError));
+ StubRoutines::_throw_IncompatibleClassChangeError_entry= generate_throw_exception("IncompatibleClassChangeError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_IncompatibleClassChangeError));
+ StubRoutines::_throw_NullPointerException_at_call_entry= generate_throw_exception("NullPointerException at call throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call));
+ StubRoutines::_throw_StackOverflowError_entry = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError));
StubRoutines::_handler_for_unsafe_access_entry =
generate_handler_for_unsafe_access();
diff --git a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
index 99b980c..8ec7d06 100644
--- a/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp
@@ -190,9 +190,7 @@ address TemplateInterpreterGenerator::generate_return_entry_for(TosState state,
const Register size = G1_scratch;
if (EnableInvokeDynamic) {
__ ldub(Address(Lbcp, 0), G1_scratch); // Load current bytecode.
- __ cmp(G1_scratch, Bytecodes::_invokedynamic);
- __ br(Assembler::equal, false, Assembler::pn, L_giant_index);
- __ delayed()->nop();
+ __ cmp_and_br_short(G1_scratch, Bytecodes::_invokedynamic, Assembler::equal, Assembler::pn, L_giant_index);
}
__ get_cache_and_index_at_bcp(cache, G1_scratch, 1);
__ bind(L_got_cache);
@@ -207,8 +205,7 @@ address TemplateInterpreterGenerator::generate_return_entry_for(TosState state,
if (EnableInvokeDynamic) {
__ bind(L_giant_index);
__ get_cache_and_index_at_bcp(cache, G1_scratch, 1, sizeof(u4));
- __ ba(false, L_got_cache);
- __ delayed()->nop();
+ __ ba_short(L_got_cache);
}
return entry;
@@ -221,9 +218,7 @@ address TemplateInterpreterGenerator::generate_deopt_entry_for(TosState state, i
{ Label L;
Address exception_addr(G2_thread, Thread::pending_exception_offset());
__ ld_ptr(exception_addr, Gtemp); // Load pending exception.
- __ tst(Gtemp);
- __ brx(Assembler::equal, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_null_short(Gtemp, Assembler::pt, L);
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_pending_exception));
__ should_not_reach_here();
__ bind(L);
@@ -304,8 +299,7 @@ void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile
if (ProfileInterpreter) {
// If no method data exists, go to profile_continue.
__ ld_ptr(Lmethod, methodOopDesc::method_data_offset(), G4_scratch);
- __ br_null(G4_scratch, false, Assembler::pn, no_mdo);
- __ delayed()->nop();
+ __ br_null_short(G4_scratch, Assembler::pn, no_mdo);
// Increment counter
Address mdo_invocation_counter(G4_scratch,
in_bytes(methodDataOopDesc::invocation_counter_offset()) +
@@ -313,8 +307,7 @@ void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile
__ increment_mask_and_jump(mdo_invocation_counter, increment, mask,
G3_scratch, Lscratch,
Assembler::zero, overflow);
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
}
// Increment counter in methodOop
@@ -340,9 +333,7 @@ void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile
// Test to see if we should create a method data oop
AddressLiteral profile_limit((address)&InvocationCounter::InterpreterProfileLimit);
__ load_contents(profile_limit, G3_scratch);
- __ cmp(O0, G3_scratch);
- __ br(Assembler::lessUnsigned, false, Assembler::pn, *profile_method_continue);
- __ delayed()->nop();
+ __ cmp_and_br_short(O0, G3_scratch, Assembler::lessUnsigned, Assembler::pn, *profile_method_continue);
// if no method data exists, go to profile_method
__ test_method_data_pointer(*profile_method);
@@ -351,7 +342,7 @@ void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile
AddressLiteral invocation_limit((address)&InvocationCounter::InterpreterInvocationLimit);
__ load_contents(invocation_limit, G3_scratch);
__ cmp(O0, G3_scratch);
- __ br(Assembler::greaterEqualUnsigned, false, Assembler::pn, *overflow);
+ __ br(Assembler::greaterEqualUnsigned, false, Assembler::pn, *overflow); // Far distance
__ delayed()->nop();
}
@@ -410,19 +401,14 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rframe
assert_different_registers(Rframe_size, Rscratch, Rscratch2);
- __ set( page_size, Rscratch );
- __ cmp( Rframe_size, Rscratch );
-
- __ br( Assembler::lessEqual, false, Assembler::pt, after_frame_check );
- __ delayed()->nop();
+ __ set(page_size, Rscratch);
+ __ cmp_and_br_short(Rframe_size, Rscratch, Assembler::lessEqual, Assembler::pt, after_frame_check);
// get the stack base, and in debug, verify it is non-zero
__ ld_ptr( G2_thread, Thread::stack_base_offset(), Rscratch );
#ifdef ASSERT
Label base_not_zero;
- __ cmp( Rscratch, G0 );
- __ brx( Assembler::notEqual, false, Assembler::pn, base_not_zero );
- __ delayed()->nop();
+ __ br_notnull_short(Rscratch, Assembler::pn, base_not_zero);
__ stop("stack base is zero in generate_stack_overflow_check");
__ bind(base_not_zero);
#endif
@@ -432,9 +418,7 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rframe
__ ld_ptr( G2_thread, Thread::stack_size_offset(), Rscratch2 );
#ifdef ASSERT
Label size_not_zero;
- __ cmp( Rscratch2, G0 );
- __ brx( Assembler::notEqual, false, Assembler::pn, size_not_zero );
- __ delayed()->nop();
+ __ br_notnull_short(Rscratch2, Assembler::pn, size_not_zero);
__ stop("stack size is zero in generate_stack_overflow_check");
__ bind(size_not_zero);
#endif
@@ -450,9 +434,7 @@ void TemplateInterpreterGenerator::generate_stack_overflow_check(Register Rframe
// the frame is greater than one page in size, so check against
// the bottom of the stack
- __ cmp( SP, Rscratch );
- __ brx( Assembler::greater, false, Assembler::pt, after_frame_check );
- __ delayed()->nop();
+ __ cmp_and_brx_short(SP, Rscratch, Assembler::greater, Assembler::pt, after_frame_check);
// Save the return address as the exception pc
__ st_ptr(O7, saved_exception_pc);
@@ -624,9 +606,7 @@ address InterpreterGenerator::generate_empty_entry(void) {
// If we need a safepoint check, generate full interpreter entry.
AddressLiteral sync_state(SafepointSynchronize::address_of_state());
__ set(sync_state, G3_scratch);
- __ cmp(G3_scratch, SafepointSynchronize::_not_synchronized);
- __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, SafepointSynchronize::_not_synchronized, Assembler::notEqual, Assembler::pn, slow_path);
// Code: _return
__ retl();
@@ -664,14 +644,12 @@ address InterpreterGenerator::generate_accessor_entry(void) {
AddressLiteral sync_state(SafepointSynchronize::address_of_state());
__ load_contents(sync_state, G3_scratch);
__ cmp(G3_scratch, SafepointSynchronize::_not_synchronized);
- __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, SafepointSynchronize::_not_synchronized, Assembler::notEqual, Assembler::pn, slow_path);
// Check if local 0 != NULL
__ ld_ptr(Gargs, G0, Otos_i ); // get local 0
- __ tst(Otos_i); // check if local 0 == NULL and go the slow path
- __ brx(Assembler::zero, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ // check if local 0 == NULL and go the slow path
+ __ br_null_short(Otos_i, Assembler::pn, slow_path);
// read first instruction word and extract bytecode @ 1 and index @ 2
@@ -697,9 +675,7 @@ address InterpreterGenerator::generate_accessor_entry(void) {
__ ld_ptr(G3_scratch, cp_base_offset + ConstantPoolCacheEntry::indices_offset(), G1_scratch);
__ srl(G1_scratch, 2*BitsPerByte, G1_scratch);
__ and3(G1_scratch, 0xFF, G1_scratch);
- __ cmp(G1_scratch, Bytecodes::_getfield);
- __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ __ cmp_and_br_short(G1_scratch, Bytecodes::_getfield, Assembler::notEqual, Assembler::pn, slow_path);
// Get the type and return field offset from the constant pool cache
__ ld_ptr(G3_scratch, cp_base_offset + ConstantPoolCacheEntry::flags_offset(), G1_scratch);
@@ -787,9 +763,8 @@ address InterpreterGenerator::generate_Reference_get_entry(void) {
// Check if local 0 != NULL
// If the receiver is null then it is OK to jump to the slow path.
__ ld_ptr(Gargs, G0, Otos_i ); // get local 0
- __ tst(Otos_i); // check if local 0 == NULL and go the slow path
- __ brx(Assembler::zero, false, Assembler::pn, slow_path);
- __ delayed()->nop();
+ // check if local 0 == NULL and go the slow path
+ __ cmp_and_brx_short(Otos_i, 0, Assembler::equal, Assembler::pn, slow_path);
// Load the value of the referent field.
@@ -952,9 +927,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
{ Label L;
Address signature_handler(Lmethod, methodOopDesc::signature_handler_offset());
__ ld_ptr(signature_handler, G3_scratch);
- __ tst(G3_scratch);
- __ brx(Assembler::notZero, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(G3_scratch, Assembler::pt, L);
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call), Lmethod);
__ ld_ptr(signature_handler, G3_scratch);
__ bind(L);
@@ -1019,9 +992,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
#ifdef ASSERT
if (!PrintSignatureHandlers) // do not dirty the output with this
{ Label L;
- __ tst(O1);
- __ brx(Assembler::notZero, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(O1, Assembler::pt, L);
__ stop("mirror is missing");
__ bind(L);
}
@@ -1038,9 +1009,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
#ifdef ASSERT
{ Label L;
- __ tst(O0);
- __ brx(Assembler::notZero, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(O0, Assembler::pt, L);
__ stop("native entry point is missing");
__ bind(L);
}
@@ -1079,9 +1048,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
#ifdef ASSERT
{ Label L;
__ ld(thread_state, G3_scratch);
- __ cmp(G3_scratch, _thread_in_Java);
- __ br(Assembler::equal, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, _thread_in_Java, Assembler::equal, Assembler::pt, L);
__ stop("Wrong thread state in native stub");
__ bind(L);
}
@@ -1134,9 +1101,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
Label L;
__ br(Assembler::notEqual, false, Assembler::pn, L);
__ delayed()->ld(G2_thread, JavaThread::suspend_flags_offset(), G3_scratch);
- __ cmp(G3_scratch, 0);
- __ br(Assembler::equal, false, Assembler::pt, no_block);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, 0, Assembler::equal, Assembler::pt, no_block);
__ bind(L);
// Block. Save any potential method result value before the operation and
@@ -1185,9 +1150,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
Label no_oop, store_result;
__ set((intptr_t)AbstractInterpreter::result_handler(T_OBJECT), G3_scratch);
- __ cmp(G3_scratch, Lscratch);
- __ brx(Assembler::notEqual, false, Assembler::pt, no_oop);
- __ delayed()->nop();
+ __ cmp_and_brx_short(G3_scratch, Lscratch, Assembler::notEqual, Assembler::pt, no_oop);
__ addcc(G0, O0, O0);
__ brx(Assembler::notZero, true, Assembler::pt, store_result); // if result is not NULL:
__ delayed()->ld_ptr(O0, 0, O0); // unbox it
@@ -1206,9 +1169,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
{ Label L;
Address exception_addr(G2_thread, Thread::pending_exception_offset());
__ ld_ptr(exception_addr, Gtemp);
- __ tst(Gtemp);
- __ brx(Assembler::equal, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_null_short(Gtemp, Assembler::pt, L);
// Note: This could be handled more efficiently since we know that the native
// method doesn't have an exception handler. We could directly return
// to the exception handler for the caller.
@@ -1245,9 +1206,7 @@ address InterpreterGenerator::generate_native_entry(bool synchronized) {
#ifdef ASSERT
{
Label ok;
- __ cmp(I5_savedSP, FP);
- __ brx(Assembler::greaterEqualUnsigned, false, Assembler::pt, ok);
- __ delayed()->nop();
+ __ cmp_and_brx_short(I5_savedSP, FP, Assembler::greaterEqualUnsigned, Assembler::pt, ok);
__ stop("bad I5_savedSP value");
__ should_not_reach_here();
__ bind(ok);
@@ -1429,8 +1388,7 @@ address InterpreterGenerator::generate_normal_entry(bool synchronized) {
__ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::profile_method));
__ set_method_data_pointer_for_bcp();
- __ ba(false, profile_method_continue);
- __ delayed()->nop();
+ __ ba_short(profile_method_continue);
}
// handle invocation counter overflow
@@ -1856,9 +1814,7 @@ void TemplateInterpreterGenerator::generate_throw_exception() {
// adapter frames in C2.
Label caller_not_deoptimized;
__ call_VM_leaf(L7_thread_cache, CAST_FROM_FN_PTR(address, InterpreterRuntime::interpreter_contains), I7);
- __ tst(O0);
- __ brx(Assembler::notEqual, false, Assembler::pt, caller_not_deoptimized);
- __ delayed()->nop();
+ __ br_notnull_short(O0, Assembler::pt, caller_not_deoptimized);
const Register Gtmp1 = G3_scratch;
const Register Gtmp2 = G1_scratch;
@@ -1992,10 +1948,10 @@ address TemplateInterpreterGenerator::generate_earlyret_entry_for(TosState state
void TemplateInterpreterGenerator::set_vtos_entry_points(Template* t, address& bep, address& cep, address& sep, address& aep, address& iep, address& lep, address& fep, address& dep, address& vep) {
assert(t->is_valid() && t->tos_in() == vtos, "illegal template");
Label L;
- aep = __ pc(); __ push_ptr(); __ ba(false, L); __ delayed()->nop();
- fep = __ pc(); __ push_f(); __ ba(false, L); __ delayed()->nop();
- dep = __ pc(); __ push_d(); __ ba(false, L); __ delayed()->nop();
- lep = __ pc(); __ push_l(); __ ba(false, L); __ delayed()->nop();
+ aep = __ pc(); __ push_ptr(); __ ba_short(L);
+ fep = __ pc(); __ push_f(); __ ba_short(L);
+ dep = __ pc(); __ push_d(); __ ba_short(L);
+ lep = __ pc(); __ push_l(); __ ba_short(L);
iep = __ pc(); __ push_i();
bep = cep = sep = iep; // there aren't any
vep = __ pc(); __ bind(L); // fall through
diff --git a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp
index 82acec5..850dbe6 100644
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp
@@ -149,39 +149,68 @@ Address TemplateTable::at_bcp(int offset) {
}
-void TemplateTable::patch_bytecode(Bytecodes::Code bc, Register Rbyte_code,
- Register Rscratch,
- bool load_bc_into_scratch /*=true*/) {
+void TemplateTable::patch_bytecode(Bytecodes::Code bc, Register bc_reg,
+ Register temp_reg, bool load_bc_into_bc_reg/*=true*/,
+ int byte_no) {
// With sharing on, may need to test methodOop flag.
- if (!RewriteBytecodes) return;
- if (load_bc_into_scratch) __ set(bc, Rbyte_code);
- Label patch_done;
+ if (!RewriteBytecodes) return;
+ Label L_patch_done;
+
+ switch (bc) {
+ case Bytecodes::_fast_aputfield:
+ case Bytecodes::_fast_bputfield:
+ case Bytecodes::_fast_cputfield:
+ case Bytecodes::_fast_dputfield:
+ case Bytecodes::_fast_fputfield:
+ case Bytecodes::_fast_iputfield:
+ case Bytecodes::_fast_lputfield:
+ case Bytecodes::_fast_sputfield:
+ {
+ // We skip bytecode quickening for putfield instructions when
+ // the put_code written to the constant pool cache is zero.
+ // This is required so that every execution of this instruction
+ // calls out to InterpreterRuntime::resolve_get_put to do
+ // additional, required work.
+ assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
+ assert(load_bc_into_bc_reg, "we use bc_reg as temp");
+ __ get_cache_and_index_and_bytecode_at_bcp(bc_reg, temp_reg, temp_reg, byte_no, 1);
+ __ set(bc, bc_reg);
+ __ cmp_and_br_short(temp_reg, 0, Assembler::equal, Assembler::pn, L_patch_done); // don't patch
+ }
+ break;
+ default:
+ assert(byte_no == -1, "sanity");
+ if (load_bc_into_bc_reg) {
+ __ set(bc, bc_reg);
+ }
+ }
+
if (JvmtiExport::can_post_breakpoint()) {
- Label fast_patch;
- __ ldub(at_bcp(0), Rscratch);
- __ cmp(Rscratch, Bytecodes::_breakpoint);
- __ br(Assembler::notEqual, false, Assembler::pt, fast_patch);
- __ delayed()->nop(); // don't bother to hoist the stb here
+ Label L_fast_patch;
+ __ ldub(at_bcp(0), temp_reg);
+ __ cmp_and_br_short(temp_reg, Bytecodes::_breakpoint, Assembler::notEqual, Assembler::pt, L_fast_patch);
// perform the quickening, slowly, in the bowels of the breakpoint table
- __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), Lmethod, Lbcp, Rbyte_code);
- __ ba(false, patch_done);
- __ delayed()->nop();
- __ bind(fast_patch);
+ __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), Lmethod, Lbcp, bc_reg);
+ __ ba_short(L_patch_done);
+ __ bind(L_fast_patch);
}
+
#ifdef ASSERT
Bytecodes::Code orig_bytecode = Bytecodes::java_code(bc);
- Label okay;
- __ ldub(at_bcp(0), Rscratch);
- __ cmp(Rscratch, orig_bytecode);
- __ br(Assembler::equal, false, Assembler::pt, okay);
- __ delayed() ->cmp(Rscratch, Rbyte_code);
- __ br(Assembler::equal, false, Assembler::pt, okay);
+ Label L_okay;
+ __ ldub(at_bcp(0), temp_reg);
+ __ cmp(temp_reg, orig_bytecode);
+ __ br(Assembler::equal, false, Assembler::pt, L_okay);
+ __ delayed()->cmp(temp_reg, bc_reg);
+ __ br(Assembler::equal, false, Assembler::pt, L_okay);
__ delayed()->nop();
- __ stop("Rewriting wrong bytecode location");
- __ bind(okay);
+ __ stop("patching the wrong bytecode");
+ __ bind(L_okay);
#endif
- __ stb(Rbyte_code, at_bcp(0));
- __ bind(patch_done);
+
+ // patch bytecode
+ __ stb(bc_reg, at_bcp(0));
+ __ bind(L_patch_done);
}
//----------------------------------------------------------------------------------------------------
@@ -281,17 +310,14 @@ void TemplateTable::ldc(bool wide) {
// get type from tags
__ add(O2, tags_offset, O2);
__ ldub(O2, O1, O2);
- __ cmp(O2, JVM_CONSTANT_UnresolvedString); // unresolved string? If so, must resolve
- __ brx(Assembler::equal, true, Assembler::pt, call_ldc);
- __ delayed()->nop();
+ // unresolved string? If so, must resolve
+ __ cmp_and_brx_short(O2, JVM_CONSTANT_UnresolvedString, Assembler::equal, Assembler::pt, call_ldc);
- __ cmp(O2, JVM_CONSTANT_UnresolvedClass); // unresolved class? If so, must resolve
- __ brx(Assembler::equal, true, Assembler::pt, call_ldc);
- __ delayed()->nop();
+ // unresolved class? If so, must resolve
+ __ cmp_and_brx_short(O2, JVM_CONSTANT_UnresolvedClass, Assembler::equal, Assembler::pt, call_ldc);
- __ cmp(O2, JVM_CONSTANT_UnresolvedClassInError); // unresolved class in error state
- __ brx(Assembler::equal, true, Assembler::pn, call_ldc);
- __ delayed()->nop();
+ // unresolved class in error state
+ __ cmp_and_brx_short(O2, JVM_CONSTANT_UnresolvedClassInError, Assembler::equal, Assembler::pn, call_ldc);
__ cmp(O2, JVM_CONSTANT_Class); // need to call vm to get java mirror of the class
__ brx(Assembler::notEqual, true, Assembler::pt, notClass);
@@ -301,8 +327,7 @@ void TemplateTable::ldc(bool wide) {
__ set(wide, O1);
call_VM(Otos_i, CAST_FROM_FN_PTR(address, InterpreterRuntime::ldc), O1);
__ push(atos);
- __ ba(false, exit);
- __ delayed()->nop();
+ __ ba_short(exit);
__ bind(notClass);
// __ add(O0, base_offset, O0);
@@ -312,8 +337,7 @@ void TemplateTable::ldc(bool wide) {
__ delayed()->cmp(O2, JVM_CONSTANT_String);
__ ld(O0, O1, Otos_i);
__ push(itos);
- __ ba(false, exit);
- __ delayed()->nop();
+ __ ba_short(exit);
__ bind(notInt);
// __ cmp(O2, JVM_CONSTANT_String);
@@ -325,8 +349,7 @@ void TemplateTable::ldc(bool wide) {
__ ld_ptr(O0, O1, Otos_i);
__ verify_oop(Otos_i);
__ push(atos);
- __ ba(false, exit);
- __ delayed()->nop();
+ __ ba_short(exit);
__ bind(notString);
// __ ldf(FloatRegisterImpl::S, O0, O1, Ftos_f);
@@ -365,9 +388,7 @@ void TemplateTable::fast_aldc(bool wide) {
__ load_klass(Otos_i, Rcon_klass);
AddressLiteral array_klass_addr((address)Universe::systemObjArrayKlassObj_addr());
__ load_contents(array_klass_addr, Rarray_klass);
- __ cmp(Rarray_klass, Rcon_klass);
- __ brx(Assembler::notEqual, false, Assembler::pt, L_done);
- __ delayed()->nop();
+ __ cmp_and_brx_short(Rarray_klass, Rcon_klass, Assembler::notEqual, Assembler::pt, L_done);
__ ld(Address(Otos_i, arrayOopDesc::length_offset_in_bytes()), Rcon_klass);
__ tst(Rcon_klass);
__ brx(Assembler::zero, true, Assembler::pt, L_done);
@@ -397,9 +418,7 @@ void TemplateTable::ldc2_w() {
__ sll(O1, LogBytesPerWord, O1);
__ add(O0, O1, G3_scratch);
- __ cmp(O2, JVM_CONSTANT_Double);
- __ brx(Assembler::notEqual, false, Assembler::pt, Long);
- __ delayed()->nop();
+ __ cmp_and_brx_short(O2, JVM_CONSTANT_Double, Assembler::notEqual, Assembler::pt, Long);
// A double can be placed at word-aligned locations in the constant pool.
// Check out Conversions.java for an example.
// Also constantPoolOopDesc::header_size() is 20, which makes it very difficult
@@ -413,8 +432,7 @@ void TemplateTable::ldc2_w() {
f->successor());
#endif
__ push(dtos);
- __ ba(false, exit);
- __ delayed()->nop();
+ __ ba_short(exit);
__ bind(Long);
#ifdef _LP64
@@ -453,9 +471,7 @@ void TemplateTable::iload() {
// last two iloads in a pair. Comparing against fast_iload means that
// the next bytecode is neither an iload or a caload, and therefore
// an iload pair.
- __ cmp(G3_scratch, (int)Bytecodes::_iload);
- __ br(Assembler::equal, false, Assembler::pn, done);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, (int)Bytecodes::_iload, Assembler::equal, Assembler::pn, done);
__ cmp(G3_scratch, (int)Bytecodes::_fast_iload);
__ br(Assembler::equal, false, Assembler::pn, rewrite);
@@ -697,9 +713,7 @@ void TemplateTable::aload_0() {
aload(0);
// if _getfield then wait with rewrite
- __ cmp(G3_scratch, (int)Bytecodes::_getfield);
- __ br(Assembler::equal, false, Assembler::pn, done);
- __ delayed()->nop();
+ __ cmp_and_br_short(G3_scratch, (int)Bytecodes::_getfield, Assembler::equal, Assembler::pn, done);
// if _igetfield then rewrite to _fast_iaccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_iaccess_0) == Bytecodes::_aload_0, "adjust fast bytecode def");
@@ -867,8 +881,7 @@ void TemplateTable::aastore() {
__ index_check_without_pop(O3, O2, UseCompressedOops ? 2 : LogBytesPerWord, G3_scratch, O1);
// do array store check - check for NULL value first
- __ br_null( Otos_i, false, Assembler::pn, is_null );
- __ delayed()->nop();
+ __ br_null_short( Otos_i, Assembler::pn, is_null );
__ load_klass(O3, O4); // get array klass
__ load_klass(Otos_i, O5); // get value klass
@@ -899,7 +912,7 @@ void TemplateTable::aastore() {
__ bind(store_ok);
do_oop_store(_masm, O1, noreg, arrayOopDesc::base_offset_in_bytes(T_OBJECT), Otos_i, G3_scratch, _bs->kind(), true);
- __ ba(false,done);
+ __ ba(done);
__ delayed()->inc(Lesp, 3* Interpreter::stackElementSize); // adj sp (pops array, index and value)
__ bind(is_null);
@@ -1633,16 +1646,14 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
if (ProfileInterpreter) {
// If no method data exists, go to profile_continue.
__ ld_ptr(Lmethod, methodOopDesc::method_data_offset(), G4_scratch);
- __ br_null(G4_scratch, false, Assembler::pn, Lno_mdo);
- __ delayed()->nop();
+ __ br_null_short(G4_scratch, Assembler::pn, Lno_mdo);
// Increment backedge counter in the MDO
Address mdo_backedge_counter(G4_scratch, in_bytes(methodDataOopDesc::backedge_counter_offset()) +
in_bytes(InvocationCounter::counter_offset()));
__ increment_mask_and_jump(mdo_backedge_counter, increment, mask, G3_scratch, Lscratch,
Assembler::notZero, &Lforward);
- __ ba(false, Loverflow);
- __ delayed()->nop();
+ __ ba_short(Loverflow);
}
// If there's no MDO, increment counter in methodOop
@@ -1658,14 +1669,11 @@ void TemplateTable::branch(bool is_jsr, bool is_wide) {
// Was an OSR adapter generated?
// O0 = osr nmethod
- __ br_null(O0, false, Assembler::pn, Lforward);
- __ delayed()->nop();
+ __ br_null_short(O0, Assembler::pn, Lforward);
// Has the nmethod been invalidated already?
__ ld(O0, nmethod::entry_bci_offset(), O2);
- __ cmp(O2, InvalidOSREntryBci);
- __ br(Assembler::equal, false, Assembler::pn, Lforward);
- __ delayed()->nop();
+ __ cmp_and_br_short(O2, InvalidOSREntryBci, Assembler::equal, Assembler::pn, Lforward);
// migrate the interpreter frame off of the stack
@@ -1830,7 +1838,7 @@ void TemplateTable::tableswitch() {
__ profile_switch_case(O2, O3, G3_scratch, G4_scratch);
__ sll(O2, LogBytesPerInt, O2);
__ add(O2, 3 * BytesPerInt, O2);
- __ ba(false, continue_execution);
+ __ ba(continue_execution);
__ delayed()->ld(O1, O2, O2);
// handle default
__ bind(default_case);
@@ -1858,7 +1866,7 @@ void TemplateTable::fast_linearswitch() {
__ ld(O1, BytesPerInt, O2);
__ sll(O2, LogBytesPerInt + 1, O2); // in word-pairs
__ add(O1, 2 * BytesPerInt, O3); // set first pair addr
- __ ba(false, loop_entry);
+ __ ba(loop_entry);
__ delayed()->add(O3, O2, O2); // counter now points past last pair
// table search
@@ -1877,8 +1885,7 @@ void TemplateTable::fast_linearswitch() {
__ ld(O1, 0, O4); // get default offset
if (ProfileInterpreter) {
__ profile_switch_default(O3);
- __ ba(false, continue_execution);
- __ delayed()->nop();
+ __ ba_short(continue_execution);
}
// entry found -> get offset
@@ -1944,7 +1951,7 @@ void TemplateTable::fast_binaryswitch() {
// and start
Label entry;
- __ ba(false, entry);
+ __ ba(entry);
__ delayed()->ld( Rarray, -BytesPerInt, Rj);
// (Rj is already in the native byte-ordering.)
@@ -2002,8 +2009,7 @@ void TemplateTable::fast_binaryswitch() {
// (Rj is already in the native byte-ordering.)
if (ProfileInterpreter) {
- __ ba(false, continue_execution);
- __ delayed()->nop();
+ __ ba_short(continue_execution);
}
__ bind(default_case); // fall through (if not profiling)
@@ -2087,12 +2093,12 @@ void TemplateTable::resolve_cache_and_index(int byte_no,
// Depends on cpCacheOop layout!
Label resolved;
- __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
if (byte_no == f1_oop) {
// We are resolved if the f1 field contains a non-null object (CallSite, etc.)
// This kind of CP cache entry does not need to match the flags byte, because
// there is a 1-1 relation between bytecode type and CP entry type.
assert_different_registers(result, Rcache);
+ __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
__ ld_ptr(Rcache, constantPoolCacheOopDesc::base_offset() +
ConstantPoolCacheEntry::f1_offset(), result);
__ tst(result);
@@ -2101,15 +2107,9 @@ void TemplateTable::resolve_cache_and_index(int byte_no,
} else {
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
assert(result == noreg, ""); //else change code for setting result
- const int shift_count = (1 + byte_no)*BitsPerByte;
-
- __ ld_ptr(Rcache, constantPoolCacheOopDesc::base_offset() +
- ConstantPoolCacheEntry::indices_offset(), Lbyte_code);
-
- __ srl( Lbyte_code, shift_count, Lbyte_code );
- __ and3( Lbyte_code, 0xFF, Lbyte_code );
- __ cmp( Lbyte_code, (int)bytecode());
- __ br( Assembler::equal, false, Assembler::pt, resolved);
+ __ get_cache_and_index_and_bytecode_at_bcp(Rcache, index, Lbyte_code, byte_no, 1, index_size);
+ __ cmp(Lbyte_code, (int) bytecode()); // have we resolved this bytecode?
+ __ br(Assembler::equal, false, Assembler::pt, resolved);
__ delayed()->set((int)bytecode(), O1);
}
@@ -2216,9 +2216,7 @@ void TemplateTable::jvmti_post_field_access(Register Rcache,
assert_different_registers(Rcache, index, G1_scratch);
AddressLiteral get_field_access_count_addr(JvmtiExport::get_field_access_count_addr());
__ load_contents(get_field_access_count_addr, G1_scratch);
- __ tst(G1_scratch);
- __ br(Assembler::zero, false, Assembler::pt, Label1);
- __ delayed()->nop();
+ __ cmp_and_br_short(G1_scratch, 0, Assembler::equal, Assembler::pt, Label1);
__ add(Rcache, in_bytes(cp_base_offset), Rcache);
@@ -2298,7 +2296,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_agetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notObj);
@@ -2313,7 +2311,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_igetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notInt);
@@ -2329,7 +2327,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_lgetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notLong);
@@ -2344,7 +2342,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_bgetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notByte);
@@ -2359,7 +2357,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_cgetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notChar);
@@ -2374,7 +2372,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_sgetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notShort);
@@ -2390,7 +2388,7 @@ void TemplateTable::getfield_or_static(int byte_no, bool is_static) {
if (!is_static) {
patch_bytecode(Bytecodes::_fast_fgetfield, G3_scratch, G4_scratch);
}
- __ ba(false, checkVolatile);
+ __ ba(checkVolatile);
__ delayed()->tst(Lscratch);
__ bind(notFloat);
@@ -2499,9 +2497,7 @@ void TemplateTable::jvmti_post_fast_field_mod() {
Label done;
AddressLiteral get_field_modification_count_addr(JvmtiExport::get_field_modification_count_addr());
__ load_contents(get_field_modification_count_addr, G4_scratch);
- __ tst(G4_scratch);
- __ br(Assembler::zero, false, Assembler::pt, done);
- __ delayed()->nop();
+ __ cmp_and_br_short(G4_scratch, 0, Assembler::equal, Assembler::pt, done);
__ pop_ptr(G4_scratch); // copy the object pointer from tos
__ verify_oop(G4_scratch);
__ push_ptr(G4_scratch); // put the object pointer back on tos
@@ -2552,9 +2548,7 @@ void TemplateTable::jvmti_post_field_mod(Register Rcache, Register index, bool i
assert_different_registers(Rcache, index, G1_scratch);
AddressLiteral get_field_modification_count_addr(JvmtiExport::get_field_modification_count_addr());
__ load_contents(get_field_modification_count_addr, G1_scratch);
- __ tst(G1_scratch);
- __ br(Assembler::zero, false, Assembler::pt, Label1);
- __ delayed()->nop();
+ __ cmp_and_br_short(G1_scratch, 0, Assembler::zero, Assembler::pt, Label1);
// The Rcache and index registers have been already set.
// This allows to eliminate this call but the Rcache and index
@@ -2584,8 +2578,7 @@ void TemplateTable::jvmti_post_field_mod(Register Rcache, Register index, bool i
__ br(Assembler::equal, false, Assembler::pt, two_word);
__ delayed()->nop();
__ inc(G4_scratch, Interpreter::expr_offset_in_bytes(1));
- __ br(Assembler::always, false, Assembler::pt, valsizeknown);
- __ delayed()->nop();
+ __ ba_short(valsizeknown);
__ bind(two_word);
__ inc(G4_scratch, Interpreter::expr_offset_in_bytes(2));
@@ -2636,9 +2629,7 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
__ and3(Rflags, Lscratch, Lscratch);
if (__ membar_has_effect(read_bits)) {
- __ tst(Lscratch);
- __ br(Assembler::zero, false, Assembler::pt, notVolatile);
- __ delayed()->nop();
+ __ cmp_and_br_short(Lscratch, 0, Assembler::equal, Assembler::pt, notVolatile);
volatile_barrier(read_bits);
__ bind(notVolatile);
}
@@ -2653,150 +2644,162 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
if (is_static) {
// putstatic with object type most likely, check that first
- __ cmp(Rflags, atos );
+ __ cmp(Rflags, atos);
__ br(Assembler::notEqual, false, Assembler::pt, notObj);
- __ delayed() ->cmp(Rflags, itos );
+ __ delayed()->cmp(Rflags, itos);
// atos
- __ pop_ptr();
- __ verify_oop(Otos_i);
-
- do_oop_store(_masm, Rclass, Roffset, 0, Otos_i, G1_scratch, _bs->kind(), false);
-
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
+ {
+ __ pop_ptr();
+ __ verify_oop(Otos_i);
+ do_oop_store(_masm, Rclass, Roffset, 0, Otos_i, G1_scratch, _bs->kind(), false);
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
+ }
__ bind(notObj);
-
- // cmp(Rflags, itos );
+ // cmp(Rflags, itos);
__ br(Assembler::notEqual, false, Assembler::pt, notInt);
- __ delayed() ->cmp(Rflags, btos );
+ __ delayed()->cmp(Rflags, btos);
// itos
- __ pop_i();
- __ st(Otos_i, Rclass, Roffset);
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
+ {
+ __ pop_i();
+ __ st(Otos_i, Rclass, Roffset);
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
+ }
__ bind(notInt);
-
} else {
// putfield with int type most likely, check that first
- __ cmp(Rflags, itos );
+ __ cmp(Rflags, itos);
__ br(Assembler::notEqual, false, Assembler::pt, notInt);
- __ delayed() ->cmp(Rflags, atos );
+ __ delayed()->cmp(Rflags, atos);
// itos
- __ pop_i();
- pop_and_check_object(Rclass);
- __ st(Otos_i, Rclass, Roffset);
- patch_bytecode(Bytecodes::_fast_iputfield, G3_scratch, G4_scratch);
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
+ {
+ __ pop_i();
+ pop_and_check_object(Rclass);
+ __ st(Otos_i, Rclass, Roffset);
+ patch_bytecode(Bytecodes::_fast_iputfield, G3_scratch, G4_scratch, true, byte_no);
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
+ }
__ bind(notInt);
- // cmp(Rflags, atos );
+ // cmp(Rflags, atos);
__ br(Assembler::notEqual, false, Assembler::pt, notObj);
- __ delayed() ->cmp(Rflags, btos );
+ __ delayed()->cmp(Rflags, btos);
// atos
- __ pop_ptr();
- pop_and_check_object(Rclass);
- __ verify_oop(Otos_i);
-
- do_oop_store(_masm, Rclass, Roffset, 0, Otos_i, G1_scratch, _bs->kind(), false);
-
- patch_bytecode(Bytecodes::_fast_aputfield, G3_scratch, G4_scratch);
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
+ {
+ __ pop_ptr();
+ pop_and_check_object(Rclass);
+ __ verify_oop(Otos_i);
+ do_oop_store(_masm, Rclass, Roffset, 0, Otos_i, G1_scratch, _bs->kind(), false);
+ patch_bytecode(Bytecodes::_fast_aputfield, G3_scratch, G4_scratch, true, byte_no);
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
+ }
__ bind(notObj);
}
- // cmp(Rflags, btos );
+ // cmp(Rflags, btos);
__ br(Assembler::notEqual, false, Assembler::pt, notByte);
- __ delayed() ->cmp(Rflags, ltos );
+ __ delayed()->cmp(Rflags, ltos);
// btos
- __ pop_i();
- if (!is_static) pop_and_check_object(Rclass);
- __ stb(Otos_i, Rclass, Roffset);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_bputfield, G3_scratch, G4_scratch);
+ {
+ __ pop_i();
+ if (!is_static) pop_and_check_object(Rclass);
+ __ stb(Otos_i, Rclass, Roffset);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_bputfield, G3_scratch, G4_scratch, true, byte_no);
+ }
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
}
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
__ bind(notByte);
-
- // cmp(Rflags, ltos );
+ // cmp(Rflags, ltos);
__ br(Assembler::notEqual, false, Assembler::pt, notLong);
- __ delayed() ->cmp(Rflags, ctos );
+ __ delayed()->cmp(Rflags, ctos);
// ltos
- __ pop_l();
- if (!is_static) pop_and_check_object(Rclass);
- __ st_long(Otos_l, Rclass, Roffset);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_lputfield, G3_scratch, G4_scratch);
+ {
+ __ pop_l();
+ if (!is_static) pop_and_check_object(Rclass);
+ __ st_long(Otos_l, Rclass, Roffset);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_lputfield, G3_scratch, G4_scratch, true, byte_no);
+ }
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
}
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
__ bind(notLong);
-
- // cmp(Rflags, ctos );
+ // cmp(Rflags, ctos);
__ br(Assembler::notEqual, false, Assembler::pt, notChar);
- __ delayed() ->cmp(Rflags, stos );
+ __ delayed()->cmp(Rflags, stos);
// ctos (char)
- __ pop_i();
- if (!is_static) pop_and_check_object(Rclass);
- __ sth(Otos_i, Rclass, Roffset);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_cputfield, G3_scratch, G4_scratch);
+ {
+ __ pop_i();
+ if (!is_static) pop_and_check_object(Rclass);
+ __ sth(Otos_i, Rclass, Roffset);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_cputfield, G3_scratch, G4_scratch, true, byte_no);
+ }
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
}
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
__ bind(notChar);
- // cmp(Rflags, stos );
+ // cmp(Rflags, stos);
__ br(Assembler::notEqual, false, Assembler::pt, notShort);
- __ delayed() ->cmp(Rflags, ftos );
+ __ delayed()->cmp(Rflags, ftos);
- // stos (char)
- __ pop_i();
- if (!is_static) pop_and_check_object(Rclass);
- __ sth(Otos_i, Rclass, Roffset);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_sputfield, G3_scratch, G4_scratch);
+ // stos (short)
+ {
+ __ pop_i();
+ if (!is_static) pop_and_check_object(Rclass);
+ __ sth(Otos_i, Rclass, Roffset);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_sputfield, G3_scratch, G4_scratch, true, byte_no);
+ }
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
}
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
__ bind(notShort);
- // cmp(Rflags, ftos );
+ // cmp(Rflags, ftos);
__ br(Assembler::notZero, false, Assembler::pt, notFloat);
__ delayed()->nop();
// ftos
- __ pop_f();
- if (!is_static) pop_and_check_object(Rclass);
- __ stf(FloatRegisterImpl::S, Ftos_f, Rclass, Roffset);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_fputfield, G3_scratch, G4_scratch);
+ {
+ __ pop_f();
+ if (!is_static) pop_and_check_object(Rclass);
+ __ stf(FloatRegisterImpl::S, Ftos_f, Rclass, Roffset);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_fputfield, G3_scratch, G4_scratch, true, byte_no);
+ }
+ __ ba(checkVolatile);
+ __ delayed()->tst(Lscratch);
}
- __ ba(false, checkVolatile);
- __ delayed()->tst(Lscratch);
__ bind(notFloat);
// dtos
- __ pop_d();
- if (!is_static) pop_and_check_object(Rclass);
- __ stf(FloatRegisterImpl::D, Ftos_d, Rclass, Roffset);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_dputfield, G3_scratch, G4_scratch);
+ {
+ __ pop_d();
+ if (!is_static) pop_and_check_object(Rclass);
+ __ stf(FloatRegisterImpl::D, Ftos_d, Rclass, Roffset);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_dputfield, G3_scratch, G4_scratch, true, byte_no);
+ }
}
__ bind(checkVolatile);
@@ -2833,9 +2836,7 @@ void TemplateTable::fast_storefield(TosState state) {
__ set((1 << ConstantPoolCacheEntry::volatileField), Lscratch);
__ and3(Rflags, Lscratch, Lscratch);
if (__ membar_has_effect(read_bits)) {
- __ tst(Lscratch);
- __ br(Assembler::zero, false, Assembler::pt, notVolatile);
- __ delayed()->nop();
+ __ cmp_and_br_short(Lscratch, 0, Assembler::equal, Assembler::pt, notVolatile);
volatile_barrier(read_bits);
__ bind(notVolatile);
}
@@ -2864,9 +2865,7 @@ void TemplateTable::fast_storefield(TosState state) {
}
if (__ membar_has_effect(write_bits)) {
- __ tst(Lscratch);
- __ br(Assembler::zero, false, Assembler::pt, exit);
- __ delayed()->nop();
+ __ cmp_and_br_short(Lscratch, 0, Assembler::equal, Assembler::pt, exit);
volatile_barrier(Assembler::StoreLoad);
__ bind(exit);
}
@@ -3226,8 +3225,7 @@ void TemplateTable::invokeinterface(int byte_no) {
// the VM should throw IncompatibleClassChangeError. linkResolver checks
// this too but that's only if the entry isn't already resolved, so we
// need to check again.
- __ br_notnull( Rtemp, false, Assembler::pt, ok);
- __ delayed()->nop();
+ __ br_notnull_short( Rtemp, Assembler::pt, ok);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_IncompatibleClassChangeError));
__ should_not_reach_here();
__ bind(ok);
@@ -3251,9 +3249,7 @@ void TemplateTable::invokeinterface(int byte_no) {
// Check for abstract method error.
{
Label ok;
- __ tst(G5_method);
- __ brx(Assembler::notZero, false, Assembler::pt, ok);
- __ delayed()->nop();
+ __ br_notnull_short(G5_method, Assembler::pt, ok);
call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError));
__ should_not_reach_here();
__ bind(ok);
@@ -3378,7 +3374,7 @@ void TemplateTable::_new() {
if(UseTLAB) {
Register RoldTopValue = RallocatedObject;
- Register RtopAddr = G3_scratch, RtlabWasteLimitValue = G3_scratch;
+ Register RtlabWasteLimitValue = G3_scratch;
Register RnewTopValue = G1_scratch;
Register RendValue = Rscratch;
Register RfreeValue = RnewTopValue;
@@ -3408,17 +3404,14 @@ void TemplateTable::_new() {
#else
__ srl(RfreeValue, LogHeapWordSize, RfreeValue);
#endif
- __ cmp(RtlabWasteLimitValue, RfreeValue);
- __ brx(Assembler::greaterEqualUnsigned, false, Assembler::pt, slow_case); // tlab waste is small
- __ delayed()->nop();
+ __ cmp_and_brx_short(RtlabWasteLimitValue, RfreeValue, Assembler::greaterEqualUnsigned, Assembler::pt, slow_case); // tlab waste is small
// increment waste limit to prevent getting stuck on this slow path
__ add(RtlabWasteLimitValue, ThreadLocalAllocBuffer::refill_waste_limit_increment(), RtlabWasteLimitValue);
__ st_ptr(RtlabWasteLimitValue, G2_thread, in_bytes(JavaThread::tlab_refill_waste_limit_offset()));
} else {
// No allocation in the shared eden.
- __ br(Assembler::always, false, Assembler::pt, slow_case);
- __ delayed()->nop();
+ __ ba_short(slow_case);
}
}
@@ -3440,18 +3433,14 @@ void TemplateTable::_new() {
// RnewTopValue contains the top address after the new object
// has been allocated.
- __ cmp(RnewTopValue, RendValue);
- __ brx(Assembler::greaterUnsigned, false, Assembler::pn, slow_case);
- __ delayed()->nop();
+ __ cmp_and_brx_short(RnewTopValue, RendValue, Assembler::greaterUnsigned, Assembler::pn, slow_case);
__ casx_under_lock(RtopAddr, RoldTopValue, RnewTopValue,
VM_Version::v9_instructions_work() ? NULL :
(address)StubRoutines::Sparc::atomic_memory_operation_lock_addr());
// if someone beat us on the allocation, try again, otherwise continue
- __ cmp(RoldTopValue, RnewTopValue);
- __ brx(Assembler::notEqual, false, Assembler::pn, retry);
- __ delayed()->nop();
+ __ cmp_and_brx_short(RoldTopValue, RnewTopValue, Assembler::notEqual, Assembler::pn, retry);
// bump total bytes allocated by this thread
// RoldTopValue and RtopAddr are dead, so can use G1 and G3
@@ -3466,7 +3455,11 @@ void TemplateTable::_new() {
__ delayed()->add(RallocatedObject, sizeof(oopDesc), G3_scratch);
// initialize remaining object fields
- { Label loop;
+ if (UseBlockZeroing) {
+ // Use BIS for zeroing
+ __ bis_zeroing(G3_scratch, Roffset, G1_scratch, initialize_header);
+ } else {
+ Label loop;
__ subcc(Roffset, wordSize, Roffset);
__ bind(loop);
//__ subcc(Roffset, wordSize, Roffset); // executed above loop or in delay slot
@@ -3474,8 +3467,7 @@ void TemplateTable::_new() {
__ br(Assembler::notEqual, false, Assembler::pt, loop);
__ delayed()->subcc(Roffset, wordSize, Roffset);
}
- __ br(Assembler::always, false, Assembler::pt, initialize_header);
- __ delayed()->nop();
+ __ ba_short(initialize_header);
}
// slow case
@@ -3485,8 +3477,7 @@ void TemplateTable::_new() {
call_VM(Otos_i, CAST_FROM_FN_PTR(address, InterpreterRuntime::_new), O1, O2);
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
// Initialize the header: mark, klass
__ bind(initialize_header);
@@ -3550,8 +3541,7 @@ void TemplateTable::checkcast() {
Register RspecifiedKlass = O4;
// Check for casting a NULL
- __ br_null(Otos_i, false, Assembler::pn, is_null);
- __ delayed()->nop();
+ __ br_null_short(Otos_i, Assembler::pn, is_null);
// Get value klass in RobjKlass
__ load_klass(Otos_i, RobjKlass); // get value klass
@@ -3571,8 +3561,7 @@ void TemplateTable::checkcast() {
call_VM(RspecifiedKlass, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc) );
__ pop_ptr(Otos_i, G3_scratch); // restore receiver
- __ br(Assembler::always, false, Assembler::pt, resolved);
- __ delayed()->nop();
+ __ ba_short(resolved);
// Extract target class from constant pool
__ bind(quicked);
@@ -3591,8 +3580,7 @@ void TemplateTable::checkcast() {
__ bind(cast_ok);
if (ProfileInterpreter) {
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
}
__ bind(is_null);
__ profile_null_seen(G3_scratch);
@@ -3608,8 +3596,7 @@ void TemplateTable::instanceof() {
Register RspecifiedKlass = O4;
// Check for casting a NULL
- __ br_null(Otos_i, false, Assembler::pt, is_null);
- __ delayed()->nop();
+ __ br_null_short(Otos_i, Assembler::pt, is_null);
// Get value klass in RobjKlass
__ load_klass(Otos_i, RobjKlass); // get value klass
@@ -3629,9 +3616,7 @@ void TemplateTable::instanceof() {
call_VM(RspecifiedKlass, CAST_FROM_FN_PTR(address, InterpreterRuntime::quicken_io_cc) );
__ pop_ptr(Otos_i, G3_scratch); // restore receiver
- __ br(Assembler::always, false, Assembler::pt, resolved);
- __ delayed()->nop();
-
+ __ ba_short(resolved);
// Extract target class from constant pool
__ bind(quicked);
@@ -3649,8 +3634,7 @@ void TemplateTable::instanceof() {
__ clr( Otos_i );
if (ProfileInterpreter) {
- __ ba(false, done);
- __ delayed()->nop();
+ __ ba_short(done);
}
__ bind(is_null);
__ profile_null_seen(G3_scratch);
@@ -3724,7 +3708,7 @@ void TemplateTable::monitorenter() {
{
Label entry, loop, exit;
__ add( __ top_most_monitor(), O2 ); // last one to check
- __ ba( false, entry );
+ __ ba( entry );
__ delayed()->mov( Lmonitors, O3 ); // first one to check
@@ -3757,8 +3741,7 @@ void TemplateTable::monitorenter() {
{ Label allocated;
// found free slot?
- __ br_notnull(O1, false, Assembler::pn, allocated);
- __ delayed()->nop();
+ __ br_notnull_short(O1, Assembler::pn, allocated);
__ add_monitor_to_stack( false, O2, O3 );
__ mov(Lmonitors, O1);
@@ -3791,7 +3774,7 @@ void TemplateTable::monitorexit() {
{ Label entry, loop, found;
__ add( __ top_most_monitor(), O2 ); // last one to check
- __ ba(false, entry );
+ __ ba(entry);
// use Lscratch to hold monitor elem to check, start with most recent monitor,
// By using a local it survives the call to the C routine.
__ delayed()->mov( Lmonitors, Lscratch );
diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
index c45ccaa..e1429c6 100644
--- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.cpp
@@ -44,24 +44,58 @@ void VM_Version::initialize() {
PrefetchScanIntervalInBytes = prefetch_scan_interval_in_bytes();
PrefetchFieldsAhead = prefetch_fields_ahead();
+ assert(0 <= AllocatePrefetchInstr && AllocatePrefetchInstr <= 1, "invalid value");
+ if( AllocatePrefetchInstr < 0 ) AllocatePrefetchInstr = 0;
+ if( AllocatePrefetchInstr > 1 ) AllocatePrefetchInstr = 0;
+
// Allocation prefetch settings
- intx cache_line_size = L1_data_cache_line_size();
+ intx cache_line_size = prefetch_data_size();
if( cache_line_size > AllocatePrefetchStepSize )
AllocatePrefetchStepSize = cache_line_size;
- if( FLAG_IS_DEFAULT(AllocatePrefetchLines) )
- AllocatePrefetchLines = 3; // Optimistic value
- assert( AllocatePrefetchLines > 0, "invalid value");
- if( AllocatePrefetchLines < 1 ) // set valid value in product VM
- AllocatePrefetchLines = 1; // Conservative value
+
+ assert(AllocatePrefetchLines > 0, "invalid value");
+ if( AllocatePrefetchLines < 1 ) // set valid value in product VM
+ AllocatePrefetchLines = 3;
+ assert(AllocateInstancePrefetchLines > 0, "invalid value");
+ if( AllocateInstancePrefetchLines < 1 ) // set valid value in product VM
+ AllocateInstancePrefetchLines = 1;
AllocatePrefetchDistance = allocate_prefetch_distance();
AllocatePrefetchStyle = allocate_prefetch_style();
- assert(AllocatePrefetchDistance % AllocatePrefetchStepSize == 0, "invalid value");
+ assert((AllocatePrefetchDistance % AllocatePrefetchStepSize) == 0 &&
+ (AllocatePrefetchDistance > 0), "invalid value");
+ if ((AllocatePrefetchDistance % AllocatePrefetchStepSize) != 0 ||
+ (AllocatePrefetchDistance <= 0)) {
+ AllocatePrefetchDistance = AllocatePrefetchStepSize;
+ }
+
+ if (AllocatePrefetchStyle == 3 && !has_blk_init()) {
+ warning("BIS instructions are not available on this CPU");
+ FLAG_SET_DEFAULT(AllocatePrefetchStyle, 1);
+ }
+
+ if (has_v9()) {
+ assert(ArraycopySrcPrefetchDistance < 4096, "invalid value");
+ if (ArraycopySrcPrefetchDistance >= 4096)
+ ArraycopySrcPrefetchDistance = 4064;
+ assert(ArraycopyDstPrefetchDistance < 4096, "invalid value");
+ if (ArraycopyDstPrefetchDistance >= 4096)
+ ArraycopyDstPrefetchDistance = 4064;
+ } else {
+ if (ArraycopySrcPrefetchDistance > 0) {
+ warning("prefetch instructions are not available on this CPU");
+ FLAG_SET_DEFAULT(ArraycopySrcPrefetchDistance, 0);
+ }
+ if (ArraycopyDstPrefetchDistance > 0) {
+ warning("prefetch instructions are not available on this CPU");
+ FLAG_SET_DEFAULT(ArraycopyDstPrefetchDistance, 0);
+ }
+ }
UseSSE = 0; // Only on x86 and x64
- _supports_cx8 = has_v9();
+ _supports_cx8 = has_v9();
if (is_niagara()) {
// Indirect branch is the same cost as direct
@@ -94,19 +128,42 @@ void VM_Version::initialize() {
FLAG_SET_DEFAULT(InteriorEntryAlignment, 4);
}
if (is_niagara_plus()) {
- if (has_blk_init() && AllocatePrefetchStyle > 0 &&
- FLAG_IS_DEFAULT(AllocatePrefetchStyle)) {
- // Use BIS instruction for allocation prefetch.
- FLAG_SET_DEFAULT(AllocatePrefetchStyle, 3);
+ if (has_blk_init() && UseTLAB &&
+ FLAG_IS_DEFAULT(AllocatePrefetchInstr)) {
+ // Use BIS instruction for TLAB allocation prefetch.
+ FLAG_SET_ERGO(intx, AllocatePrefetchInstr, 1);
+ if (FLAG_IS_DEFAULT(AllocatePrefetchStyle)) {
+ FLAG_SET_ERGO(intx, AllocatePrefetchStyle, 3);
+ }
if (FLAG_IS_DEFAULT(AllocatePrefetchDistance)) {
- // Use smaller prefetch distance on N2 with BIS
+ // Use smaller prefetch distance with BIS
FLAG_SET_DEFAULT(AllocatePrefetchDistance, 64);
}
}
+ if (is_T4()) {
+ // Double number of prefetched cache lines on T4
+ // since L2 cache line size is smaller (32 bytes).
+ if (FLAG_IS_DEFAULT(AllocatePrefetchLines)) {
+ FLAG_SET_ERGO(intx, AllocatePrefetchLines, AllocatePrefetchLines*2);
+ }
+ if (FLAG_IS_DEFAULT(AllocateInstancePrefetchLines)) {
+ FLAG_SET_ERGO(intx, AllocateInstancePrefetchLines, AllocateInstancePrefetchLines*2);
+ }
+ }
if (AllocatePrefetchStyle != 3 && FLAG_IS_DEFAULT(AllocatePrefetchDistance)) {
// Use different prefetch distance without BIS
FLAG_SET_DEFAULT(AllocatePrefetchDistance, 256);
}
+ if (AllocatePrefetchInstr == 1) {
+ // Need a space at the end of TLAB for BIS since it
+ // will fault when accessing memory outside of heap.
+
+ // +1 for rounding up to next cache line, +1 to be safe
+ int lines = AllocatePrefetchLines + 2;
+ int step_size = AllocatePrefetchStepSize;
+ int distance = AllocatePrefetchDistance;
+ _reserve_for_allocation_prefetch = (distance + step_size*lines)/(int)HeapWordSize;
+ }
}
#endif
}
@@ -116,27 +173,69 @@ void VM_Version::initialize() {
if (FLAG_IS_DEFAULT(UsePopCountInstruction)) {
FLAG_SET_DEFAULT(UsePopCountInstruction, true);
}
+ } else if (UsePopCountInstruction) {
+ warning("POPC instruction is not available on this CPU");
+ FLAG_SET_DEFAULT(UsePopCountInstruction, false);
+ }
+
+ // T4 and newer Sparc cpus have new compare and branch instruction.
+ if (has_cbcond()) {
+ if (FLAG_IS_DEFAULT(UseCBCond)) {
+ FLAG_SET_DEFAULT(UseCBCond, true);
+ }
+ } else if (UseCBCond) {
+ warning("CBCOND instruction is not available on this CPU");
+ FLAG_SET_DEFAULT(UseCBCond, false);
+ }
+
+ assert(BlockZeroingLowLimit > 0, "invalid value");
+ if (has_block_zeroing()) {
+ if (FLAG_IS_DEFAULT(UseBlockZeroing)) {
+ FLAG_SET_DEFAULT(UseBlockZeroing, true);
+ }
+ } else if (UseBlockZeroing) {
+ warning("BIS zeroing instructions are not available on this CPU");
+ FLAG_SET_DEFAULT(UseBlockZeroing, false);
+ }
+
+ assert(BlockCopyLowLimit > 0, "invalid value");
+ if (has_block_zeroing()) { // has_blk_init() && is_T4(): core's local L2 cache
+ if (FLAG_IS_DEFAULT(UseBlockCopy)) {
+ FLAG_SET_DEFAULT(UseBlockCopy, true);
+ }
+ } else if (UseBlockCopy) {
+ warning("BIS instructions are not available or expensive on this CPU");
+ FLAG_SET_DEFAULT(UseBlockCopy, false);
}
#ifdef COMPILER2
+ // T4 and newer Sparc cpus have fast RDPC.
+ if (has_fast_rdpc() && FLAG_IS_DEFAULT(UseRDPCForConstantTableBase)) {
+// FLAG_SET_DEFAULT(UseRDPCForConstantTableBase, true);
+ }
+
// Currently not supported anywhere.
FLAG_SET_DEFAULT(UseFPUForSpilling, false);
+
+ assert((InteriorEntryAlignment % relocInfo::addr_unit()) == 0, "alignment is not a multiple of NOP size");
#endif
+ assert((CodeEntryAlignment % relocInfo::addr_unit()) == 0, "alignment is not a multiple of NOP size");
+ assert((OptoLoopAlignment % relocInfo::addr_unit()) == 0, "alignment is not a multiple of NOP size");
+
char buf[512];
- jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
- (has_v8() ? ", has_v8" : ""),
- (has_v9() ? ", has_v9" : ""),
+ jio_snprintf(buf, sizeof(buf), "%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
+ (has_v9() ? ", v9" : (has_v8() ? ", v8" : "")),
(has_hardware_popc() ? ", popc" : ""),
- (has_vis1() ? ", has_vis1" : ""),
- (has_vis2() ? ", has_vis2" : ""),
- (has_vis3() ? ", has_vis3" : ""),
- (has_blk_init() ? ", has_blk_init" : ""),
- (is_ultra3() ? ", is_ultra3" : ""),
- (is_sun4v() ? ", is_sun4v" : ""),
- (is_niagara() ? ", is_niagara" : ""),
- (is_niagara_plus() ? ", is_niagara_plus" : ""),
- (is_sparc64() ? ", is_sparc64" : ""),
+ (has_vis1() ? ", vis1" : ""),
+ (has_vis2() ? ", vis2" : ""),
+ (has_vis3() ? ", vis3" : ""),
+ (has_blk_init() ? ", blk_init" : ""),
+ (has_cbcond() ? ", cbcond" : ""),
+ (is_ultra3() ? ", ultra3" : ""),
+ (is_sun4v() ? ", sun4v" : ""),
+ (is_niagara_plus() ? ", niagara_plus" : (is_niagara() ? ", niagara" : "")),
+ (is_sparc64() ? ", sparc64" : ""),
(!has_hardware_mul32() ? ", no-mul32" : ""),
(!has_hardware_div32() ? ", no-div32" : ""),
(!has_hardware_fsmuld() ? ", no-fsmuld" : ""));
@@ -158,14 +257,20 @@ void VM_Version::initialize() {
#ifndef PRODUCT
if (PrintMiscellaneous && Verbose) {
- tty->print("Allocation: ");
+ tty->print("Allocation");
if (AllocatePrefetchStyle <= 0) {
- tty->print_cr("no prefetching");
+ tty->print_cr(": no prefetching");
} else {
+ tty->print(" prefetching: ");
+ if (AllocatePrefetchInstr == 0) {
+ tty->print("PREFETCH");
+ } else if (AllocatePrefetchInstr == 1) {
+ tty->print("BIS");
+ }
if (AllocatePrefetchLines > 1) {
- tty->print_cr("PREFETCH %d, %d lines of size %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
+ tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
} else {
- tty->print_cr("PREFETCH %d, one line", AllocatePrefetchDistance);
+ tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize);
}
}
if (PrefetchCopyIntervalInBytes > 0) {
diff --git a/hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp b/hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp
index c83d2de..db3343b 100644
--- a/hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp
+++ b/hotspot/src/cpu/sparc/vm/vm_version_sparc.hpp
@@ -31,44 +31,46 @@
class VM_Version: public Abstract_VM_Version {
protected:
enum Feature_Flag {
- v8_instructions = 0,
- hardware_mul32 = 1,
- hardware_div32 = 2,
- hardware_fsmuld = 3,
- hardware_popc = 4,
- v9_instructions = 5,
- vis1_instructions = 6,
- vis2_instructions = 7,
- sun4v_instructions = 8,
+ v8_instructions = 0,
+ hardware_mul32 = 1,
+ hardware_div32 = 2,
+ hardware_fsmuld = 3,
+ hardware_popc = 4,
+ v9_instructions = 5,
+ vis1_instructions = 6,
+ vis2_instructions = 7,
+ sun4v_instructions = 8,
blk_init_instructions = 9,
- fmaf_instructions = 10,
- fmau_instructions = 11,
- vis3_instructions = 12,
- sparc64_family = 13,
- T_family = 14,
- T1_model = 15
+ fmaf_instructions = 10,
+ fmau_instructions = 11,
+ vis3_instructions = 12,
+ sparc64_family = 13,
+ T_family = 14,
+ T1_model = 15,
+ cbcond_instructions = 16
};
enum Feature_Flag_Set {
unknown_m = 0,
all_features_m = -1,
- v8_instructions_m = 1 << v8_instructions,
- hardware_mul32_m = 1 << hardware_mul32,
- hardware_div32_m = 1 << hardware_div32,
- hardware_fsmuld_m = 1 << hardware_fsmuld,
- hardware_popc_m = 1 << hardware_popc,
- v9_instructions_m = 1 << v9_instructions,
- vis1_instructions_m = 1 << vis1_instructions,
- vis2_instructions_m = 1 << vis2_instructions,
- sun4v_m = 1 << sun4v_instructions,
+ v8_instructions_m = 1 << v8_instructions,
+ hardware_mul32_m = 1 << hardware_mul32,
+ hardware_div32_m = 1 << hardware_div32,
+ hardware_fsmuld_m = 1 << hardware_fsmuld,
+ hardware_popc_m = 1 << hardware_popc,
+ v9_instructions_m = 1 << v9_instructions,
+ vis1_instructions_m = 1 << vis1_instructions,
+ vis2_instructions_m = 1 << vis2_instructions,
+ sun4v_m = 1 << sun4v_instructions,
blk_init_instructions_m = 1 << blk_init_instructions,
- fmaf_instructions_m = 1 << fmaf_instructions,
- fmau_instructions_m = 1 << fmau_instructions,
- vis3_instructions_m = 1 << vis3_instructions,
- sparc64_family_m = 1 << sparc64_family,
- T_family_m = 1 << T_family,
- T1_model_m = 1 << T1_model,
+ fmaf_instructions_m = 1 << fmaf_instructions,
+ fmau_instructions_m = 1 << fmau_instructions,
+ vis3_instructions_m = 1 << vis3_instructions,
+ sparc64_family_m = 1 << sparc64_family,
+ T_family_m = 1 << T_family,
+ T1_model_m = 1 << T1_model,
+ cbcond_instructions_m = 1 << cbcond_instructions,
generic_v8_m = v8_instructions_m | hardware_mul32_m | hardware_div32_m | hardware_fsmuld_m,
generic_v9_m = generic_v8_m | v9_instructions_m,
@@ -111,25 +113,35 @@ public:
static bool has_vis2() { return (_features & vis2_instructions_m) != 0; }
static bool has_vis3() { return (_features & vis3_instructions_m) != 0; }
static bool has_blk_init() { return (_features & blk_init_instructions_m) != 0; }
+ static bool has_cbcond() { return (_features & cbcond_instructions_m) != 0; }
static bool supports_compare_and_exchange()
{ return has_v9(); }
- static bool is_ultra3() { return (_features & ultra3_m) == ultra3_m; }
- static bool is_sun4v() { return (_features & sun4v_m) != 0; }
// Returns true if the platform is in the niagara line (T series)
// and newer than the niagara1.
static bool is_niagara_plus() { return is_T_family(_features) && !is_T1_model(_features); }
+ static bool is_T4() { return is_T_family(_features) && has_cbcond(); }
+
// Fujitsu SPARC64
static bool is_sparc64() { return (_features & sparc64_family_m) != 0; }
+ static bool is_sun4v() { return (_features & sun4v_m) != 0; }
+ static bool is_ultra3() { return (_features & ultra3_m) == ultra3_m && !is_sun4v() && !is_sparc64(); }
+
static bool has_fast_fxtof() { return is_niagara() || is_sparc64() || has_v9() && !is_ultra3(); }
static bool has_fast_idiv() { return is_niagara_plus() || is_sparc64(); }
+ // T4 and newer Sparc have fast RDPC instruction.
+ static bool has_fast_rdpc() { return is_T4(); }
+
+ // On T4 and newer Sparc BIS to the beginning of cache line always zeros it.
+ static bool has_block_zeroing() { return has_blk_init() && is_T4(); }
+
static const char* cpu_features() { return _features_str; }
- static intx L1_data_cache_line_size() {
- return 64; // default prefetch block size on sparc
+ static intx prefetch_data_size() {
+ return is_T4() ? 32 : 64; // default prefetch block size on sparc
}
// Prefetch
diff --git a/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp
index 9c04021..4e71250 100644
--- a/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/vtableStubs_sparc.cpp
@@ -76,9 +76,7 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
Label L;
// check offset vs vtable length
__ ld(G3_scratch, instanceKlass::vtable_length_offset()*wordSize, G5);
- __ cmp(G5, vtable_index*vtableEntry::size());
- __ br(Assembler::greaterUnsigned, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ cmp_and_br_short(G5, vtable_index*vtableEntry::size(), Assembler::greaterUnsigned, Assembler::pt, L);
__ set(vtable_index, O2);
__ call_VM(noreg, CAST_FROM_FN_PTR(address, bad_compiled_vtable_index), O0, O2);
__ bind(L);
@@ -95,8 +93,7 @@ VtableStub* VtableStubs::create_vtable_stub(int vtable_index) {
#ifndef PRODUCT
if (DebugVtables) {
Label L;
- __ br_notnull(G5_method, false, Assembler::pt, L);
- __ delayed()->nop();
+ __ br_notnull_short(G5_method, Assembler::pt, L);
__ stop("Vtable entry is ZERO");
__ bind(L);
}
@@ -177,8 +174,7 @@ VtableStub* VtableStubs::create_itable_stub(int itable_index) {
#ifndef PRODUCT
if (DebugVtables) {
Label L01;
- __ bpr(Assembler::rc_nz, false, Assembler::pt, L5_method, L01);
- __ delayed()->nop();
+ __ br_notnull_short(L5_method, Assembler::pt, L01);
__ stop("methodOop is null");
__ bind(L01);
__ verify_oop(L5_method);
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.cpp b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
index 0e21a52..d57a55f 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.cpp
@@ -1339,9 +1339,8 @@ void Assembler::incl(Address dst) {
emit_operand(rax, dst);
}
-void Assembler::jcc(Condition cc, Label& L, relocInfo::relocType rtype) {
+void Assembler::jcc(Condition cc, Label& L, bool maybe_short) {
InstructionMark im(this);
- relocate(rtype);
assert((0 <= cc) && (cc < 16), "illegal cc");
if (L.is_bound()) {
address dst = target(L);
@@ -1350,7 +1349,7 @@ void Assembler::jcc(Condition cc, Label& L, relocInfo::relocType rtype) {
const int short_size = 2;
const int long_size = 6;
intptr_t offs = (intptr_t)dst - (intptr_t)_code_pos;
- if (rtype == relocInfo::none && is8bit(offs - short_size)) {
+ if (maybe_short && is8bit(offs - short_size)) {
// 0111 tttn #8-bit disp
emit_byte(0x70 | cc);
emit_byte((offs - short_size) & 0xFF);
@@ -1399,7 +1398,7 @@ void Assembler::jmp(Address adr) {
emit_operand(rsp, adr);
}
-void Assembler::jmp(Label& L, relocInfo::relocType rtype) {
+void Assembler::jmp(Label& L, bool maybe_short) {
if (L.is_bound()) {
address entry = target(L);
assert(entry != NULL, "jmp most probably wrong");
@@ -1407,7 +1406,7 @@ void Assembler::jmp(Label& L, relocInfo::relocType rtype) {
const int short_size = 2;
const int long_size = 5;
intptr_t offs = entry - _code_pos;
- if (rtype == relocInfo::none && is8bit(offs - short_size)) {
+ if (maybe_short && is8bit(offs - short_size)) {
emit_byte(0xEB);
emit_byte((offs - short_size) & 0xFF);
} else {
@@ -1420,7 +1419,6 @@ void Assembler::jmp(Label& L, relocInfo::relocType rtype) {
// the forward jump will not run beyond 256 bytes, use jmpb to
// force an 8-bit displacement.
InstructionMark im(this);
- relocate(rtype);
L.add_patch_at(code(), locator());
emit_byte(0xE9);
emit_long(0);
@@ -2309,7 +2307,7 @@ void Assembler::prefetch_prefix(Address src) {
}
void Assembler::prefetchnta(Address src) {
- NOT_LP64(assert(VM_Version::supports_sse2(), "must support"));
+ NOT_LP64(assert(VM_Version::supports_sse(), "must support"));
InstructionMark im(this);
prefetch_prefix(src);
emit_byte(0x18);
@@ -2317,7 +2315,7 @@ void Assembler::prefetchnta(Address src) {
}
void Assembler::prefetchr(Address src) {
- NOT_LP64(assert(VM_Version::supports_3dnow_prefetch(), "must support"));
+ assert(VM_Version::supports_3dnow_prefetch(), "must support");
InstructionMark im(this);
prefetch_prefix(src);
emit_byte(0x0D);
@@ -2349,7 +2347,7 @@ void Assembler::prefetcht2(Address src) {
}
void Assembler::prefetchw(Address src) {
- NOT_LP64(assert(VM_Version::supports_3dnow_prefetch(), "must support"));
+ assert(VM_Version::supports_3dnow_prefetch(), "must support");
InstructionMark im(this);
prefetch_prefix(src);
emit_byte(0x0D);
@@ -3674,7 +3672,7 @@ void Assembler::prefix(Address adr, Register reg, bool byteinst) {
} else {
if (adr.index_needs_rex()) {
prefix(REX_X);
- } else if (reg->encoding() >= 4 ) {
+ } else if (byteinst && reg->encoding() >= 4 ) {
prefix(REX);
}
}
@@ -8006,15 +8004,10 @@ void MacroAssembler::load_method_handle_vmslots(Register vmslots_reg, Register m
Register temp_reg) {
assert_different_registers(vmslots_reg, mh_reg, temp_reg);
// load mh.type.form.vmslots
- if (java_lang_invoke_MethodHandle::vmslots_offset_in_bytes() != 0) {
- // hoist vmslots into every mh to avoid dependent load chain
- movl(vmslots_reg, Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::vmslots_offset_in_bytes, temp_reg)));
- } else {
- Register temp2_reg = vmslots_reg;
- load_heap_oop(temp2_reg, Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg)));
- load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodType::form_offset_in_bytes, temp_reg)));
- movl(vmslots_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)));
- }
+ Register temp2_reg = vmslots_reg;
+ load_heap_oop(temp2_reg, Address(mh_reg, delayed_value(java_lang_invoke_MethodHandle::type_offset_in_bytes, temp_reg)));
+ load_heap_oop(temp2_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodType::form_offset_in_bytes, temp_reg)));
+ movl(vmslots_reg, Address(temp2_reg, delayed_value(java_lang_invoke_MethodTypeForm::vmslots_offset_in_bytes, temp_reg)));
}
diff --git a/hotspot/src/cpu/x86/vm/assembler_x86.hpp b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
index f07291c..d3553e7 100644
--- a/hotspot/src/cpu/x86/vm/assembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/assembler_x86.hpp
@@ -1065,8 +1065,7 @@ private:
// Note: The same Label can be used for forward and backward branches
// but it may be bound only once.
- void jcc(Condition cc, Label& L,
- relocInfo::relocType rtype = relocInfo::none);
+ void jcc(Condition cc, Label& L, bool maybe_short = true);
// Conditional jump to a 8-bit offset to L.
// WARNING: be very careful using this for forward jumps. If the label is
@@ -1077,7 +1076,7 @@ private:
void jmp(Address entry); // pc <- entry
// Label operations & relative jumps (PPUM Appendix D)
- void jmp(Label& L, relocInfo::relocType rtype = relocInfo::none); // unconditional jump to L
+ void jmp(Label& L, bool maybe_short = true); // unconditional jump to L
void jmp(Register entry); // pc <- entry
diff --git a/hotspot/src/cpu/x86/vm/bytes_x86.hpp b/hotspot/src/cpu/x86/vm/bytes_x86.hpp
index ac096dc..9f939a3 100644
--- a/hotspot/src/cpu/x86/vm/bytes_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/bytes_x86.hpp
@@ -81,6 +81,9 @@ class Bytes: AllStatic {
#ifdef TARGET_OS_ARCH_windows_x86
# include "bytes_windows_x86.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "bytes_bsd_x86.inline.hpp"
+#endif
#endif // CPU_X86_VM_BYTES_X86_HPP
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
index 982d33d..dbdd708 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
@@ -129,10 +129,6 @@ LIR_Opr LIR_Assembler::receiverOpr() {
return FrameMap::receiver_opr;
}
-LIR_Opr LIR_Assembler::incomingReceiverOpr() {
- return receiverOpr();
-}
-
LIR_Opr LIR_Assembler::osrBufferPointer() {
return FrameMap::as_pointer_opr(receiverOpr()->as_register());
}
@@ -371,55 +367,6 @@ void LIR_Assembler::jobject2reg_with_patching(Register reg, CodeEmitInfo* info)
}
-void LIR_Assembler::monitorexit(LIR_Opr obj_opr, LIR_Opr lock_opr, Register new_hdr, int monitor_no, Register exception) {
- if (exception->is_valid()) {
- // preserve exception
- // note: the monitor_exit runtime call is a leaf routine
- // and cannot block => no GC can happen
- // The slow case (MonitorAccessStub) uses the first two stack slots
- // ([esp+0] and [esp+4]), therefore we store the exception at [esp+8]
- __ movptr (Address(rsp, 2*wordSize), exception);
- }
-
- Register obj_reg = obj_opr->as_register();
- Register lock_reg = lock_opr->as_register();
-
- // setup registers (lock_reg must be rax, for lock_object)
- assert(obj_reg != SYNC_header && lock_reg != SYNC_header, "rax, must be available here");
- Register hdr = lock_reg;
- assert(new_hdr == SYNC_header, "wrong register");
- lock_reg = new_hdr;
- // compute pointer to BasicLock
- Address lock_addr = frame_map()->address_for_monitor_lock(monitor_no);
- __ lea(lock_reg, lock_addr);
- // unlock object
- MonitorAccessStub* slow_case = new MonitorExitStub(lock_opr, true, monitor_no);
- // _slow_case_stubs->append(slow_case);
- // temporary fix: must be created after exceptionhandler, therefore as call stub
- _slow_case_stubs->append(slow_case);
- if (UseFastLocking) {
- // try inlined fast unlocking first, revert to slow locking if it fails
- // note: lock_reg points to the displaced header since the displaced header offset is 0!
- assert(BasicLock::displaced_header_offset_in_bytes() == 0, "lock_reg must point to the displaced header");
- __ unlock_object(hdr, obj_reg, lock_reg, *slow_case->entry());
- } else {
- // always do slow unlocking
- // note: the slow unlocking code could be inlined here, however if we use
- // slow unlocking, speed doesn't matter anyway and this solution is
- // simpler and requires less duplicated code - additionally, the
- // slow unlocking code is the same in either case which simplifies
- // debugging
- __ jmp(*slow_case->entry());
- }
- // done
- __ bind(*slow_case->continuation());
-
- if (exception->is_valid()) {
- // restore exception
- __ movptr (exception, Address(rsp, 2 * wordSize));
- }
-}
-
// This specifies the rsp decrement needed to build the frame
int LIR_Assembler::initial_frame_size_in_bytes() {
// if rounding, must let FrameMap know!
@@ -480,8 +427,8 @@ int LIR_Assembler::emit_unwind_handler() {
// Fetch the exception from TLS and clear out exception related thread state
__ get_thread(rsi);
__ movptr(rax, Address(rsi, JavaThread::exception_oop_offset()));
- __ movptr(Address(rsi, JavaThread::exception_oop_offset()), (int32_t)NULL_WORD);
- __ movptr(Address(rsi, JavaThread::exception_pc_offset()), (int32_t)NULL_WORD);
+ __ movptr(Address(rsi, JavaThread::exception_oop_offset()), (intptr_t)NULL_WORD);
+ __ movptr(Address(rsi, JavaThread::exception_pc_offset()), (intptr_t)NULL_WORD);
__ bind(_unwind_handler_entry);
__ verify_not_null_oop(rax);
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp
index daccb39..6ed3510 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.hpp
@@ -29,8 +29,6 @@
Address::ScaleFactor array_element_size(BasicType type) const;
- void monitorexit(LIR_Opr obj_opr, LIR_Opr lock_opr, Register new_hdr, int monitor_no, Register exception);
-
void arith_fpu_implementation(LIR_Code code, int left_index, int right_index, int dest_index, bool pop_fpu_stack);
// helper functions which checks for overflow and sets bailout if it
diff --git a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
index c71590a..1ff91ca 100644
--- a/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp
@@ -267,7 +267,8 @@ void LIRGenerator::do_StoreIndexed(StoreIndexed* x) {
bool use_length = x->length() != NULL;
bool obj_store = x->elt_type() == T_ARRAY || x->elt_type() == T_OBJECT;
bool needs_store_check = obj_store && (x->value()->as_Constant() == NULL ||
- !get_jobject_constant(x->value())->is_null_object());
+ !get_jobject_constant(x->value())->is_null_object() ||
+ x->should_profile());
LIRItem array(x->array(), this);
LIRItem index(x->index(), this);
@@ -321,7 +322,7 @@ void LIRGenerator::do_StoreIndexed(StoreIndexed* x) {
LIR_Opr tmp3 = new_register(objectType);
CodeEmitInfo* store_check_info = new CodeEmitInfo(range_check_info);
- __ store_check(value.result(), array.result(), tmp1, tmp2, tmp3, store_check_info);
+ __ store_check(value.result(), array.result(), tmp1, tmp2, tmp3, store_check_info, x->profiled_method(), x->profiled_bci());
}
if (obj_store) {
diff --git a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
index 055bb93..9ad2e58 100644
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp
@@ -1465,19 +1465,6 @@ OopMapSet* Runtime1::generate_code_for(StubID id, StubAssembler* sasm) {
}
break;
- case jvmti_exception_throw_id:
- { // rax,: exception oop
- StubFrame f(sasm, "jvmti_exception_throw", dont_gc_arguments);
- // Preserve all registers across this potentially blocking call
- const int num_rt_args = 2; // thread, exception oop
- OopMap* map = save_live_registers(sasm, num_rt_args);
- int call_offset = __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, Runtime1::post_jvmti_exception_throw), rax);
- oop_maps = new OopMapSet();
- oop_maps->add_gc_map(call_offset, map);
- restore_live_registers(sasm);
- }
- break;
-
case dtrace_object_alloc_id:
{ // rax,: object
StubFrame f(sasm, "dtrace_object_alloc", dont_gc_arguments);
diff --git a/hotspot/src/cpu/x86/vm/copy_x86.hpp b/hotspot/src/cpu/x86/vm/copy_x86.hpp
index dbadb0e..d5c6d5e 100644
--- a/hotspot/src/cpu/x86/vm/copy_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/copy_x86.hpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_ARCH_windows_x86
# include "copy_windows_x86.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "copy_bsd_x86.inline.hpp"
+#endif
static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
diff --git a/hotspot/src/cpu/x86/vm/frame_x86.cpp b/hotspot/src/cpu/x86/vm/frame_x86.cpp
index 2170595..3d82d06 100644
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp
@@ -666,3 +666,9 @@ void frame::describe_pd(FrameValues& values, int frame_no) {
}
#endif
+
+intptr_t *frame::initial_deoptimization_info() {
+ // used to reset the saved FP
+ return fp();
+}
+
diff --git a/hotspot/src/cpu/x86/vm/globals_x86.hpp b/hotspot/src/cpu/x86/vm/globals_x86.hpp
index 8b79f8e..d40f559 100644
--- a/hotspot/src/cpu/x86/vm/globals_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/globals_x86.hpp
@@ -70,7 +70,11 @@ define_pd_global(intx, PreInflateSpin, 10);
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
+#ifdef _ALLBSD_SOURCE
+define_pd_global(bool, UseMembar, true);
+#else
define_pd_global(bool, UseMembar, false);
+#endif
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
index a97d913..f06d54e 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Implementation of InterpreterMacroAssembler
@@ -233,7 +236,7 @@ void InterpreterMacroAssembler::get_cache_index_at_bcp(Register reg, int bcp_off
void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Register index,
int bcp_offset, size_t index_size) {
- assert(cache != index, "must use different registers");
+ assert_different_registers(cache, index);
get_cache_index_at_bcp(index, bcp_offset, index_size);
movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize));
assert(sizeof(ConstantPoolCacheEntry) == 4*wordSize, "adjust code below");
@@ -241,6 +244,20 @@ void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache, Regis
}
+void InterpreterMacroAssembler::get_cache_and_index_and_bytecode_at_bcp(Register cache,
+ Register index,
+ Register bytecode,
+ int byte_no,
+ int bcp_offset,
+ size_t index_size) {
+ get_cache_and_index_at_bcp(cache, index, bcp_offset, index_size);
+ movptr(bytecode, Address(cache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
+ const int shift_count = (1 + byte_no) * BitsPerByte;
+ shrptr(bytecode, shift_count);
+ andptr(bytecode, 0xFF);
+}
+
+
void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache, Register tmp,
int bcp_offset, size_t index_size) {
assert(cache != tmp, "must use different register");
@@ -1144,7 +1161,7 @@ void InterpreterMacroAssembler::record_klass_in_profile_helper(
int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row));
set_mdp_data_at(mdp, recvr_offset, receiver);
int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
- movptr(reg2, (int32_t)DataLayout::counter_increment);
+ movptr(reg2, (intptr_t)DataLayout::counter_increment);
set_mdp_data_at(mdp, count_offset, reg2);
if (start_row > 0) {
jmp(done);
@@ -1287,7 +1304,7 @@ void InterpreterMacroAssembler::profile_switch_case(Register index, Register mdp
test_method_data_pointer(mdp, profile_continue);
// Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes()
- movptr(reg2, (int32_t)in_bytes(MultiBranchData::per_case_size()));
+ movptr(reg2, (intptr_t)in_bytes(MultiBranchData::per_case_size()));
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp
index d08f0fd..97f1da4 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_32.hpp
@@ -83,6 +83,7 @@ class InterpreterMacroAssembler: public MacroAssembler {
}
void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset);
void get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, size_t index_size = sizeof(u2));
+ void get_cache_and_index_and_bytecode_at_bcp(Register cache, Register index, Register bytecode, int byte_no, int bcp_offset, size_t index_size = sizeof(u2));
void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2));
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp
index cee2705..e418436 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Implementation of InterpreterMacroAssembler
@@ -233,7 +236,7 @@ void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache,
Register index,
int bcp_offset,
size_t index_size) {
- assert(cache != index, "must use different registers");
+ assert_different_registers(cache, index);
get_cache_index_at_bcp(index, bcp_offset, index_size);
movptr(cache, Address(rbp, frame::interpreter_frame_cache_offset * wordSize));
assert(sizeof(ConstantPoolCacheEntry) == 4 * wordSize, "adjust code below");
@@ -242,6 +245,22 @@ void InterpreterMacroAssembler::get_cache_and_index_at_bcp(Register cache,
}
+void InterpreterMacroAssembler::get_cache_and_index_and_bytecode_at_bcp(Register cache,
+ Register index,
+ Register bytecode,
+ int byte_no,
+ int bcp_offset,
+ size_t index_size) {
+ get_cache_and_index_at_bcp(cache, index, bcp_offset, index_size);
+ // We use a 32-bit load here since the layout of 64-bit words on
+ // little-endian machines allow us that.
+ movl(bytecode, Address(cache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
+ const int shift_count = (1 + byte_no) * BitsPerByte;
+ shrl(bytecode, shift_count);
+ andl(bytecode, 0xFF);
+}
+
+
void InterpreterMacroAssembler::get_cache_entry_pointer_at_bcp(Register cache,
Register tmp,
int bcp_offset,
diff --git a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp
index b203abc..cb17e01 100644
--- a/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp
+++ b/hotspot/src/cpu/x86/vm/interp_masm_x86_64.hpp
@@ -100,13 +100,11 @@ class InterpreterMacroAssembler: public MacroAssembler {
}
void get_unsigned_2_byte_index_at_bcp(Register reg, int bcp_offset);
- void get_cache_and_index_at_bcp(Register cache, Register index,
- int bcp_offset, size_t index_size = sizeof(u2));
- void get_cache_entry_pointer_at_bcp(Register cache, Register tmp,
- int bcp_offset, size_t index_size = sizeof(u2));
+ void get_cache_and_index_at_bcp(Register cache, Register index, int bcp_offset, size_t index_size = sizeof(u2));
+ void get_cache_and_index_and_bytecode_at_bcp(Register cache, Register index, Register bytecode, int byte_no, int bcp_offset, size_t index_size = sizeof(u2));
+ void get_cache_entry_pointer_at_bcp(Register cache, Register tmp, int bcp_offset, size_t index_size = sizeof(u2));
void get_cache_index_at_bcp(Register index, int bcp_offset, size_t index_size = sizeof(u2));
-
void pop_ptr(Register r = rax);
void pop_i(Register r = rax);
void pop_l(Register r = rax);
diff --git a/hotspot/src/cpu/x86/vm/jni_x86.h b/hotspot/src/cpu/x86/vm/jni_x86.h
index d06bb5c..d1b37b9 100644
--- a/hotspot/src/cpu/x86/vm/jni_x86.h
+++ b/hotspot/src/cpu/x86/vm/jni_x86.h
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
#define _JAVASOFT_JNI_MD_H_
-#if defined(SOLARIS) || defined(LINUX)
+#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
#if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
#define JNIEXPORT __attribute__((visibility("default")))
diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
index 30b62c9..dd741fd 100644
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
@@ -624,6 +624,11 @@ address MethodHandles::generate_method_handle_interpreter_entry(MacroAssembler*
// error path for invokeExact (only)
__ bind(invoke_exact_error_path);
+ // ensure that the top of stack is properly aligned.
+ __ mov(rdi, rsp);
+ __ andptr(rsp, -StackAlignmentInBytes); // Align the stack for the ABI
+ __ pushptr(Address(rdi, 0)); // Pick up the return address
+
// Stub wants expected type in rax and the actual type in rcx
__ jump(ExternalAddress(StubRoutines::throw_WrongMethodTypeException_entry()));
@@ -1192,11 +1197,11 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
const int jobject_oop_offset = 0;
__ movptr(rbx_method, Address(rbx_method, jobject_oop_offset)); // dereference the jobject
- __ movptr(rsi, rsp);
+ __ movptr(saved_last_sp, rsp);
__ subptr(rsp, 3 * wordSize);
__ push(rax_pc); // restore caller PC
- __ movptr(__ argument_address(constant(2)), rarg0_code);
+ __ movl (__ argument_address(constant(2)), rarg0_code);
__ movptr(__ argument_address(constant(1)), rarg1_actual);
__ movptr(__ argument_address(constant(0)), rarg2_required);
jump_from_method_handle(_masm, rbx_method, rax);
@@ -1343,6 +1348,13 @@ void MethodHandles::generate_method_handle_stub(MacroAssembler* _masm, MethodHan
}
break;
+ case _adapter_opt_profiling:
+ if (java_lang_invoke_CountingMethodHandle::vmcount_offset_in_bytes() != 0) {
+ Address rcx_mh_vmcount(rcx_recv, java_lang_invoke_CountingMethodHandle::vmcount_offset_in_bytes());
+ __ incrementl(rcx_mh_vmcount);
+ }
+ // fall through
+
case _adapter_retype_only:
case _adapter_retype_raw:
// immediately jump to the next MH layer:
diff --git a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
index c4ed0b7..bf85c33 100644
--- a/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/methodHandles_x86.hpp
@@ -110,6 +110,7 @@ public:
class RicochetFrame {
friend class MethodHandles;
+ friend class VMStructs;
private:
intptr_t* _continuation; // what to do when control gets back here
diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
index f21ed39..9b43aba 100644
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp
@@ -2471,7 +2471,7 @@ void SharedRuntime::generate_deopt_blob() {
__ movl(counter, rbx);
// Pick up the initial fp we should save
- __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_fp_offset_in_bytes()));
+ __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
// Now adjust the caller's stack to make up for the extra locals
// but record the original sp so that we can save it in the skeletal interpreter
@@ -2691,7 +2691,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
__ movl(counter, rbx);
// Pick up the initial fp we should save
- __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_fp_offset_in_bytes()));
+ __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
// Now adjust the caller's stack to make up for the extra locals
// but record the original sp so that we can save it in the skeletal interpreter
diff --git a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
index 06b3d8d..effb3ce 100644
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp
@@ -2730,7 +2730,7 @@ void SharedRuntime::generate_deopt_blob() {
__ movl(rdx, Address(rdi, Deoptimization::UnrollBlock::number_of_frames_offset_in_bytes()));
// Pick up the initial fp we should save
- __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_fp_offset_in_bytes()));
+ __ movptr(rbp, Address(rdi, Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
// Now adjust the caller's stack to make up for the extra locals
// but record the original sp so that we can save it in the skeletal interpreter
@@ -2922,7 +2922,7 @@ void SharedRuntime::generate_uncommon_trap_blob() {
// Pick up the initial fp we should save
__ movptr(rbp,
Address(rdi,
- Deoptimization::UnrollBlock::initial_fp_offset_in_bytes()));
+ Deoptimization::UnrollBlock::initial_info_offset_in_bytes()));
// Now adjust the caller's stack to make up for the extra locals but
// record the original sp so that we can save it in the skeletal
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
index c0a6ec3..fb85fff 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
@@ -2187,7 +2190,7 @@ class StubGenerator: public StubCodeGenerator {
// either at call sites or otherwise assume that stack unwinding will be initiated,
// so caller saved registers were assumed volatile in the compiler.
address generate_throw_exception(const char* name, address runtime_entry,
- bool restore_saved_exception_pc, Register arg1 = noreg, Register arg2 = noreg) {
+ Register arg1 = noreg, Register arg2 = noreg) {
int insts_size = 256;
int locs_size = 32;
@@ -2204,10 +2207,6 @@ class StubGenerator: public StubCodeGenerator {
// differently than the real call_VM
Register java_thread = rbx;
__ get_thread(java_thread);
- if (restore_saved_exception_pc) {
- __ movptr(rax, Address(java_thread, in_bytes(JavaThread::saved_exception_pc_offset())));
- __ push(rax);
- }
__ enter(); // required for proper stackwalking of RuntimeStub frame
@@ -2323,7 +2322,7 @@ class StubGenerator: public StubCodeGenerator {
StubRoutines::_throw_WrongMethodTypeException_entry =
generate_throw_exception("WrongMethodTypeException throw_exception",
CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException),
- false, rax, rcx);
+ rax, rcx);
}
@@ -2332,12 +2331,10 @@ class StubGenerator: public StubCodeGenerator {
// These entry points require SharedInfo::stack0 to be set up in non-core builds
// and need to be relocatable, so they each fabricate a RuntimeStub internally.
- StubRoutines::_throw_AbstractMethodError_entry = generate_throw_exception("AbstractMethodError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_AbstractMethodError), false);
- StubRoutines::_throw_IncompatibleClassChangeError_entry= generate_throw_exception("IncompatibleClassChangeError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_IncompatibleClassChangeError), false);
- StubRoutines::_throw_ArithmeticException_entry = generate_throw_exception("ArithmeticException throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_ArithmeticException), true);
- StubRoutines::_throw_NullPointerException_entry = generate_throw_exception("NullPointerException throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException), true);
- StubRoutines::_throw_NullPointerException_at_call_entry= generate_throw_exception("NullPointerException at call throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call), false);
- StubRoutines::_throw_StackOverflowError_entry = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError), false);
+ StubRoutines::_throw_AbstractMethodError_entry = generate_throw_exception("AbstractMethodError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_AbstractMethodError));
+ StubRoutines::_throw_IncompatibleClassChangeError_entry= generate_throw_exception("IncompatibleClassChangeError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_IncompatibleClassChangeError));
+ StubRoutines::_throw_NullPointerException_at_call_entry= generate_throw_exception("NullPointerException at call throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_NullPointerException_at_call));
+ StubRoutines::_throw_StackOverflowError_entry = generate_throw_exception("StackOverflowError throw_exception", CAST_FROM_FN_PTR(address, SharedRuntime::throw_StackOverflowError));
//------------------------------------------------------------------------------------------------------------------------
// entry points that are platform specific
diff --git a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
index 095412b..53d9431 100644
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
@@ -935,6 +938,8 @@ class StubGenerator: public StubCodeGenerator {
__ pusha(); // push registers
Address next_pc(rsp, RegisterImpl::number_of_registers * BytesPerWord);
+ // FIXME: this probably needs alignment logic
+
__ subptr(rsp, frame::arg_reg_save_area_bytes);
BLOCK_COMMENT("call handle_unsafe_access");
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, handle_unsafe_access)));
@@ -2934,7 +2939,6 @@ class StubGenerator: public StubCodeGenerator {
// caller saved registers were assumed volatile in the compiler.
address generate_throw_exception(const char* name,
address runtime_entry,
- bool restore_saved_exception_pc,
Register arg1 = noreg,
Register arg2 = noreg) {
// Information about frame layout at time of blocking runtime call.
@@ -2962,12 +2966,6 @@ class StubGenerator: public StubCodeGenerator {
// which has the ability to fetch the return PC out of
// thread-local storage and also sets up last_Java_sp slightly
// differently than the real call_VM
- if (restore_saved_exception_pc) {
- __ movptr(rax,
- Address(r15_thread,
- in_bytes(JavaThread::saved_exception_pc_offset())));
- __ push(rax);
- }
__ enter(); // required for proper stackwalking of RuntimeStub frame
@@ -3068,7 +3066,7 @@ class StubGenerator: public StubCodeGenerator {
StubRoutines::_throw_WrongMethodTypeException_entry =
generate_throw_exception("WrongMethodTypeException throw_exception",
CAST_FROM_FN_PTR(address, SharedRuntime::throw_WrongMethodTypeException),
- false, rax, rcx);
+ rax, rcx);
}
void generate_all() {
@@ -3081,43 +3079,25 @@ class StubGenerator: public StubCodeGenerator {
generate_throw_exception("AbstractMethodError throw_exception",
CAST_FROM_FN_PTR(address,
SharedRuntime::
- throw_AbstractMethodError),
- false);
+ throw_AbstractMethodError));
StubRoutines::_throw_IncompatibleClassChangeError_entry =
generate_throw_exception("IncompatibleClassChangeError throw_exception",
CAST_FROM_FN_PTR(address,
SharedRuntime::
- throw_IncompatibleClassChangeError),
- false);
-
- StubRoutines::_throw_ArithmeticException_entry =
- generate_throw_exception("ArithmeticException throw_exception",
- CAST_FROM_FN_PTR(address,
- SharedRuntime::
- throw_ArithmeticException),
- true);
-
- StubRoutines::_throw_NullPointerException_entry =
- generate_throw_exception("NullPointerException throw_exception",
- CAST_FROM_FN_PTR(address,
- SharedRuntime::
- throw_NullPointerException),
- true);
+ throw_IncompatibleClassChangeError));
StubRoutines::_throw_NullPointerException_at_call_entry =
generate_throw_exception("NullPointerException at call throw_exception",
CAST_FROM_FN_PTR(address,
SharedRuntime::
- throw_NullPointerException_at_call),
- false);
+ throw_NullPointerException_at_call));
StubRoutines::_throw_StackOverflowError_entry =
generate_throw_exception("StackOverflowError throw_exception",
CAST_FROM_FN_PTR(address,
SharedRuntime::
- throw_StackOverflowError),
- false);
+ throw_StackOverflowError));
// entry points that are platform specific
StubRoutines::x86::_f2i_fixup = generate_f2i_fixup();
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp
index dfdab6f..6ec4121 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
diff --git a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
index caab63b..182872b 100644
--- a/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Implementation of the platform-specific part of StubRoutines - for
// a description of how to extend it, see the stubRoutines.hpp file.
diff --git a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
index 01bd472..65e65ef 100644
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_32.cpp
@@ -202,45 +202,74 @@ Address TemplateTable::at_bcp(int offset) {
}
-void TemplateTable::patch_bytecode(Bytecodes::Code bytecode, Register bc,
- Register scratch,
- bool load_bc_into_scratch/*=true*/) {
-
- if (!RewriteBytecodes) return;
- // the pair bytecodes have already done the load.
- if (load_bc_into_scratch) {
- __ movl(bc, bytecode);
+void TemplateTable::patch_bytecode(Bytecodes::Code bc, Register bc_reg,
+ Register temp_reg, bool load_bc_into_bc_reg/*=true*/,
+ int byte_no) {
+ if (!RewriteBytecodes) return;
+ Label L_patch_done;
+
+ switch (bc) {
+ case Bytecodes::_fast_aputfield:
+ case Bytecodes::_fast_bputfield:
+ case Bytecodes::_fast_cputfield:
+ case Bytecodes::_fast_dputfield:
+ case Bytecodes::_fast_fputfield:
+ case Bytecodes::_fast_iputfield:
+ case Bytecodes::_fast_lputfield:
+ case Bytecodes::_fast_sputfield:
+ {
+ // We skip bytecode quickening for putfield instructions when
+ // the put_code written to the constant pool cache is zero.
+ // This is required so that every execution of this instruction
+ // calls out to InterpreterRuntime::resolve_get_put to do
+ // additional, required work.
+ assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
+ assert(load_bc_into_bc_reg, "we use bc_reg as temp");
+ __ get_cache_and_index_and_bytecode_at_bcp(bc_reg, temp_reg, temp_reg, byte_no, 1);
+ __ movl(bc_reg, bc);
+ __ cmpl(temp_reg, (int) 0);
+ __ jcc(Assembler::zero, L_patch_done); // don't patch
+ }
+ break;
+ default:
+ assert(byte_no == -1, "sanity");
+ // the pair bytecodes have already done the load.
+ if (load_bc_into_bc_reg) {
+ __ movl(bc_reg, bc);
+ }
}
- Label patch_done;
+
if (JvmtiExport::can_post_breakpoint()) {
- Label fast_patch;
+ Label L_fast_patch;
// if a breakpoint is present we can't rewrite the stream directly
- __ movzbl(scratch, at_bcp(0));
- __ cmpl(scratch, Bytecodes::_breakpoint);
- __ jcc(Assembler::notEqual, fast_patch);
- __ get_method(scratch);
+ __ movzbl(temp_reg, at_bcp(0));
+ __ cmpl(temp_reg, Bytecodes::_breakpoint);
+ __ jcc(Assembler::notEqual, L_fast_patch);
+ __ get_method(temp_reg);
// Let breakpoint table handling rewrite to quicker bytecode
- __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), scratch, rsi, bc);
+ __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), temp_reg, rsi, bc_reg);
#ifndef ASSERT
- __ jmpb(patch_done);
+ __ jmpb(L_patch_done);
#else
- __ jmp(patch_done);
+ __ jmp(L_patch_done);
#endif
- __ bind(fast_patch);
+ __ bind(L_fast_patch);
}
+
#ifdef ASSERT
- Label okay;
- __ load_unsigned_byte(scratch, at_bcp(0));
- __ cmpl(scratch, (int)Bytecodes::java_code(bytecode));
- __ jccb(Assembler::equal, okay);
- __ cmpl(scratch, bc);
- __ jcc(Assembler::equal, okay);
+ Label L_okay;
+ __ load_unsigned_byte(temp_reg, at_bcp(0));
+ __ cmpl(temp_reg, (int)Bytecodes::java_code(bc));
+ __ jccb(Assembler::equal, L_okay);
+ __ cmpl(temp_reg, bc_reg);
+ __ jcc(Assembler::equal, L_okay);
__ stop("patching the wrong bytecode");
- __ bind(okay);
+ __ bind(L_okay);
#endif
+
// patch bytecode
- __ movb(at_bcp(0), bc);
- __ bind(patch_done);
+ __ movb(at_bcp(0), bc_reg);
+ __ bind(L_patch_done);
}
//----------------------------------------------------------------------------------------------------
@@ -2060,24 +2089,20 @@ void TemplateTable::resolve_cache_and_index(int byte_no,
assert_different_registers(result, Rcache, index, temp);
Label resolved;
- __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
if (byte_no == f1_oop) {
// We are resolved if the f1 field contains a non-null object (CallSite, etc.)
// This kind of CP cache entry does not need to match the flags byte, because
// there is a 1-1 relation between bytecode type and CP entry type.
assert(result != noreg, ""); //else do cmpptr(Address(...), (int32_t) NULL_WORD)
+ __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
__ movptr(result, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset()));
__ testptr(result, result);
__ jcc(Assembler::notEqual, resolved);
} else {
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
assert(result == noreg, ""); //else change code for setting result
- const int shift_count = (1 + byte_no)*BitsPerByte;
- __ movl(temp, Address(Rcache, index, Address::times_4, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
- __ shrl(temp, shift_count);
- // have we resolved this bytecode?
- __ andl(temp, 0xFF);
- __ cmpl(temp, (int)bytecode());
+ __ get_cache_and_index_and_bytecode_at_bcp(Rcache, index, temp, byte_no, 1, index_size);
+ __ cmpl(temp, (int) bytecode()); // have we resolved this bytecode?
__ jcc(Assembler::equal, resolved);
}
@@ -2453,138 +2478,153 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
__ shrl(flags, ConstantPoolCacheEntry::tosBits);
assert(btos == 0, "change code, btos != 0");
- // btos
__ andl(flags, 0x0f);
__ jcc(Assembler::notZero, notByte);
- __ pop(btos);
- if (!is_static) pop_and_check_object(obj);
- __ movb(lo, rax );
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_bputfield, rcx, rbx);
+ // btos
+ {
+ __ pop(btos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movb(lo, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_bputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notByte);
- // itos
- __ cmpl(flags, itos );
+ __ cmpl(flags, itos);
__ jcc(Assembler::notEqual, notInt);
- __ pop(itos);
- if (!is_static) pop_and_check_object(obj);
-
- __ movl(lo, rax );
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_iputfield, rcx, rbx);
+ // itos
+ {
+ __ pop(itos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movl(lo, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_iputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notInt);
- // atos
- __ cmpl(flags, atos );
+ __ cmpl(flags, atos);
__ jcc(Assembler::notEqual, notObj);
- __ pop(atos);
- if (!is_static) pop_and_check_object(obj);
-
- do_oop_store(_masm, lo, rax, _bs->kind(), false);
-
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_aputfield, rcx, rbx);
+ // atos
+ {
+ __ pop(atos);
+ if (!is_static) pop_and_check_object(obj);
+ do_oop_store(_masm, lo, rax, _bs->kind(), false);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_aputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
-
__ bind(notObj);
- // ctos
- __ cmpl(flags, ctos );
+ __ cmpl(flags, ctos);
__ jcc(Assembler::notEqual, notChar);
- __ pop(ctos);
- if (!is_static) pop_and_check_object(obj);
- __ movw(lo, rax );
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_cputfield, rcx, rbx);
+ // ctos
+ {
+ __ pop(ctos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movw(lo, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_cputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notChar);
- // stos
- __ cmpl(flags, stos );
+ __ cmpl(flags, stos);
__ jcc(Assembler::notEqual, notShort);
- __ pop(stos);
- if (!is_static) pop_and_check_object(obj);
- __ movw(lo, rax );
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_sputfield, rcx, rbx);
+ // stos
+ {
+ __ pop(stos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movw(lo, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_sputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notShort);
- // ltos
- __ cmpl(flags, ltos );
+ __ cmpl(flags, ltos);
__ jcc(Assembler::notEqual, notLong);
- Label notVolatileLong;
- __ testl(rdx, rdx);
- __ jcc(Assembler::zero, notVolatileLong);
-
- __ pop(ltos); // overwrites rdx, do this after testing volatile.
- if (!is_static) pop_and_check_object(obj);
-
- // Replace with real volatile test
- __ push(rdx);
- __ push(rax); // Must update atomically with FIST
- __ fild_d(Address(rsp,0)); // So load into FPU register
- __ fistp_d(lo); // and put into memory atomically
- __ addptr(rsp, 2*wordSize);
- // volatile_barrier();
- volatile_barrier(Assembler::Membar_mask_bits(Assembler::StoreLoad |
- Assembler::StoreStore));
- // Don't rewrite volatile version
- __ jmp(notVolatile);
-
- __ bind(notVolatileLong);
-
- __ pop(ltos); // overwrites rdx
- if (!is_static) pop_and_check_object(obj);
- NOT_LP64(__ movptr(hi, rdx));
- __ movptr(lo, rax);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_lputfield, rcx, rbx);
+ // ltos
+ {
+ Label notVolatileLong;
+ __ testl(rdx, rdx);
+ __ jcc(Assembler::zero, notVolatileLong);
+
+ __ pop(ltos); // overwrites rdx, do this after testing volatile.
+ if (!is_static) pop_and_check_object(obj);
+
+ // Replace with real volatile test
+ __ push(rdx);
+ __ push(rax); // Must update atomically with FIST
+ __ fild_d(Address(rsp,0)); // So load into FPU register
+ __ fistp_d(lo); // and put into memory atomically
+ __ addptr(rsp, 2*wordSize);
+ // volatile_barrier();
+ volatile_barrier(Assembler::Membar_mask_bits(Assembler::StoreLoad |
+ Assembler::StoreStore));
+ // Don't rewrite volatile version
+ __ jmp(notVolatile);
+
+ __ bind(notVolatileLong);
+
+ __ pop(ltos); // overwrites rdx
+ if (!is_static) pop_and_check_object(obj);
+ NOT_LP64(__ movptr(hi, rdx));
+ __ movptr(lo, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_lputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(notVolatile);
}
- __ jmp(notVolatile);
__ bind(notLong);
- // ftos
- __ cmpl(flags, ftos );
+ __ cmpl(flags, ftos);
__ jcc(Assembler::notEqual, notFloat);
- __ pop(ftos);
- if (!is_static) pop_and_check_object(obj);
- __ fstp_s(lo);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_fputfield, rcx, rbx);
+ // ftos
+ {
+ __ pop(ftos);
+ if (!is_static) pop_and_check_object(obj);
+ __ fstp_s(lo);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_fputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notFloat);
- // dtos
- __ cmpl(flags, dtos );
+#ifdef ASSERT
+ __ cmpl(flags, dtos);
__ jcc(Assembler::notEqual, notDouble);
+#endif
- __ pop(dtos);
- if (!is_static) pop_and_check_object(obj);
- __ fstp_d(lo);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_dputfield, rcx, rbx);
+ // dtos
+ {
+ __ pop(dtos);
+ if (!is_static) pop_and_check_object(obj);
+ __ fstp_d(lo);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_dputfield, rcx, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
+#ifdef ASSERT
__ bind(notDouble);
-
__ stop("Bad state");
+#endif
__ bind(Done);
diff --git a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
index a88bcb7..818fb44 100644
--- a/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86_64.cpp
@@ -203,46 +203,74 @@ Address TemplateTable::at_bcp(int offset) {
return Address(r13, offset);
}
-void TemplateTable::patch_bytecode(Bytecodes::Code bytecode, Register bc,
- Register scratch,
- bool load_bc_into_scratch/*=true*/) {
- if (!RewriteBytecodes) {
- return;
- }
- // the pair bytecodes have already done the load.
- if (load_bc_into_scratch) {
- __ movl(bc, bytecode);
+void TemplateTable::patch_bytecode(Bytecodes::Code bc, Register bc_reg,
+ Register temp_reg, bool load_bc_into_bc_reg/*=true*/,
+ int byte_no) {
+ if (!RewriteBytecodes) return;
+ Label L_patch_done;
+
+ switch (bc) {
+ case Bytecodes::_fast_aputfield:
+ case Bytecodes::_fast_bputfield:
+ case Bytecodes::_fast_cputfield:
+ case Bytecodes::_fast_dputfield:
+ case Bytecodes::_fast_fputfield:
+ case Bytecodes::_fast_iputfield:
+ case Bytecodes::_fast_lputfield:
+ case Bytecodes::_fast_sputfield:
+ {
+ // We skip bytecode quickening for putfield instructions when
+ // the put_code written to the constant pool cache is zero.
+ // This is required so that every execution of this instruction
+ // calls out to InterpreterRuntime::resolve_get_put to do
+ // additional, required work.
+ assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
+ assert(load_bc_into_bc_reg, "we use bc_reg as temp");
+ __ get_cache_and_index_and_bytecode_at_bcp(temp_reg, bc_reg, temp_reg, byte_no, 1);
+ __ movl(bc_reg, bc);
+ __ cmpl(temp_reg, (int) 0);
+ __ jcc(Assembler::zero, L_patch_done); // don't patch
+ }
+ break;
+ default:
+ assert(byte_no == -1, "sanity");
+ // the pair bytecodes have already done the load.
+ if (load_bc_into_bc_reg) {
+ __ movl(bc_reg, bc);
+ }
}
- Label patch_done;
+
if (JvmtiExport::can_post_breakpoint()) {
- Label fast_patch;
+ Label L_fast_patch;
// if a breakpoint is present we can't rewrite the stream directly
- __ movzbl(scratch, at_bcp(0));
- __ cmpl(scratch, Bytecodes::_breakpoint);
- __ jcc(Assembler::notEqual, fast_patch);
- __ get_method(scratch);
+ __ movzbl(temp_reg, at_bcp(0));
+ __ cmpl(temp_reg, Bytecodes::_breakpoint);
+ __ jcc(Assembler::notEqual, L_fast_patch);
+ __ get_method(temp_reg);
// Let breakpoint table handling rewrite to quicker bytecode
- __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), scratch, r13, bc);
+ __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::set_original_bytecode_at), temp_reg, r13, bc_reg);
#ifndef ASSERT
- __ jmpb(patch_done);
+ __ jmpb(L_patch_done);
#else
- __ jmp(patch_done);
+ __ jmp(L_patch_done);
#endif
- __ bind(fast_patch);
+ __ bind(L_fast_patch);
}
+
#ifdef ASSERT
- Label okay;
- __ load_unsigned_byte(scratch, at_bcp(0));
- __ cmpl(scratch, (int) Bytecodes::java_code(bytecode));
- __ jcc(Assembler::equal, okay);
- __ cmpl(scratch, bc);
- __ jcc(Assembler::equal, okay);
+ Label L_okay;
+ __ load_unsigned_byte(temp_reg, at_bcp(0));
+ __ cmpl(temp_reg, (int) Bytecodes::java_code(bc));
+ __ jcc(Assembler::equal, L_okay);
+ __ cmpl(temp_reg, bc_reg);
+ __ jcc(Assembler::equal, L_okay);
__ stop("patching the wrong bytecode");
- __ bind(okay);
+ __ bind(L_okay);
#endif
+
// patch bytecode
- __ movb(at_bcp(0), bc);
- __ bind(patch_done);
+ __ movb(at_bcp(0), bc_reg);
+ __ bind(L_patch_done);
}
@@ -2098,24 +2126,20 @@ void TemplateTable::resolve_cache_and_index(int byte_no,
assert_different_registers(result, Rcache, index, temp);
Label resolved;
- __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
if (byte_no == f1_oop) {
// We are resolved if the f1 field contains a non-null object (CallSite, etc.)
// This kind of CP cache entry does not need to match the flags byte, because
// there is a 1-1 relation between bytecode type and CP entry type.
assert(result != noreg, ""); //else do cmpptr(Address(...), (int32_t) NULL_WORD)
+ __ get_cache_and_index_at_bcp(Rcache, index, 1, index_size);
__ movptr(result, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f1_offset()));
__ testptr(result, result);
__ jcc(Assembler::notEqual, resolved);
} else {
assert(byte_no == f1_byte || byte_no == f2_byte, "byte_no out of range");
assert(result == noreg, ""); //else change code for setting result
- const int shift_count = (1 + byte_no) * BitsPerByte;
- __ movl(temp, Address(Rcache, index, Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
- __ shrl(temp, shift_count);
- // have we resolved this bytecode?
- __ andl(temp, 0xFF);
- __ cmpl(temp, (int) bytecode());
+ __ get_cache_and_index_and_bytecode_at_bcp(Rcache, index, temp, byte_no, 1, index_size);
+ __ cmpl(temp, (int) bytecode()); // have we resolved this bytecode?
__ jcc(Assembler::equal, resolved);
}
@@ -2507,101 +2531,123 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
assert(btos == 0, "change code, btos != 0");
__ andl(flags, 0x0f);
__ jcc(Assembler::notZero, notByte);
+
// btos
- __ pop(btos);
- if (!is_static) pop_and_check_object(obj);
- __ movb(field, rax);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_bputfield, bc, rbx);
+ {
+ __ pop(btos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movb(field, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_bputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notByte);
__ cmpl(flags, atos);
__ jcc(Assembler::notEqual, notObj);
- // atos
- __ pop(atos);
- if (!is_static) pop_and_check_object(obj);
- // Store into the field
- do_oop_store(_masm, field, rax, _bs->kind(), false);
-
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_aputfield, bc, rbx);
+ // atos
+ {
+ __ pop(atos);
+ if (!is_static) pop_and_check_object(obj);
+ // Store into the field
+ do_oop_store(_masm, field, rax, _bs->kind(), false);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_aputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notObj);
__ cmpl(flags, itos);
__ jcc(Assembler::notEqual, notInt);
+
// itos
- __ pop(itos);
- if (!is_static) pop_and_check_object(obj);
- __ movl(field, rax);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_iputfield, bc, rbx);
+ {
+ __ pop(itos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movl(field, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_iputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notInt);
__ cmpl(flags, ctos);
__ jcc(Assembler::notEqual, notChar);
+
// ctos
- __ pop(ctos);
- if (!is_static) pop_and_check_object(obj);
- __ movw(field, rax);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_cputfield, bc, rbx);
+ {
+ __ pop(ctos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movw(field, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_cputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notChar);
__ cmpl(flags, stos);
__ jcc(Assembler::notEqual, notShort);
+
// stos
- __ pop(stos);
- if (!is_static) pop_and_check_object(obj);
- __ movw(field, rax);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_sputfield, bc, rbx);
+ {
+ __ pop(stos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movw(field, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_sputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notShort);
__ cmpl(flags, ltos);
__ jcc(Assembler::notEqual, notLong);
+
// ltos
- __ pop(ltos);
- if (!is_static) pop_and_check_object(obj);
- __ movq(field, rax);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_lputfield, bc, rbx);
+ {
+ __ pop(ltos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movq(field, rax);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_lputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notLong);
__ cmpl(flags, ftos);
__ jcc(Assembler::notEqual, notFloat);
+
// ftos
- __ pop(ftos);
- if (!is_static) pop_and_check_object(obj);
- __ movflt(field, xmm0);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_fputfield, bc, rbx);
+ {
+ __ pop(ftos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movflt(field, xmm0);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_fputfield, bc, rbx, true, byte_no);
+ }
+ __ jmp(Done);
}
- __ jmp(Done);
__ bind(notFloat);
#ifdef ASSERT
__ cmpl(flags, dtos);
__ jcc(Assembler::notEqual, notDouble);
#endif
+
// dtos
- __ pop(dtos);
- if (!is_static) pop_and_check_object(obj);
- __ movdbl(field, xmm0);
- if (!is_static) {
- patch_bytecode(Bytecodes::_fast_dputfield, bc, rbx);
+ {
+ __ pop(dtos);
+ if (!is_static) pop_and_check_object(obj);
+ __ movdbl(field, xmm0);
+ if (!is_static) {
+ patch_bytecode(Bytecodes::_fast_dputfield, bc, rbx, true, byte_no);
+ }
}
#ifdef ASSERT
@@ -2612,12 +2658,12 @@ void TemplateTable::putfield_or_static(int byte_no, bool is_static) {
#endif
__ bind(Done);
+
// Check for volatile store
__ testl(rdx, rdx);
__ jcc(Assembler::zero, notVolatile);
volatile_barrier(Assembler::Membar_mask_bits(Assembler::StoreLoad |
Assembler::StoreStore));
-
__ bind(notVolatile);
}
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
index 4303441..7a8ee72 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
int VM_Version::_cpu;
@@ -557,14 +560,16 @@ void VM_Version::get_processor_features() {
if( !supports_sse() && supports_3dnow_prefetch() ) AllocatePrefetchInstr = 3;
// Allocation prefetch settings
- intx cache_line_size = L1_data_cache_line_size();
+ intx cache_line_size = prefetch_data_size();
if( cache_line_size > AllocatePrefetchStepSize )
AllocatePrefetchStepSize = cache_line_size;
- if( FLAG_IS_DEFAULT(AllocatePrefetchLines) )
- AllocatePrefetchLines = 3; // Optimistic value
+
assert(AllocatePrefetchLines > 0, "invalid value");
- if( AllocatePrefetchLines < 1 ) // set valid value in product VM
- AllocatePrefetchLines = 1; // Conservative value
+ if( AllocatePrefetchLines < 1 ) // set valid value in product VM
+ AllocatePrefetchLines = 3;
+ assert(AllocateInstancePrefetchLines > 0, "invalid value");
+ if( AllocateInstancePrefetchLines < 1 ) // set valid value in product VM
+ AllocateInstancePrefetchLines = 1;
AllocatePrefetchDistance = allocate_prefetch_distance();
AllocatePrefetchStyle = allocate_prefetch_style();
@@ -601,10 +606,11 @@ void VM_Version::get_processor_features() {
tty->print_cr("Logical CPUs per core: %u",
logical_processors_per_package());
tty->print_cr("UseSSE=%d",UseSSE);
- tty->print("Allocation: ");
+ tty->print("Allocation");
if (AllocatePrefetchStyle <= 0 || UseSSE == 0 && !supports_3dnow_prefetch()) {
- tty->print_cr("no prefetching");
+ tty->print_cr(": no prefetching");
} else {
+ tty->print(" prefetching: ");
if (UseSSE == 0 && supports_3dnow_prefetch()) {
tty->print("PREFETCHW");
} else if (UseSSE >= 1) {
@@ -619,9 +625,9 @@ void VM_Version::get_processor_features() {
}
}
if (AllocatePrefetchLines > 1) {
- tty->print_cr(" %d, %d lines with step %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
+ tty->print_cr(" at distance %d, %d lines of %d bytes", AllocatePrefetchDistance, AllocatePrefetchLines, AllocatePrefetchStepSize);
} else {
- tty->print_cr(" %d, one line", AllocatePrefetchDistance);
+ tty->print_cr(" at distance %d, one line of %d bytes", AllocatePrefetchDistance, AllocatePrefetchStepSize);
}
}
diff --git a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
index 47f5db9..47d81e0 100644
--- a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp
@@ -419,7 +419,7 @@ public:
return result;
}
- static intx L1_data_cache_line_size() {
+ static intx prefetch_data_size() {
intx result = 0;
if (is_intel()) {
result = (_cpuid_info.dcp_cpuid4_ebx.bits.L1_line_size + 1);
diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad
index bfa9e28..b403752 100644
--- a/hotspot/src/cpu/x86/vm/x86_32.ad
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad
@@ -1369,7 +1369,12 @@ const uint Matcher::vector_ideal_reg(void) {
//
// NOTE: If the platform does not provide any short branch variants, then
// this method should return false for offset 0.
-bool Matcher::is_short_branch_offset(int rule, int offset) {
+bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
+ // The passed offset is relative to address of the branch.
+ // On 86 a branch displacement is calculated relative to address
+ // of a next instruction.
+ offset -= br_size;
+
// the short version of jmpConUCF2 contains multiple branches,
// making the reach slightly less
if (rule == jmpConUCF2_rule)
@@ -1713,18 +1718,6 @@ encode %{
else emit_d32(cbuf,con);
%}
- enc_class Lbl (label labl) %{ // JMP, CALL
- Label *l = $labl$$label;
- emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.insts_size()+4)) : 0);
- %}
-
- enc_class LblShort (label labl) %{ // JMP, CALL
- Label *l = $labl$$label;
- int disp = l ? (l->loc_pos() - (cbuf.insts_size()+1)) : 0;
- assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
- emit_d8(cbuf, disp);
- %}
-
enc_class OpcSReg (eRegI dst) %{ // BSWAP
emit_cc(cbuf, $secondary, $dst$$reg );
%}
@@ -1747,21 +1740,6 @@ encode %{
emit_rm(cbuf, 0x3, $secondary, $div$$reg );
%}
- enc_class Jcc (cmpOp cop, label labl) %{ // JCC
- Label *l = $labl$$label;
- $$$emit8$primary;
- emit_cc(cbuf, $secondary, $cop$$cmpcode);
- emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.insts_size()+4)) : 0);
- %}
-
- enc_class JccShort (cmpOp cop, label labl) %{ // JCC
- Label *l = $labl$$label;
- emit_cc(cbuf, $primary, $cop$$cmpcode);
- int disp = l ? (l->loc_pos() - (cbuf.insts_size()+1)) : 0;
- assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
- emit_d8(cbuf, disp);
- %}
-
enc_class enc_cmov(cmpOp cop ) %{ // CMOV
$$$emit8$primary;
emit_cc(cbuf, $secondary, $cop$$cmpcode);
@@ -4496,7 +4474,6 @@ op_attrib op_cost(0); // Required cost attribute
//----------Instruction Attributes---------------------------------------------
ins_attrib ins_cost(100); // Required cost attribute
ins_attrib ins_size(8); // Required size attribute (in bits)
-ins_attrib ins_pc_relative(0); // Required PC Relative flag
ins_attrib ins_short_branch(0); // Required flag: is this instruction a
// non-matching short branch variant of some
// long branch?
@@ -7348,8 +7325,9 @@ instruct prefetchr( memory mem ) %{
ins_cost(100);
format %{ "PREFETCHR $mem\t! Prefetch into level 1 cache for read" %}
- opcode(0x0F, 0x0d); /* Opcode 0F 0d /0 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x00,mem));
+ ins_encode %{
+ __ prefetchr($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -7359,8 +7337,9 @@ instruct prefetchrNTA( memory mem ) %{
ins_cost(100);
format %{ "PREFETCHNTA $mem\t! Prefetch into non-temporal cache for read" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /0 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x00,mem));
+ ins_encode %{
+ __ prefetchnta($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -7370,8 +7349,9 @@ instruct prefetchrT0( memory mem ) %{
ins_cost(100);
format %{ "PREFETCHT0 $mem\t! Prefetch into L1 and L2 caches for read" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /1 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x01,mem));
+ ins_encode %{
+ __ prefetcht0($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -7381,8 +7361,9 @@ instruct prefetchrT2( memory mem ) %{
ins_cost(100);
format %{ "PREFETCHT2 $mem\t! Prefetch into L2 cache for read" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /3 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x03,mem));
+ ins_encode %{
+ __ prefetcht2($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -7397,46 +7378,86 @@ instruct prefetchw0( memory mem ) %{
%}
instruct prefetchw( memory mem ) %{
- predicate(UseSSE==0 && VM_Version::supports_3dnow_prefetch() || AllocatePrefetchInstr==3);
+ predicate(UseSSE==0 && VM_Version::supports_3dnow_prefetch());
match( PrefetchWrite mem );
ins_cost(100);
format %{ "PREFETCHW $mem\t! Prefetch into L1 cache and mark modified" %}
- opcode(0x0F, 0x0D); /* Opcode 0F 0D /1 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x01,mem));
+ ins_encode %{
+ __ prefetchw($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
instruct prefetchwNTA( memory mem ) %{
- predicate(UseSSE>=1 && AllocatePrefetchInstr==0);
+ predicate(UseSSE>=1);
match(PrefetchWrite mem);
ins_cost(100);
format %{ "PREFETCHNTA $mem\t! Prefetch into non-temporal cache for write" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /0 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x00,mem));
+ ins_encode %{
+ __ prefetchnta($mem$$Address);
+ %}
+ ins_pipe(ialu_mem);
+%}
+
+// Prefetch instructions for allocation.
+
+instruct prefetchAlloc0( memory mem ) %{
+ predicate(UseSSE==0 && AllocatePrefetchInstr!=3);
+ match(PrefetchAllocation mem);
+ ins_cost(0);
+ size(0);
+ format %{ "Prefetch allocation (non-SSE is empty encoding)" %}
+ ins_encode();
+ ins_pipe(empty);
+%}
+
+instruct prefetchAlloc( memory mem ) %{
+ predicate(AllocatePrefetchInstr==3);
+ match( PrefetchAllocation mem );
+ ins_cost(100);
+
+ format %{ "PREFETCHW $mem\t! Prefetch allocation into L1 cache and mark modified" %}
+ ins_encode %{
+ __ prefetchw($mem$$Address);
+ %}
+ ins_pipe(ialu_mem);
+%}
+
+instruct prefetchAllocNTA( memory mem ) %{
+ predicate(UseSSE>=1 && AllocatePrefetchInstr==0);
+ match(PrefetchAllocation mem);
+ ins_cost(100);
+
+ format %{ "PREFETCHNTA $mem\t! Prefetch allocation into non-temporal cache for write" %}
+ ins_encode %{
+ __ prefetchnta($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
-instruct prefetchwT0( memory mem ) %{
+instruct prefetchAllocT0( memory mem ) %{
predicate(UseSSE>=1 && AllocatePrefetchInstr==1);
- match(PrefetchWrite mem);
+ match(PrefetchAllocation mem);
ins_cost(100);
- format %{ "PREFETCHT0 $mem\t! Prefetch into L1 and L2 caches for write" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /1 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x01,mem));
+ format %{ "PREFETCHT0 $mem\t! Prefetch allocation into L1 and L2 caches for write" %}
+ ins_encode %{
+ __ prefetcht0($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
-instruct prefetchwT2( memory mem ) %{
+instruct prefetchAllocT2( memory mem ) %{
predicate(UseSSE>=1 && AllocatePrefetchInstr==2);
- match(PrefetchWrite mem);
+ match(PrefetchAllocation mem);
ins_cost(100);
- format %{ "PREFETCHT2 $mem\t! Prefetch into L2 cache for write" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /3 */
- ins_encode(OpcP, OpcS, RMopc_Mem(0x03,mem));
+ format %{ "PREFETCHT2 $mem\t! Prefetch allocation into L2 cache for write" %}
+ ins_encode %{
+ __ prefetcht2($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -7806,8 +7827,7 @@ instruct membar_acquire() %{
%}
instruct membar_acquire_lock() %{
- match(MemBarAcquire);
- predicate(Matcher::prior_fast_lock(n));
+ match(MemBarAcquireLock);
ins_cost(0);
size(0);
@@ -7827,8 +7847,7 @@ instruct membar_release() %{
%}
instruct membar_release_lock() %{
- match(MemBarRelease);
- predicate(Matcher::post_fast_unlock(n));
+ match(MemBarReleaseLock);
ins_cost(0);
size(0);
@@ -13047,7 +13066,6 @@ instruct jumpXtnd(eRegI switch_val) %{
Address index(noreg, $switch_val$$Register, Address::times_1);
__ jump(ArrayAddress($constantaddress, index));
%}
- ins_pc_relative(1);
ins_pipe(pipe_jmp);
%}
@@ -13059,10 +13077,11 @@ instruct jmpDir(label labl) %{
ins_cost(300);
format %{ "JMP $labl" %}
size(5);
- opcode(0xE9);
- ins_encode( OpcP, Lbl( labl ) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jmp(*L, false); // Always long jump
+ %}
ins_pipe( pipe_jmp );
- ins_pc_relative(1);
%}
// Jump Direct Conditional - Label defines a relative address from Jcc+1
@@ -13073,10 +13092,11 @@ instruct jmpCon(cmpOp cop, eFlagsReg cr, label labl) %{
ins_cost(300);
format %{ "J$cop $labl" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode( Jcc( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
%}
// Jump Direct Conditional - Label defines a relative address from Jcc+1
@@ -13087,10 +13107,11 @@ instruct jmpLoopEnd(cmpOp cop, eFlagsReg cr, label labl) %{
ins_cost(300);
format %{ "J$cop $labl\t# Loop end" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode( Jcc( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
%}
// Jump Direct Conditional - Label defines a relative address from Jcc+1
@@ -13101,10 +13122,11 @@ instruct jmpLoopEndU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "J$cop,u $labl\t# Loop end" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode( Jcc( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
%}
instruct jmpLoopEndUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
@@ -13114,10 +13136,11 @@ instruct jmpLoopEndUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
ins_cost(200);
format %{ "J$cop,u $labl\t# Loop end" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode( Jcc( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
%}
// Jump Direct Conditional - using unsigned comparison
@@ -13128,10 +13151,11 @@ instruct jmpConU(cmpOpU cop, eFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "J$cop,u $labl" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
instruct jmpConUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
@@ -13141,10 +13165,11 @@ instruct jmpConUCF(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
ins_cost(200);
format %{ "J$cop,u $labl" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
instruct jmpConUCF2(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
@@ -13162,31 +13187,21 @@ instruct jmpConUCF2(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
$$emit$$"done:"
}
%}
- size(12);
- opcode(0x0F, 0x80);
ins_encode %{
Label* l = $labl$$label;
- $$$emit8$primary;
- emit_cc(cbuf, $secondary, Assembler::parity);
- int parity_disp = -1;
- bool ok = false;
if ($cop$$cmpcode == Assembler::notEqual) {
- // the two jumps 6 bytes apart so the jump distances are too
- parity_disp = l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0;
+ __ jcc(Assembler::parity, *l, false);
+ __ jcc(Assembler::notEqual, *l, false);
} else if ($cop$$cmpcode == Assembler::equal) {
- parity_disp = 6;
- ok = true;
+ Label done;
+ __ jccb(Assembler::parity, done);
+ __ jcc(Assembler::equal, *l, false);
+ __ bind(done);
} else {
ShouldNotReachHere();
}
- emit_d32(cbuf, parity_disp);
- $$$emit8$primary;
- emit_cc(cbuf, $secondary, $cop$$cmpcode);
- int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0;
- emit_d32(cbuf, disp);
%}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
// ============================================================================
@@ -13251,10 +13266,11 @@ instruct jmpDir_short(label labl) %{
ins_cost(300);
format %{ "JMP,s $labl" %}
size(2);
- opcode(0xEB);
- ins_encode( OpcP, LblShort( labl ) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jmpb(*L);
+ %}
ins_pipe( pipe_jmp );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13266,10 +13282,11 @@ instruct jmpCon_short(cmpOp cop, eFlagsReg cr, label labl) %{
ins_cost(300);
format %{ "J$cop,s $labl" %}
size(2);
- opcode(0x70);
- ins_encode( JccShort( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13281,10 +13298,11 @@ instruct jmpLoopEnd_short(cmpOp cop, eFlagsReg cr, label labl) %{
ins_cost(300);
format %{ "J$cop,s $labl\t# Loop end" %}
size(2);
- opcode(0x70);
- ins_encode( JccShort( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13296,10 +13314,11 @@ instruct jmpLoopEndU_short(cmpOpU cop, eFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "J$cop,us $labl\t# Loop end" %}
size(2);
- opcode(0x70);
- ins_encode( JccShort( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13310,10 +13329,11 @@ instruct jmpLoopEndUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
ins_cost(300);
format %{ "J$cop,us $labl\t# Loop end" %}
size(2);
- opcode(0x70);
- ins_encode( JccShort( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13325,10 +13345,11 @@ instruct jmpConU_short(cmpOpU cop, eFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "J$cop,us $labl" %}
size(2);
- opcode(0x70);
- ins_encode( JccShort( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13339,10 +13360,11 @@ instruct jmpConUCF_short(cmpOpUCF cop, eFlagsRegUCF cmp, label labl) %{
ins_cost(300);
format %{ "J$cop,us $labl" %}
size(2);
- opcode(0x70);
- ins_encode( JccShort( cop, labl) );
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe( pipe_jcc );
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13362,27 +13384,21 @@ instruct jmpConUCF2_short(cmpOpUCF2 cop, eFlagsRegUCF cmp, label labl) %{
}
%}
size(4);
- opcode(0x70);
ins_encode %{
Label* l = $labl$$label;
- emit_cc(cbuf, $primary, Assembler::parity);
- int parity_disp = -1;
if ($cop$$cmpcode == Assembler::notEqual) {
- parity_disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
+ __ jccb(Assembler::parity, *l);
+ __ jccb(Assembler::notEqual, *l);
} else if ($cop$$cmpcode == Assembler::equal) {
- parity_disp = 2;
+ Label done;
+ __ jccb(Assembler::parity, done);
+ __ jccb(Assembler::equal, *l);
+ __ bind(done);
} else {
- ShouldNotReachHere();
+ ShouldNotReachHere();
}
- emit_d8(cbuf, parity_disp);
- emit_cc(cbuf, $primary, $cop$$cmpcode);
- int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
- emit_d8(cbuf, disp);
- assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
- assert(-128 <= parity_disp && parity_disp <= 127, "Displacement too large for short jmp");
%}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -13855,7 +13871,6 @@ instruct CallStaticJavaDirect(method meth) %{
call_epilog,
post_call_FPU );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
ins_alignment(4);
%}
@@ -13879,7 +13894,6 @@ instruct CallStaticJavaHandle(method meth, eBPRegP ebp_mh_SP_save) %{
call_epilog,
post_call_FPU );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
ins_alignment(4);
%}
@@ -13899,7 +13913,6 @@ instruct CallDynamicJavaDirect(method meth) %{
call_epilog,
post_call_FPU );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
ins_alignment(4);
%}
@@ -13917,7 +13930,6 @@ instruct CallRuntimeDirect(method meth) %{
Java_To_Runtime( meth ),
post_call_FPU );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
%}
// Call runtime without safepoint
@@ -13933,7 +13945,6 @@ instruct CallLeafDirect(method meth) %{
Java_To_Runtime( meth ),
Verify_FPU_For_Leaf, post_call_FPU );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
%}
instruct CallLeafNoFPDirect(method meth) %{
@@ -13945,7 +13956,6 @@ instruct CallLeafNoFPDirect(method meth) %{
opcode(0xE8); /* E8 cd */
ins_encode(Java_To_Runtime(meth));
ins_pipe( pipe_slow );
- ins_pc_relative(1);
%}
@@ -14024,7 +14034,6 @@ instruct cmpFastLock( eFlagsReg cr, eRegP object, eRegP box, eAXRegI tmp, eRegP
format %{ "FASTLOCK $object, $box KILLS $tmp,$scr" %}
ins_encode( Fast_Lock(object,box,tmp,scr) );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
%}
instruct cmpFastUnlock( eFlagsReg cr, eRegP object, eAXRegP box, eRegP tmp ) %{
@@ -14034,7 +14043,6 @@ instruct cmpFastUnlock( eFlagsReg cr, eRegP object, eAXRegP box, eRegP tmp ) %{
format %{ "FASTUNLOCK $object, $box, $tmp" %}
ins_encode( Fast_Unlock(object,box,tmp) );
ins_pipe( pipe_slow );
- ins_pc_relative(1);
%}
diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad
index 9612d4f..4f6fa3c 100644
--- a/hotspot/src/cpu/x86/vm/x86_64.ad
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad
@@ -1966,7 +1966,12 @@ const uint Matcher::vector_ideal_reg(void) {
//
// NOTE: If the platform does not provide any short branch variants, then
// this method should return false for offset 0.
-bool Matcher::is_short_branch_offset(int rule, int offset) {
+bool Matcher::is_short_branch_offset(int rule, int br_size, int offset) {
+ // The passed offset is relative to address of the branch.
+ // On 86 a branch displacement is calculated relative to address
+ // of a next instruction.
+ offset -= br_size;
+
// the short version of jmpConUCF2 contains multiple branches,
// making the reach slightly less
if (rule == jmpConUCF2_rule)
@@ -2426,22 +2431,6 @@ encode %{
}
%}
- enc_class Lbl(label labl)
- %{
- // JMP, CALL
- Label* l = $labl$$label;
- emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0);
- %}
-
- enc_class LblShort(label labl)
- %{
- // JMP, CALL
- Label* l = $labl$$label;
- int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
- assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
- emit_d8(cbuf, disp);
- %}
-
enc_class opc2_reg(rRegI dst)
%{
// BSWAP
@@ -2460,25 +2449,6 @@ encode %{
emit_rm(cbuf, 0x3, $secondary, $div$$reg & 7);
%}
- enc_class Jcc(cmpOp cop, label labl)
- %{
- // JCC
- Label* l = $labl$$label;
- $$$emit8$primary;
- emit_cc(cbuf, $secondary, $cop$$cmpcode);
- emit_d32(cbuf, l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0);
- %}
-
- enc_class JccShort (cmpOp cop, label labl)
- %{
- // JCC
- Label *l = $labl$$label;
- emit_cc(cbuf, $primary, $cop$$cmpcode);
- int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
- assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
- emit_d8(cbuf, disp);
- %}
-
enc_class enc_cmov(cmpOp cop)
%{
// CMOV
@@ -4013,7 +3983,6 @@ op_attrib op_cost(0); // Required cost attribute
//----------Instruction Attributes---------------------------------------------
ins_attrib ins_cost(100); // Required cost attribute
ins_attrib ins_size(8); // Required size attribute (in bits)
-ins_attrib ins_pc_relative(0); // Required PC Relative flag
ins_attrib ins_short_branch(0); // Required flag: is this instruction
// a non-matching short branch variant
// of some long branch?
@@ -6648,8 +6617,9 @@ instruct prefetchr( memory mem ) %{
ins_cost(125);
format %{ "PREFETCHR $mem\t# Prefetch into level 1 cache" %}
- opcode(0x0F, 0x0D); /* Opcode 0F 0D /0 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x00, mem));
+ ins_encode %{
+ __ prefetchr($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -6659,8 +6629,9 @@ instruct prefetchrNTA( memory mem ) %{
ins_cost(125);
format %{ "PREFETCHNTA $mem\t# Prefetch into non-temporal cache for read" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /0 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x00, mem));
+ ins_encode %{
+ __ prefetchnta($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -6670,8 +6641,9 @@ instruct prefetchrT0( memory mem ) %{
ins_cost(125);
format %{ "PREFETCHT0 $mem\t# prefetch into L1 and L2 caches for read" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /1 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x01, mem));
+ ins_encode %{
+ __ prefetcht0($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -6681,52 +6653,70 @@ instruct prefetchrT2( memory mem ) %{
ins_cost(125);
format %{ "PREFETCHT2 $mem\t# prefetch into L2 caches for read" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /3 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x03, mem));
+ ins_encode %{
+ __ prefetcht2($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
-instruct prefetchw( memory mem ) %{
- predicate(AllocatePrefetchInstr==3);
+instruct prefetchwNTA( memory mem ) %{
match(PrefetchWrite mem);
ins_cost(125);
- format %{ "PREFETCHW $mem\t# Prefetch into level 1 cache and mark modified" %}
- opcode(0x0F, 0x0D); /* Opcode 0F 0D /1 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x01, mem));
+ format %{ "PREFETCHNTA $mem\t# Prefetch to non-temporal cache for write" %}
+ ins_encode %{
+ __ prefetchnta($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
-instruct prefetchwNTA( memory mem ) %{
+// Prefetch instructions for allocation.
+
+instruct prefetchAlloc( memory mem ) %{
+ predicate(AllocatePrefetchInstr==3);
+ match(PrefetchAllocation mem);
+ ins_cost(125);
+
+ format %{ "PREFETCHW $mem\t# Prefetch allocation into level 1 cache and mark modified" %}
+ ins_encode %{
+ __ prefetchw($mem$$Address);
+ %}
+ ins_pipe(ialu_mem);
+%}
+
+instruct prefetchAllocNTA( memory mem ) %{
predicate(AllocatePrefetchInstr==0);
- match(PrefetchWrite mem);
+ match(PrefetchAllocation mem);
ins_cost(125);
- format %{ "PREFETCHNTA $mem\t# Prefetch to non-temporal cache for write" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /0 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x00, mem));
+ format %{ "PREFETCHNTA $mem\t# Prefetch allocation to non-temporal cache for write" %}
+ ins_encode %{
+ __ prefetchnta($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
-instruct prefetchwT0( memory mem ) %{
+instruct prefetchAllocT0( memory mem ) %{
predicate(AllocatePrefetchInstr==1);
- match(PrefetchWrite mem);
+ match(PrefetchAllocation mem);
ins_cost(125);
- format %{ "PREFETCHT0 $mem\t# Prefetch to level 1 and 2 caches for write" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /1 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x01, mem));
+ format %{ "PREFETCHT0 $mem\t# Prefetch allocation to level 1 and 2 caches for write" %}
+ ins_encode %{
+ __ prefetcht0($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
-instruct prefetchwT2( memory mem ) %{
+instruct prefetchAllocT2( memory mem ) %{
predicate(AllocatePrefetchInstr==2);
- match(PrefetchWrite mem);
+ match(PrefetchAllocation mem);
ins_cost(125);
- format %{ "PREFETCHT2 $mem\t# Prefetch to level 2 cache for write" %}
- opcode(0x0F, 0x18); /* Opcode 0F 18 /3 */
- ins_encode(REX_mem(mem), OpcP, OpcS, RM_opc_mem(0x03, mem));
+ format %{ "PREFETCHT2 $mem\t# Prefetch allocation to level 2 cache for write" %}
+ ins_encode %{
+ __ prefetcht2($mem$$Address);
+ %}
ins_pipe(ialu_mem);
%}
@@ -7376,8 +7366,7 @@ instruct membar_acquire()
instruct membar_acquire_lock()
%{
- match(MemBarAcquire);
- predicate(Matcher::prior_fast_lock(n));
+ match(MemBarAcquireLock);
ins_cost(0);
size(0);
@@ -7399,8 +7388,7 @@ instruct membar_release()
instruct membar_release_lock()
%{
- match(MemBarRelease);
- predicate(Matcher::post_fast_unlock(n));
+ match(MemBarReleaseLock);
ins_cost(0);
size(0);
@@ -7547,7 +7535,6 @@ instruct jumpXtnd_offset(rRegL switch_val, immI2 shift, rRegI dest) %{
__ jmp(dispatch);
%}
ins_pipe(pipe_jmp);
- ins_pc_relative(1);
%}
instruct jumpXtnd_addr(rRegL switch_val, immI2 shift, immL32 offset, rRegI dest) %{
@@ -7568,7 +7555,6 @@ instruct jumpXtnd_addr(rRegL switch_val, immI2 shift, immL32 offset, rRegI dest)
__ jmp(dispatch);
%}
ins_pipe(pipe_jmp);
- ins_pc_relative(1);
%}
instruct jumpXtnd(rRegL switch_val, rRegI dest) %{
@@ -7589,7 +7575,6 @@ instruct jumpXtnd(rRegL switch_val, rRegI dest) %{
__ jmp(dispatch);
%}
ins_pipe(pipe_jmp);
- ins_pc_relative(1);
%}
// Conditional move
@@ -12017,10 +12002,11 @@ instruct jmpDir(label labl)
ins_cost(300);
format %{ "jmp $labl" %}
size(5);
- opcode(0xE9);
- ins_encode(OpcP, Lbl(labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jmp(*L, false); // Always long jump
+ %}
ins_pipe(pipe_jmp);
- ins_pc_relative(1);
%}
// Jump Direct Conditional - Label defines a relative address from Jcc+1
@@ -12032,10 +12018,11 @@ instruct jmpCon(cmpOp cop, rFlagsReg cr, label labl)
ins_cost(300);
format %{ "j$cop $labl" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
// Jump Direct Conditional - Label defines a relative address from Jcc+1
@@ -12047,10 +12034,11 @@ instruct jmpLoopEnd(cmpOp cop, rFlagsReg cr, label labl)
ins_cost(300);
format %{ "j$cop $labl\t# loop end" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
// Jump Direct Conditional - Label defines a relative address from Jcc+1
@@ -12061,10 +12049,11 @@ instruct jmpLoopEndU(cmpOpU cop, rFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "j$cop,u $labl\t# loop end" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
instruct jmpLoopEndUCF(cmpOpUCF cop, rFlagsRegUCF cmp, label labl) %{
@@ -12074,10 +12063,11 @@ instruct jmpLoopEndUCF(cmpOpUCF cop, rFlagsRegUCF cmp, label labl) %{
ins_cost(200);
format %{ "j$cop,u $labl\t# loop end" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
// Jump Direct Conditional - using unsigned comparison
@@ -12088,10 +12078,11 @@ instruct jmpConU(cmpOpU cop, rFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "j$cop,u $labl" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
instruct jmpConUCF(cmpOpUCF cop, rFlagsRegUCF cmp, label labl) %{
@@ -12101,10 +12092,11 @@ instruct jmpConUCF(cmpOpUCF cop, rFlagsRegUCF cmp, label labl) %{
ins_cost(200);
format %{ "j$cop,u $labl" %}
size(6);
- opcode(0x0F, 0x80);
- ins_encode(Jcc(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jcc((Assembler::Condition)($cop$$cmpcode), *L, false); // Always long jump
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
instruct jmpConUCF2(cmpOpUCF2 cop, rFlagsRegUCF cmp, label labl) %{
@@ -12122,29 +12114,21 @@ instruct jmpConUCF2(cmpOpUCF2 cop, rFlagsRegUCF cmp, label labl) %{
$$emit$$"done:"
}
%}
- size(12);
- opcode(0x0F, 0x80);
ins_encode %{
Label* l = $labl$$label;
- $$$emit8$primary;
- emit_cc(cbuf, $secondary, Assembler::parity);
- int parity_disp = -1;
if ($cop$$cmpcode == Assembler::notEqual) {
- // the two jumps 6 bytes apart so the jump distances are too
- parity_disp = l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0;
+ __ jcc(Assembler::parity, *l, false);
+ __ jcc(Assembler::notEqual, *l, false);
} else if ($cop$$cmpcode == Assembler::equal) {
- parity_disp = 6;
+ Label done;
+ __ jccb(Assembler::parity, done);
+ __ jcc(Assembler::equal, *l, false);
+ __ bind(done);
} else {
ShouldNotReachHere();
}
- emit_d32(cbuf, parity_disp);
- $$$emit8$primary;
- emit_cc(cbuf, $secondary, $cop$$cmpcode);
- int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 4)) : 0;
- emit_d32(cbuf, disp);
%}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
%}
// ============================================================================
@@ -12218,10 +12202,11 @@ instruct jmpDir_short(label labl) %{
ins_cost(300);
format %{ "jmp,s $labl" %}
size(2);
- opcode(0xEB);
- ins_encode(OpcP, LblShort(labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jmpb(*L);
+ %}
ins_pipe(pipe_jmp);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12233,10 +12218,11 @@ instruct jmpCon_short(cmpOp cop, rFlagsReg cr, label labl) %{
ins_cost(300);
format %{ "j$cop,s $labl" %}
size(2);
- opcode(0x70);
- ins_encode(JccShort(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12248,10 +12234,11 @@ instruct jmpLoopEnd_short(cmpOp cop, rFlagsReg cr, label labl) %{
ins_cost(300);
format %{ "j$cop,s $labl\t# loop end" %}
size(2);
- opcode(0x70);
- ins_encode(JccShort(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12263,10 +12250,11 @@ instruct jmpLoopEndU_short(cmpOpU cop, rFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "j$cop,us $labl\t# loop end" %}
size(2);
- opcode(0x70);
- ins_encode(JccShort(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12277,10 +12265,11 @@ instruct jmpLoopEndUCF_short(cmpOpUCF cop, rFlagsRegUCF cmp, label labl) %{
ins_cost(300);
format %{ "j$cop,us $labl\t# loop end" %}
size(2);
- opcode(0x70);
- ins_encode(JccShort(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12292,10 +12281,11 @@ instruct jmpConU_short(cmpOpU cop, rFlagsRegU cmp, label labl) %{
ins_cost(300);
format %{ "j$cop,us $labl" %}
size(2);
- opcode(0x70);
- ins_encode(JccShort(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12306,10 +12296,11 @@ instruct jmpConUCF_short(cmpOpUCF cop, rFlagsRegUCF cmp, label labl) %{
ins_cost(300);
format %{ "j$cop,us $labl" %}
size(2);
- opcode(0x70);
- ins_encode(JccShort(cop, labl));
+ ins_encode %{
+ Label* L = $labl$$label;
+ __ jccb((Assembler::Condition)($cop$$cmpcode), *L);
+ %}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12329,27 +12320,21 @@ instruct jmpConUCF2_short(cmpOpUCF2 cop, rFlagsRegUCF cmp, label labl) %{
}
%}
size(4);
- opcode(0x70);
ins_encode %{
Label* l = $labl$$label;
- emit_cc(cbuf, $primary, Assembler::parity);
- int parity_disp = -1;
if ($cop$$cmpcode == Assembler::notEqual) {
- parity_disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
+ __ jccb(Assembler::parity, *l);
+ __ jccb(Assembler::notEqual, *l);
} else if ($cop$$cmpcode == Assembler::equal) {
- parity_disp = 2;
+ Label done;
+ __ jccb(Assembler::parity, done);
+ __ jccb(Assembler::equal, *l);
+ __ bind(done);
} else {
- ShouldNotReachHere();
+ ShouldNotReachHere();
}
- emit_d8(cbuf, parity_disp);
- emit_cc(cbuf, $primary, $cop$$cmpcode);
- int disp = l ? (l->loc_pos() - (cbuf.insts_size() + 1)) : 0;
- emit_d8(cbuf, disp);
- assert(-128 <= disp && disp <= 127, "Displacement too large for short jmp");
- assert(-128 <= parity_disp && parity_disp <= 127, "Displacement too large for short jmp");
%}
ins_pipe(pipe_jcc);
- ins_pc_relative(1);
ins_short_branch(1);
%}
@@ -12366,7 +12351,6 @@ instruct cmpFastLock(rFlagsReg cr,
format %{ "fastlock $object,$box,$tmp,$scr" %}
ins_encode(Fast_Lock(object, box, tmp, scr));
ins_pipe(pipe_slow);
- ins_pc_relative(1);
%}
instruct cmpFastUnlock(rFlagsReg cr,
@@ -12379,7 +12363,6 @@ instruct cmpFastUnlock(rFlagsReg cr,
format %{ "fastunlock $object, $box, $tmp" %}
ins_encode(Fast_Unlock(object, box, tmp));
ins_pipe(pipe_slow);
- ins_pc_relative(1);
%}
@@ -12432,7 +12415,6 @@ instruct CallStaticJavaDirect(method meth) %{
opcode(0xE8); /* E8 cd */
ins_encode(Java_Static_Call(meth), call_epilog);
ins_pipe(pipe_slow);
- ins_pc_relative(1);
ins_alignment(4);
%}
@@ -12454,7 +12436,6 @@ instruct CallStaticJavaHandle(method meth, rbp_RegP rbp_mh_SP_save) %{
restore_SP,
call_epilog);
ins_pipe(pipe_slow);
- ins_pc_relative(1);
ins_alignment(4);
%}
@@ -12472,7 +12453,6 @@ instruct CallDynamicJavaDirect(method meth)
opcode(0xE8); /* E8 cd */
ins_encode(Java_Dynamic_Call(meth), call_epilog);
ins_pipe(pipe_slow);
- ins_pc_relative(1);
ins_alignment(4);
%}
@@ -12487,7 +12467,6 @@ instruct CallRuntimeDirect(method meth)
opcode(0xE8); /* E8 cd */
ins_encode(Java_To_Runtime(meth));
ins_pipe(pipe_slow);
- ins_pc_relative(1);
%}
// Call runtime without safepoint
@@ -12501,7 +12480,6 @@ instruct CallLeafDirect(method meth)
opcode(0xE8); /* E8 cd */
ins_encode(Java_To_Runtime(meth));
ins_pipe(pipe_slow);
- ins_pc_relative(1);
%}
// Call runtime without safepoint
@@ -12515,7 +12493,6 @@ instruct CallLeafNoFPDirect(method meth)
opcode(0xE8); /* E8 cd */
ins_encode(Java_To_Runtime(meth));
ins_pipe(pipe_slow);
- ins_pc_relative(1);
%}
// Return Instruction
diff --git a/hotspot/src/cpu/zero/vm/bytes_zero.hpp b/hotspot/src/cpu/zero/vm/bytes_zero.hpp
index 39caaea..be2e09a 100644
--- a/hotspot/src/cpu/zero/vm/bytes_zero.hpp
+++ b/hotspot/src/cpu/zero/vm/bytes_zero.hpp
@@ -168,6 +168,9 @@ class Bytes: AllStatic {
#ifdef TARGET_OS_ARCH_linux_zero
# include "bytes_linux_zero.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "bytes_bsd_zero.inline.hpp"
+#endif
#endif // VM_LITTLE_ENDIAN
diff --git a/hotspot/src/cpu/zero/vm/frame_zero.cpp b/hotspot/src/cpu/zero/vm/frame_zero.cpp
index a1e5ea6..35b6e52 100644
--- a/hotspot/src/cpu/zero/vm/frame_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/frame_zero.cpp
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -417,3 +417,17 @@ void ZeroFrame::identify_vp_word(int frame_index,
return;
}
}
+
+#ifdef ASSERT
+
+void frame::describe_pd(FrameValues& values, int frame_no) {
+
+}
+
+#endif
+
+intptr_t *frame::initial_deoptimization_info() {
+ // unused... but returns fp() to minimize changes introduced by 7087445
+ return fp();
+}
+
diff --git a/hotspot/src/cpu/zero/vm/globals_zero.hpp b/hotspot/src/cpu/zero/vm/globals_zero.hpp
index c45f1f5..6754e69 100644
--- a/hotspot/src/cpu/zero/vm/globals_zero.hpp
+++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp
@@ -52,7 +52,11 @@ define_pd_global(intx, StackShadowPages, 5 LP64_ONLY(+1) DEBUG_ONLY(+3));
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
+#ifdef _ALLBSD_SOURCE
+define_pd_global(bool, UseMembar, true);
+#else
define_pd_global(bool, UseMembar, false);
+#endif
// GC Ergo Flags
define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
diff --git a/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp b/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp
index 8b470eb..a85431b 100644
--- a/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/interp_masm_zero.cpp
@@ -40,5 +40,8 @@
#ifdef TARGET_OS_FAMILY_linux
# include "thread_linux.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// This file is intentionally empty
diff --git a/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp b/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp
new file mode 100644
index 0000000..84da099
--- /dev/null
+++ b/hotspot/src/cpu/zero/vm/methodHandles_zero.hpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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.
+ *
+ */
+
+
+// Adapters
+enum /* platform_dependent_constants */ {
+ adapter_code_size = 0
+};
+
+#define TARGET_ARCH_NYI_6939861 1
+// ..#ifdef TARGET_ARCH_NYI_6939861
+// .. // Here are some backward compatible declarations until the 6939861 ports are updated.
+// .. #define _adapter_flyby (_EK_LIMIT + 10)
+// .. #define _adapter_ricochet (_EK_LIMIT + 11)
+// .. #define _adapter_opt_spread_1 _adapter_opt_spread_1_ref
+// .. #define _adapter_opt_spread_more _adapter_opt_spread_ref
+// .. enum {
+// .. _INSERT_NO_MASK = -1,
+// .. _INSERT_REF_MASK = 0,
+// .. _INSERT_INT_MASK = 1,
+// .. _INSERT_LONG_MASK = 3
+// .. };
+// .. static void get_ek_bound_mh_info(EntryKind ek, BasicType& arg_type, int& arg_mask, int& arg_slots) {
+// .. arg_type = ek_bound_mh_arg_type(ek);
+// .. arg_mask = 0;
+// .. arg_slots = type2size[arg_type];;
+// .. }
+// .. static void get_ek_adapter_opt_swap_rot_info(EntryKind ek, int& swap_bytes, int& rotate) {
+// .. int swap_slots = ek_adapter_opt_swap_slots(ek);
+// .. rotate = ek_adapter_opt_swap_mode(ek);
+// .. swap_bytes = swap_slots * Interpreter::stackElementSize;
+// .. }
+// .. static int get_ek_adapter_opt_spread_info(EntryKind ek) {
+// .. return ek_adapter_opt_spread_count(ek);
+// .. }
+// ..
+// .. static void insert_arg_slots(MacroAssembler* _masm,
+// .. RegisterOrConstant arg_slots,
+// .. int arg_mask,
+// .. Register argslot_reg,
+// .. Register temp_reg, Register temp2_reg, Register temp3_reg = noreg);
+// ..
+// .. static void remove_arg_slots(MacroAssembler* _masm,
+// .. RegisterOrConstant arg_slots,
+// .. Register argslot_reg,
+// .. Register temp_reg, Register temp2_reg, Register temp3_reg = noreg);
+// ..
+// .. static void trace_method_handle(MacroAssembler* _masm, const char* adaptername) PRODUCT_RETURN;
+// ..#endif //TARGET_ARCH_NYI_6939861
diff --git a/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp b/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
index 6e7643a..29d0ed1 100644
--- a/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp
@@ -46,14 +46,6 @@
#include "shark/sharkCompiler.hpp"
#endif
-DeoptimizationBlob *SharedRuntime::_deopt_blob;
-SafepointBlob *SharedRuntime::_polling_page_safepoint_handler_blob;
-SafepointBlob *SharedRuntime::_polling_page_return_handler_blob;
-RuntimeStub *SharedRuntime::_wrong_method_blob;
-RuntimeStub *SharedRuntime::_ic_miss_blob;
-RuntimeStub *SharedRuntime::_resolve_opt_virtual_call_blob;
-RuntimeStub *SharedRuntime::_resolve_virtual_call_blob;
-RuntimeStub *SharedRuntime::_resolve_static_call_blob;
int SharedRuntime::java_calling_convention(const BasicType *sig_bt,
VMRegPair *regs,
@@ -114,22 +106,22 @@ static SafepointBlob* generate_empty_safepoint_blob() {
return SafepointBlob::create(&buffer, NULL, 0);
}
-void SharedRuntime::generate_stubs() {
- _wrong_method_blob =
- generate_empty_runtime_stub("wrong_method_stub");
- _ic_miss_blob =
- generate_empty_runtime_stub("ic_miss_stub");
- _resolve_opt_virtual_call_blob =
- generate_empty_runtime_stub("resolve_opt_virtual_call");
- _resolve_virtual_call_blob =
- generate_empty_runtime_stub("resolve_virtual_call");
- _resolve_static_call_blob =
- generate_empty_runtime_stub("resolve_static_call");
+static DeoptimizationBlob* generate_empty_deopt_blob() {
+ CodeBuffer buffer("handler_blob", 0, 0);
+ return DeoptimizationBlob::create(&buffer, NULL, 0, 0, 0, 0);
+}
+
+
+void SharedRuntime::generate_deopt_blob() {
+ _deopt_blob = generate_empty_deopt_blob();
+}
+
+SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, bool cause_return) {
+ return generate_empty_safepoint_blob();
+}
- _polling_page_safepoint_handler_blob =
- generate_empty_safepoint_blob();
- _polling_page_return_handler_blob =
- generate_empty_safepoint_blob();
+RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const char* name) {
+ return generate_empty_runtime_stub("resolve_blob");
}
int SharedRuntime::c_calling_convention(const BasicType *sig_bt,
diff --git a/hotspot/src/cpu/zero/vm/stack_zero.cpp b/hotspot/src/cpu/zero/vm/stack_zero.cpp
index f1b31cc..33b0551 100644
--- a/hotspot/src/cpu/zero/vm/stack_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/stack_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -69,7 +69,8 @@ void ZeroStack::handle_overflow(TRAPS) {
break;
case _thread_in_vm:
- Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__);
+ Exceptions::throw_stack_overflow_exception(thread, __FILE__, __LINE__,
+ methodHandle());
break;
default:
diff --git a/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp b/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp
index 77d23a4..4142e02 100644
--- a/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp
@@ -43,6 +43,9 @@
#ifdef TARGET_OS_FAMILY_linux
# include "thread_linux.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef COMPILER2
#include "opto/runtime.hpp"
#endif
@@ -215,12 +218,6 @@ class StubGenerator: public StubCodeGenerator {
StubRoutines::_throw_AbstractMethodError_entry =
ShouldNotCallThisStub();
- StubRoutines::_throw_ArithmeticException_entry =
- ShouldNotCallThisStub();
-
- StubRoutines::_throw_NullPointerException_entry =
- ShouldNotCallThisStub();
-
StubRoutines::_throw_NullPointerException_at_call_entry =
ShouldNotCallThisStub();
diff --git a/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp b/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp
index 96df53e..8b21dde 100644
--- a/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp
@@ -30,3 +30,6 @@
#ifdef TARGET_OS_FAMILY_linux
# include "thread_linux.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
diff --git a/hotspot/src/cpu/zero/vm/vm_version_zero.cpp b/hotspot/src/cpu/zero/vm/vm_version_zero.cpp
index 87ff88b..391e29d 100644
--- a/hotspot/src/cpu/zero/vm/vm_version_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/vm_version_zero.cpp
@@ -32,5 +32,8 @@
#ifdef TARGET_OS_FAMILY_linux
# include "os_linux.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// This file is intentionally empty
diff --git a/hotspot/src/os/bsd/vm/attachListener_bsd.cpp b/hotspot/src/os/bsd/vm/attachListener_bsd.cpp
new file mode 100644
index 0000000..f742470
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/attachListener_bsd.cpp
@@ -0,0 +1,520 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/os.hpp"
+#include "services/attachListener.hpp"
+#include "services/dtraceAttacher.hpp"
+
+#include <unistd.h>
+#include <signal.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/stat.h>
+
+#ifndef UNIX_PATH_MAX
+#define UNIX_PATH_MAX sizeof(((struct sockaddr_un *)0)->sun_path)
+#endif
+
+// The attach mechanism on Bsd uses a UNIX domain socket. An attach listener
+// thread is created at startup or is created on-demand via a signal from
+// the client tool. The attach listener creates a socket and binds it to a file
+// in the filesystem. The attach listener then acts as a simple (single-
+// threaded) server - it waits for a client to connect, reads the request,
+// executes it, and returns the response to the client via the socket
+// connection.
+//
+// As the socket is a UNIX domain socket it means that only clients on the
+// local machine can connect. In addition there are two other aspects to
+// the security:
+// 1. The well known file that the socket is bound to has permission 400
+// 2. When a client connect, the SO_PEERCRED socket option is used to
+// obtain the credentials of client. We check that the effective uid
+// of the client matches this process.
+
+// forward reference
+class BsdAttachOperation;
+
+class BsdAttachListener: AllStatic {
+ private:
+ // the path to which we bind the UNIX domain socket
+ static char _path[UNIX_PATH_MAX];
+ static bool _has_path;
+
+ // the file descriptor for the listening socket
+ static int _listener;
+
+ static void set_path(char* path) {
+ if (path == NULL) {
+ _has_path = false;
+ } else {
+ strncpy(_path, path, UNIX_PATH_MAX);
+ _path[UNIX_PATH_MAX-1] = '\0';
+ _has_path = true;
+ }
+ }
+
+ static void set_listener(int s) { _listener = s; }
+
+ // reads a request from the given connected socket
+ static BsdAttachOperation* read_request(int s);
+
+ public:
+ enum {
+ ATTACH_PROTOCOL_VER = 1 // protocol version
+ };
+ enum {
+ ATTACH_ERROR_BADVERSION = 101 // error codes
+ };
+
+ // initialize the listener, returns 0 if okay
+ static int init();
+
+ static char* path() { return _path; }
+ static bool has_path() { return _has_path; }
+ static int listener() { return _listener; }
+
+ // write the given buffer to a socket
+ static int write_fully(int s, char* buf, int len);
+
+ static BsdAttachOperation* dequeue();
+};
+
+class BsdAttachOperation: public AttachOperation {
+ private:
+ // the connection to the client
+ int _socket;
+
+ public:
+ void complete(jint res, bufferedStream* st);
+
+ void set_socket(int s) { _socket = s; }
+ int socket() const { return _socket; }
+
+ BsdAttachOperation(char* name) : AttachOperation(name) {
+ set_socket(-1);
+ }
+};
+
+// statics
+char BsdAttachListener::_path[UNIX_PATH_MAX];
+bool BsdAttachListener::_has_path;
+int BsdAttachListener::_listener = -1;
+
+// Supporting class to help split a buffer into individual components
+class ArgumentIterator : public StackObj {
+ private:
+ char* _pos;
+ char* _end;
+ public:
+ ArgumentIterator(char* arg_buffer, size_t arg_size) {
+ _pos = arg_buffer;
+ _end = _pos + arg_size - 1;
+ }
+ char* next() {
+ if (*_pos == '\0') {
+ return NULL;
+ }
+ char* res = _pos;
+ char* next_pos = strchr(_pos, '\0');
+ if (next_pos < _end) {
+ next_pos++;
+ }
+ _pos = next_pos;
+ return res;
+ }
+};
+
+
+// atexit hook to stop listener and unlink the file that it is
+// bound too.
+extern "C" {
+ static void listener_cleanup() {
+ static int cleanup_done;
+ if (!cleanup_done) {
+ cleanup_done = 1;
+ int s = BsdAttachListener::listener();
+ if (s != -1) {
+ ::close(s);
+ }
+ if (BsdAttachListener::has_path()) {
+ ::unlink(BsdAttachListener::path());
+ }
+ }
+ }
+}
+
+// Initialization - create a listener socket and bind it to a file
+
+int BsdAttachListener::init() {
+ char path[UNIX_PATH_MAX]; // socket file
+ char initial_path[UNIX_PATH_MAX]; // socket file during setup
+ int listener; // listener socket (file descriptor)
+
+ // register function to cleanup
+ ::atexit(listener_cleanup);
+
+ int n = snprintf(path, UNIX_PATH_MAX, "%s/.java_pid%d",
+ os::get_temp_directory(), os::current_process_id());
+ if (n < (int)UNIX_PATH_MAX) {
+ n = snprintf(initial_path, UNIX_PATH_MAX, "%s.tmp", path);
+ }
+ if (n >= (int)UNIX_PATH_MAX) {
+ return -1;
+ }
+
+ // create the listener socket
+ listener = ::socket(PF_UNIX, SOCK_STREAM, 0);
+ if (listener == -1) {
+ return -1;
+ }
+
+ // bind socket
+ struct sockaddr_un addr;
+ addr.sun_family = AF_UNIX;
+ strcpy(addr.sun_path, initial_path);
+ ::unlink(initial_path);
+ int res = ::bind(listener, (struct sockaddr*)&addr, sizeof(addr));
+ if (res == -1) {
+ RESTARTABLE(::close(listener), res);
+ return -1;
+ }
+
+ // put in listen mode, set permissions, and rename into place
+ res = ::listen(listener, 5);
+ if (res == 0) {
+ RESTARTABLE(::chmod(initial_path, S_IREAD|S_IWRITE), res);
+ if (res == 0) {
+ res = ::rename(initial_path, path);
+ }
+ }
+ if (res == -1) {
+ RESTARTABLE(::close(listener), res);
+ ::unlink(initial_path);
+ return -1;
+ }
+ set_path(path);
+ set_listener(listener);
+
+ return 0;
+}
+
+// Given a socket that is connected to a peer we read the request and
+// create an AttachOperation. As the socket is blocking there is potential
+// for a denial-of-service if the peer does not response. However this happens
+// after the peer credentials have been checked and in the worst case it just
+// means that the attach listener thread is blocked.
+//
+BsdAttachOperation* BsdAttachListener::read_request(int s) {
+ char ver_str[8];
+ sprintf(ver_str, "%d", ATTACH_PROTOCOL_VER);
+
+ // The request is a sequence of strings so we first figure out the
+ // expected count and the maximum possible length of the request.
+ // The request is:
+ // <ver>0<cmd>0<arg>0<arg>0<arg>0
+ // where <ver> is the protocol version (1), <cmd> is the command
+ // name ("load", "datadump", ...), and <arg> is an argument
+ int expected_str_count = 2 + AttachOperation::arg_count_max;
+ const int max_len = (sizeof(ver_str) + 1) + (AttachOperation::name_length_max + 1) +
+ AttachOperation::arg_count_max*(AttachOperation::arg_length_max + 1);
+
+ char buf[max_len];
+ int str_count = 0;
+
+ // Read until all (expected) strings have been read, the buffer is
+ // full, or EOF.
+
+ int off = 0;
+ int left = max_len;
+
+ do {
+ int n;
+ RESTARTABLE(read(s, buf+off, left), n);
+ if (n == -1) {
+ return NULL; // reset by peer or other error
+ }
+ if (n == 0) {
+ break;
+ }
+ for (int i=0; i<n; i++) {
+ if (buf[off+i] == 0) {
+ // EOS found
+ str_count++;
+
+ // The first string is <ver> so check it now to
+ // check for protocol mis-match
+ if (str_count == 1) {
+ if ((strlen(buf) != strlen(ver_str)) ||
+ (atoi(buf) != ATTACH_PROTOCOL_VER)) {
+ char msg[32];
+ sprintf(msg, "%d\n", ATTACH_ERROR_BADVERSION);
+ write_fully(s, msg, strlen(msg));
+ return NULL;
+ }
+ }
+ }
+ }
+ off += n;
+ left -= n;
+ } while (left > 0 && str_count < expected_str_count);
+
+ if (str_count != expected_str_count) {
+ return NULL; // incomplete request
+ }
+
+ // parse request
+
+ ArgumentIterator args(buf, (max_len)-left);
+
+ // version already checked
+ char* v = args.next();
+
+ char* name = args.next();
+ if (name == NULL || strlen(name) > AttachOperation::name_length_max) {
+ return NULL;
+ }
+
+ BsdAttachOperation* op = new BsdAttachOperation(name);
+
+ for (int i=0; i<AttachOperation::arg_count_max; i++) {
+ char* arg = args.next();
+ if (arg == NULL) {
+ op->set_arg(i, NULL);
+ } else {
+ if (strlen(arg) > AttachOperation::arg_length_max) {
+ delete op;
+ return NULL;
+ }
+ op->set_arg(i, arg);
+ }
+ }
+
+ op->set_socket(s);
+ return op;
+}
+
+
+// Dequeue an operation
+//
+// In the Bsd implementation there is only a single operation and clients
+// cannot queue commands (except at the socket level).
+//
+BsdAttachOperation* BsdAttachListener::dequeue() {
+ for (;;) {
+ int s;
+
+ // wait for client to connect
+ struct sockaddr addr;
+ socklen_t len = sizeof(addr);
+ RESTARTABLE(::accept(listener(), &addr, &len), s);
+ if (s == -1) {
+ return NULL; // log a warning?
+ }
+
+ // get the credentials of the peer and check the effective uid/guid
+ // - check with jeff on this.
+#ifdef _ALLBSD_SOURCE
+ uid_t puid;
+ gid_t pgid;
+ if (::getpeereid(s, &puid, &pgid) != 0) {
+ int res;
+ RESTARTABLE(::close(s), res);
+ continue;
+ }
+#else
+ struct ucred cred_info;
+ socklen_t optlen = sizeof(cred_info);
+ if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) {
+ int res;
+ RESTARTABLE(::close(s), res);
+ continue;
+ }
+ uid_t puid = cred_info.uid;
+ gid_t pgid = cred_info.gid;
+#endif
+ uid_t euid = geteuid();
+ gid_t egid = getegid();
+
+ if (puid != euid || pgid != egid) {
+ int res;
+ RESTARTABLE(::close(s), res);
+ continue;
+ }
+
+ // peer credential look okay so we read the request
+ BsdAttachOperation* op = read_request(s);
+ if (op == NULL) {
+ int res;
+ RESTARTABLE(::close(s), res);
+ continue;
+ } else {
+ return op;
+ }
+ }
+}
+
+// write the given buffer to the socket
+int BsdAttachListener::write_fully(int s, char* buf, int len) {
+ do {
+ int n = ::write(s, buf, len);
+ if (n == -1) {
+ if (errno != EINTR) return -1;
+ } else {
+ buf += n;
+ len -= n;
+ }
+ }
+ while (len > 0);
+ return 0;
+}
+
+// Complete an operation by sending the operation result and any result
+// output to the client. At this time the socket is in blocking mode so
+// potentially we can block if there is a lot of data and the client is
+// non-responsive. For most operations this is a non-issue because the
+// default send buffer is sufficient to buffer everything. In the future
+// if there are operations that involves a very big reply then it the
+// socket could be made non-blocking and a timeout could be used.
+
+void BsdAttachOperation::complete(jint result, bufferedStream* st) {
+ JavaThread* thread = JavaThread::current();
+ ThreadBlockInVM tbivm(thread);
+
+ thread->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or
+ // java_suspend_self() via check_and_wait_while_suspended()
+
+ // write operation result
+ char msg[32];
+ sprintf(msg, "%d\n", result);
+ int rc = BsdAttachListener::write_fully(this->socket(), msg, strlen(msg));
+
+ // write any result data
+ if (rc == 0) {
+ BsdAttachListener::write_fully(this->socket(), (char*) st->base(), st->size());
+ ::shutdown(this->socket(), 2);
+ }
+
+ // done
+ RESTARTABLE(::close(this->socket()), rc);
+
+ // were we externally suspended while we were waiting?
+ thread->check_and_wait_while_suspended();
+
+ delete this;
+}
+
+
+// AttachListener functions
+
+AttachOperation* AttachListener::dequeue() {
+ JavaThread* thread = JavaThread::current();
+ ThreadBlockInVM tbivm(thread);
+
+ thread->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or
+ // java_suspend_self() via check_and_wait_while_suspended()
+
+ AttachOperation* op = BsdAttachListener::dequeue();
+
+ // were we externally suspended while we were waiting?
+ thread->check_and_wait_while_suspended();
+
+ return op;
+}
+
+int AttachListener::pd_init() {
+ JavaThread* thread = JavaThread::current();
+ ThreadBlockInVM tbivm(thread);
+
+ thread->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or
+ // java_suspend_self() via check_and_wait_while_suspended()
+
+ int ret_code = BsdAttachListener::init();
+
+ // were we externally suspended while we were waiting?
+ thread->check_and_wait_while_suspended();
+
+ return ret_code;
+}
+
+// Attach Listener is started lazily except in the case when
+// +ReduseSignalUsage is used
+bool AttachListener::init_at_startup() {
+ if (ReduceSignalUsage) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
+// If the file .attach_pid<pid> exists in the working directory
+// or /tmp then this is the trigger to start the attach mechanism
+bool AttachListener::is_init_trigger() {
+ if (init_at_startup() || is_initialized()) {
+ return false; // initialized at startup or already initialized
+ }
+ char path[PATH_MAX + 1];
+ int ret;
+ struct stat st;
+
+ snprintf(path, PATH_MAX + 1, "%s/.attach_pid%d",
+ os::get_temp_directory(), os::current_process_id());
+ RESTARTABLE(::stat(path, &st), ret);
+ if (ret == 0) {
+ // simple check to avoid starting the attach mechanism when
+ // a bogus user creates the file
+ if (st.st_uid == geteuid()) {
+ init();
+ return true;
+ }
+ }
+ return false;
+}
+
+// if VM aborts then remove listener
+void AttachListener::abort() {
+ listener_cleanup();
+}
+
+void AttachListener::pd_data_dump() {
+ os::signal_notify(SIGQUIT);
+}
+
+AttachOperationFunctionInfo* AttachListener::pd_find_operation(const char* n) {
+ return NULL;
+}
+
+jint AttachListener::pd_set_flag(AttachOperation* op, outputStream* out) {
+ out->print_cr("flag '%s' cannot be changed", op->arg(0));
+ return JNI_ERR;
+}
+
+void AttachListener::pd_detachall() {
+ // do nothing for now
+}
diff --git a/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp b/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp
new file mode 100644
index 0000000..27e26af
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/c1_globals_bsd.hpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_BSD_VM_C1_GLOBALS_BSD_HPP
+#define OS_BSD_VM_C1_GLOBALS_BSD_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+//
+// Sets the default values for operating system dependent flags used by the
+// client compiler. (see c1_globals.hpp)
+//
+
+#endif // OS_BSD_VM_C1_GLOBALS_BSD_HPP
diff --git a/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp b/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp
new file mode 100644
index 0000000..21737f1
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/c2_globals_bsd.hpp
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_BSD_VM_C2_GLOBALS_BSD_HPP
+#define OS_BSD_VM_C2_GLOBALS_BSD_HPP
+
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/macros.hpp"
+
+//
+// Sets the default values for operating system dependent flags used by the
+// server compiler. (see c2_globals.hpp)
+//
+
+#endif // OS_BSD_VM_C2_GLOBALS_BSD_HPP
diff --git a/hotspot/src/os/linux/vm/chaitin_linux.cpp b/hotspot/src/os/bsd/vm/chaitin_bsd.cpp
similarity index 100%
copy from hotspot/src/os/linux/vm/chaitin_linux.cpp
copy to hotspot/src/os/bsd/vm/chaitin_bsd.cpp
diff --git a/hotspot/src/os/bsd/vm/decoder_bsd.cpp b/hotspot/src/os/bsd/vm/decoder_bsd.cpp
new file mode 100644
index 0000000..dd95929
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/decoder_bsd.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 1997, 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.
+ *
+ */
+
+#include "prims/jvm.h"
+#include "utilities/decoder.hpp"
+
+#include <cxxabi.h>
+
+#ifdef __APPLE__
+
+void Decoder::initialize() {
+ _initialized = true;
+}
+
+void Decoder::uninitialize() {
+ _initialized = false;
+}
+
+bool Decoder::can_decode_C_frame_in_vm() {
+ return false;
+}
+
+Decoder::decoder_status Decoder::decode(address addr, const char* filepath, char *buf, int buflen, int *offset) {
+ return symbol_not_found;
+}
+
+
+#endif
+
+bool Decoder::demangle(const char* symbol, char *buf, int buflen) {
+ int status;
+ char* result;
+ size_t size = (size_t)buflen;
+
+ // Don't pass buf to __cxa_demangle. In case of the 'buf' is too small,
+ // __cxa_demangle will call system "realloc" for additional memory, which
+ // may use different malloc/realloc mechanism that allocates 'buf'.
+ if ((result = abi::__cxa_demangle(symbol, NULL, NULL, &status)) != NULL) {
+ jio_snprintf(buf, buflen, "%s", result);
+ // call c library's free
+ ::free(result);
+ return true;
+ }
+ return false;
+}
diff --git a/hotspot/src/os/linux/vm/dtraceJSDT_linux.cpp b/hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp
similarity index 100%
copy from hotspot/src/os/linux/vm/dtraceJSDT_linux.cpp
copy to hotspot/src/os/bsd/vm/dtraceJSDT_bsd.cpp
diff --git a/hotspot/src/os/bsd/vm/globals_bsd.hpp b/hotspot/src/os/bsd/vm/globals_bsd.hpp
new file mode 100644
index 0000000..213f470
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/globals_bsd.hpp
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2005, 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.
+ *
+ */
+
+#ifndef OS_BSD_VM_GLOBALS_BSD_HPP
+#define OS_BSD_VM_GLOBALS_BSD_HPP
+
+//
+// Defines Bsd specific flags. They are not available on other platforms.
+//
+#define RUNTIME_OS_FLAGS(develop, develop_pd, product, product_pd, diagnostic, notproduct) \
+ product(bool, UseOprofile, false, \
+ "enable support for Oprofile profiler") \
+ \
+ product(bool, UseBsdPosixThreadCPUClocks, true, \
+ "enable fast Bsd Posix clocks where available") \
+/* NB: The default value of UseBsdPosixThreadCPUClocks may be \
+ overridden in Arguments::parse_each_vm_init_arg. */ \
+ \
+ product(bool, UseHugeTLBFS, false, \
+ "Use MAP_HUGETLB for large pages") \
+ \
+ product(bool, UseSHM, false, \
+ "Use SYSV shared memory for large pages")
+
+//
+// Defines Bsd-specific default values. The flags are available on all
+// platforms, but they may have different default values on other platforms.
+//
+define_pd_global(bool, UseLargePages, false);
+define_pd_global(bool, UseLargePagesIndividualAllocation, false);
+define_pd_global(bool, UseOSErrorReporting, false);
+define_pd_global(bool, UseThreadPriorities, true) ;
+
+#endif // OS_BSD_VM_GLOBALS_BSD_HPP
diff --git a/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp b/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp
new file mode 100644
index 0000000..795bf4d
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/interfaceSupport_bsd.hpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2005, 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 OS_BSD_VM_INTERFACESUPPORT_BSD_HPP
+#define OS_BSD_VM_INTERFACESUPPORT_BSD_HPP
+
+// Contains inlined functions for class InterfaceSupport
+
+static inline void serialize_memory(JavaThread *thread) {
+ os::write_memory_serialize_page(thread);
+}
+
+#endif // OS_BSD_VM_INTERFACESUPPORT_BSD_HPP
diff --git a/hotspot/src/os/bsd/vm/jsig.c b/hotspot/src/os/bsd/vm/jsig.c
new file mode 100644
index 0000000..a8d98a0
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/jsig.c
@@ -0,0 +1,225 @@
+/*
+ * 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.
+ *
+ */
+
+/* CopyrightVersion 1.2 */
+
+/* This is a special library that should be loaded before libc &
+ * libthread to interpose the signal handler installation functions:
+ * sigaction(), signal(), sigset().
+ * Used for signal-chaining. See RFE 4381843.
+ */
+
+#include <signal.h>
+#include <dlfcn.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+
+#define MAXSIGNUM 32
+#define MASK(sig) ((unsigned int)1 << sig)
+
+static struct sigaction sact[MAXSIGNUM]; /* saved signal handlers */
+static unsigned int jvmsigs = 0; /* signals used by jvm */
+
+/* used to synchronize the installation of signal handlers */
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static pthread_t tid = 0;
+
+typedef void (*sa_handler_t)(int);
+typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
+typedef sa_handler_t (*signal_t)(int, sa_handler_t);
+typedef int (*sigaction_t)(int, const struct sigaction *, struct sigaction *);
+
+static signal_t os_signal = 0; /* os's version of signal()/sigset() */
+static sigaction_t os_sigaction = 0; /* os's version of sigaction() */
+
+static bool jvm_signal_installing = false;
+static bool jvm_signal_installed = false;
+
+static void signal_lock() {
+ pthread_mutex_lock(&mutex);
+ /* When the jvm is installing its set of signal handlers, threads
+ * other than the jvm thread should wait */
+ if (jvm_signal_installing) {
+ if (tid != pthread_self()) {
+ pthread_cond_wait(&cond, &mutex);
+ }
+ }
+}
+
+static void signal_unlock() {
+ pthread_mutex_unlock(&mutex);
+}
+
+static sa_handler_t call_os_signal(int sig, sa_handler_t disp,
+ bool is_sigset) {
+ if (os_signal == NULL) {
+ if (!is_sigset) {
+ os_signal = (signal_t)dlsym(RTLD_NEXT, "signal");
+ } else {
+ os_signal = (signal_t)dlsym(RTLD_NEXT, "sigset");
+ }
+ if (os_signal == NULL) {
+ printf("%s\n", dlerror());
+ exit(0);
+ }
+ }
+ return (*os_signal)(sig, disp);
+}
+
+static void save_signal_handler(int sig, sa_handler_t disp) {
+ sigset_t set;
+ sact[sig].sa_handler = disp;
+ sigemptyset(&set);
+ sact[sig].sa_mask = set;
+ sact[sig].sa_flags = 0;
+}
+
+static sa_handler_t set_signal(int sig, sa_handler_t disp, bool is_sigset) {
+ sa_handler_t oldhandler;
+ bool sigused;
+
+ signal_lock();
+
+ sigused = (MASK(sig) & jvmsigs) != 0;
+ if (jvm_signal_installed && sigused) {
+ /* jvm has installed its signal handler for this signal. */
+ /* Save the handler. Don't really install it. */
+ oldhandler = sact[sig].sa_handler;
+ save_signal_handler(sig, disp);
+
+ signal_unlock();
+ return oldhandler;
+ } else if (jvm_signal_installing) {
+ /* jvm is installing its signal handlers. Install the new
+ * handlers and save the old ones. jvm uses sigaction().
+ * Leave the piece here just in case. */
+ oldhandler = call_os_signal(sig, disp, is_sigset);
+ save_signal_handler(sig, oldhandler);
+
+ /* Record the signals used by jvm */
+ jvmsigs |= MASK(sig);
+
+ signal_unlock();
+ return oldhandler;
+ } else {
+ /* jvm has no relation with this signal (yet). Install the
+ * the handler. */
+ oldhandler = call_os_signal(sig, disp, is_sigset);
+
+ signal_unlock();
+ return oldhandler;
+ }
+}
+
+sa_handler_t signal(int sig, sa_handler_t disp) {
+ return set_signal(sig, disp, false);
+}
+
+sa_handler_t sigset(int sig, sa_handler_t disp) {
+ printf("sigset() is not supported by BSD");
+ exit(0);
+ }
+
+static int call_os_sigaction(int sig, const struct sigaction *act,
+ struct sigaction *oact) {
+ if (os_sigaction == NULL) {
+ os_sigaction = (sigaction_t)dlsym(RTLD_NEXT, "sigaction");
+ if (os_sigaction == NULL) {
+ printf("%s\n", dlerror());
+ exit(0);
+ }
+ }
+ return (*os_sigaction)(sig, act, oact);
+}
+
+int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) {
+ int res;
+ bool sigused;
+ struct sigaction oldAct;
+
+ signal_lock();
+
+ sigused = (MASK(sig) & jvmsigs) != 0;
+ if (jvm_signal_installed && sigused) {
+ /* jvm has installed its signal handler for this signal. */
+ /* Save the handler. Don't really install it. */
+ if (oact != NULL) {
+ *oact = sact[sig];
+ }
+ if (act != NULL) {
+ sact[sig] = *act;
+ }
+
+ signal_unlock();
+ return 0;
+ } else if (jvm_signal_installing) {
+ /* jvm is installing its signal handlers. Install the new
+ * handlers and save the old ones. */
+ res = call_os_sigaction(sig, act, &oldAct);
+ sact[sig] = oldAct;
+ if (oact != NULL) {
+ *oact = oldAct;
+ }
+
+ /* Record the signals used by jvm */
+ jvmsigs |= MASK(sig);
+
+ signal_unlock();
+ return res;
+ } else {
+ /* jvm has no relation with this signal (yet). Install the
+ * the handler. */
+ res = call_os_sigaction(sig, act, oact);
+
+ signal_unlock();
+ return res;
+ }
+}
+
+/* The three functions for the jvm to call into */
+void JVM_begin_signal_setting() {
+ signal_lock();
+ jvm_signal_installing = true;
+ tid = pthread_self();
+ signal_unlock();
+}
+
+void JVM_end_signal_setting() {
+ signal_lock();
+ jvm_signal_installed = true;
+ jvm_signal_installing = false;
+ pthread_cond_broadcast(&cond);
+ signal_unlock();
+}
+
+struct sigaction *JVM_get_signal_action(int sig) {
+ /* Does race condition make sense here? */
+ if ((MASK(sig) & jvmsigs) != 0) {
+ return &sact[sig];
+ }
+ return NULL;
+}
diff --git a/hotspot/src/os/bsd/vm/jvm_bsd.cpp b/hotspot/src/os/bsd/vm/jvm_bsd.cpp
new file mode 100644
index 0000000..a828631
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/jvm_bsd.cpp
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "prims/jvm.h"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/osThread.hpp"
+
+#include <signal.h>
+
+
+// sun.misc.Signal ///////////////////////////////////////////////////////////
+// Signal code is mostly copied from classic vm, signals_md.c 1.4 98/08/23
+/*
+ * This function is included primarily as a debugging aid. If Java is
+ * running in a console window, then pressing <CTRL-\\> will cause
+ * the current state of all active threads and monitors to be written
+ * to the console window.
+ */
+
+JVM_ENTRY_NO_ENV(void*, JVM_RegisterSignal(jint sig, void* handler))
+ // Copied from classic vm
+ // signals_md.c 1.4 98/08/23
+ void* newHandler = handler == (void *)2
+ ? os::user_handler()
+ : handler;
+ switch (sig) {
+ /* The following are already used by the VM. */
+ case INTERRUPT_SIGNAL:
+ case SIGFPE:
+ case SIGILL:
+ case SIGSEGV:
+
+ /* The following signal is used by the VM to dump thread stacks unless
+ ReduceSignalUsage is set, in which case the user is allowed to set
+ his own _native_ handler for this signal; thus, in either case,
+ we do not allow JVM_RegisterSignal to change the handler. */
+ case BREAK_SIGNAL:
+ return (void *)-1;
+
+ /* The following signals are used for Shutdown Hooks support. However, if
+ ReduceSignalUsage (-Xrs) is set, Shutdown Hooks must be invoked via
+ System.exit(), Java is not allowed to use these signals, and the the
+ user is allowed to set his own _native_ handler for these signals and
+ invoke System.exit() as needed. Terminator.setup() is avoiding
+ registration of these signals when -Xrs is present.
+ - If the HUP signal is ignored (from the nohup) command, then Java
+ is not allowed to use this signal.
+ */
+
+ case SHUTDOWN1_SIGNAL:
+ case SHUTDOWN2_SIGNAL:
+ case SHUTDOWN3_SIGNAL:
+ if (ReduceSignalUsage) return (void*)-1;
+ if (os::Bsd::is_sig_ignored(sig)) return (void*)1;
+ }
+
+ void* oldHandler = os::signal(sig, newHandler);
+ if (oldHandler == os::user_handler()) {
+ return (void *)2;
+ } else {
+ return oldHandler;
+ }
+JVM_END
+
+
+JVM_ENTRY_NO_ENV(jboolean, JVM_RaiseSignal(jint sig))
+ if (ReduceSignalUsage) {
+ // do not allow SHUTDOWN1_SIGNAL,SHUTDOWN2_SIGNAL,SHUTDOWN3_SIGNAL,
+ // BREAK_SIGNAL to be raised when ReduceSignalUsage is set, since
+ // no handler for them is actually registered in JVM or via
+ // JVM_RegisterSignal.
+ if (sig == SHUTDOWN1_SIGNAL || sig == SHUTDOWN2_SIGNAL ||
+ sig == SHUTDOWN3_SIGNAL || sig == BREAK_SIGNAL) {
+ return JNI_FALSE;
+ }
+ }
+ else if ((sig == SHUTDOWN1_SIGNAL || sig == SHUTDOWN2_SIGNAL ||
+ sig == SHUTDOWN3_SIGNAL) && os::Bsd::is_sig_ignored(sig)) {
+ // do not allow SHUTDOWN1_SIGNAL to be raised when SHUTDOWN1_SIGNAL
+ // is ignored, since no handler for them is actually registered in JVM
+ // or via JVM_RegisterSignal.
+ // This also applies for SHUTDOWN2_SIGNAL and SHUTDOWN3_SIGNAL
+ return JNI_FALSE;
+ }
+
+ os::signal_raise(sig);
+ return JNI_TRUE;
+JVM_END
+
+/*
+ All the defined signal names for Bsd.
+
+ NOTE that not all of these names are accepted by our Java implementation
+
+ Via an existing claim by the VM, sigaction restrictions, or
+ the "rules of Unix" some of these names will be rejected at runtime.
+ For example the VM sets up to handle USR1, sigaction returns EINVAL for
+ STOP, and Bsd simply doesn't allow catching of KILL.
+
+ Here are the names currently accepted by a user of sun.misc.Signal with
+ 1.4.1 (ignoring potential interaction with use of chaining, etc):
+
+ HUP, INT, TRAP, ABRT, IOT, BUS, USR2, PIPE, ALRM, TERM, STKFLT,
+ CLD, CHLD, CONT, TSTP, TTIN, TTOU, URG, XCPU, XFSZ, VTALRM, PROF,
+ WINCH, POLL, IO, PWR, SYS
+
+*/
+
+struct siglabel {
+ const char *name;
+ int number;
+};
+
+struct siglabel siglabels[] = {
+ /* derived from /usr/include/bits/signum.h on RH7.2 */
+ "HUP", SIGHUP, /* Hangup (POSIX). */
+ "INT", SIGINT, /* Interrupt (ANSI). */
+ "QUIT", SIGQUIT, /* Quit (POSIX). */
+ "ILL", SIGILL, /* Illegal instruction (ANSI). */
+ "TRAP", SIGTRAP, /* Trace trap (POSIX). */
+ "ABRT", SIGABRT, /* Abort (ANSI). */
+ "EMT", SIGEMT, /* EMT trap */
+ "FPE", SIGFPE, /* Floating-point exception (ANSI). */
+ "KILL", SIGKILL, /* Kill, unblockable (POSIX). */
+ "BUS", SIGBUS, /* BUS error (4.2 BSD). */
+ "SEGV", SIGSEGV, /* Segmentation violation (ANSI). */
+ "SYS", SIGSYS, /* Bad system call. Only on some Bsden! */
+ "PIPE", SIGPIPE, /* Broken pipe (POSIX). */
+ "ALRM", SIGALRM, /* Alarm clock (POSIX). */
+ "TERM", SIGTERM, /* Termination (ANSI). */
+ "URG", SIGURG, /* Urgent condition on socket (4.2 BSD). */
+ "STOP", SIGSTOP, /* Stop, unblockable (POSIX). */
+ "TSTP", SIGTSTP, /* Keyboard stop (POSIX). */
+ "CONT", SIGCONT, /* Continue (POSIX). */
+ "CHLD", SIGCHLD, /* Child status has changed (POSIX). */
+ "TTIN", SIGTTIN, /* Background read from tty (POSIX). */
+ "TTOU", SIGTTOU, /* Background write to tty (POSIX). */
+ "IO", SIGIO, /* I/O now possible (4.2 BSD). */
+ "XCPU", SIGXCPU, /* CPU limit exceeded (4.2 BSD). */
+ "XFSZ", SIGXFSZ, /* File size limit exceeded (4.2 BSD). */
+ "VTALRM", SIGVTALRM, /* Virtual alarm clock (4.2 BSD). */
+ "PROF", SIGPROF, /* Profiling alarm clock (4.2 BSD). */
+ "WINCH", SIGWINCH, /* Window size change (4.3 BSD, Sun). */
+ "INFO", SIGINFO, /* Information request. */
+ "USR1", SIGUSR1, /* User-defined signal 1 (POSIX). */
+ "USR2", SIGUSR2 /* User-defined signal 2 (POSIX). */
+ };
+
+JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
+
+ /* find and return the named signal's number */
+
+ for(uint i=0; i<ARRAY_SIZE(siglabels); i++)
+ if(!strcmp(name, siglabels[i].name))
+ return siglabels[i].number;
+
+ return -1;
+
+JVM_END
+
+// used by os::exception_name()
+extern bool signal_name(int signo, char* buf, size_t len) {
+ for(uint i = 0; i < ARRAY_SIZE(siglabels); i++) {
+ if (signo == siglabels[i].number) {
+ jio_snprintf(buf, len, "SIG%s", siglabels[i].name);
+ return true;
+ }
+ }
+ return false;
+}
diff --git a/hotspot/src/os/bsd/vm/jvm_bsd.h b/hotspot/src/os/bsd/vm/jvm_bsd.h
new file mode 100644
index 0000000..971d98a
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/jvm_bsd.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1999, 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 OS_BSD_VM_JVM_BSD_H
+#define OS_BSD_VM_JVM_BSD_H
+
+/*
+// HotSpot integration note:
+//
+// This is derived from the JDK classic file:
+// "$JDK/src/solaris/javavm/export/jvm_md.h":15 (ver. 1.10 98/04/22)
+// All local includes have been commented out.
+*/
+
+
+#ifndef JVM_MD_H
+#define JVM_MD_H
+
+/*
+ * This file is currently collecting system-specific dregs for the
+ * JNI conversion, which should be sorted out later.
+ */
+
+#include <dirent.h> /* For DIR */
+#include <sys/param.h> /* For MAXPATHLEN */
+#include <unistd.h> /* For F_OK, R_OK, W_OK */
+
+#define JNI_ONLOAD_SYMBOLS {"JNI_OnLoad"}
+#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
+#define JVM_ONLOAD_SYMBOLS {"JVM_OnLoad"}
+#define AGENT_ONLOAD_SYMBOLS {"Agent_OnLoad"}
+#define AGENT_ONUNLOAD_SYMBOLS {"Agent_OnUnload"}
+#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
+
+#define JNI_LIB_PREFIX "lib"
+#ifdef __APPLE__
+#define JNI_LIB_SUFFIX ".dylib"
+#else
+#define JNI_LIB_SUFFIX ".so"
+#endif
+
+// Hack: MAXPATHLEN is 4095 on some Bsd and 4096 on others. This may
+// cause problems if JVM and the rest of JDK are built on different
+// Bsd releases. Here we define JVM_MAXPATHLEN to be MAXPATHLEN + 1,
+// so buffers declared in VM are always >= 4096.
+#define JVM_MAXPATHLEN MAXPATHLEN + 1
+
+#define JVM_R_OK R_OK
+#define JVM_W_OK W_OK
+#define JVM_X_OK X_OK
+#define JVM_F_OK F_OK
+
+/*
+ * File I/O
+ */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+
+/* O Flags */
+
+#define JVM_O_RDONLY O_RDONLY
+#define JVM_O_WRONLY O_WRONLY
+#define JVM_O_RDWR O_RDWR
+#define JVM_O_O_APPEND O_APPEND
+#define JVM_O_EXCL O_EXCL
+#define JVM_O_CREAT O_CREAT
+
+/* Signal definitions */
+
+#define BREAK_SIGNAL SIGQUIT /* Thread dumping support. */
+#define INTERRUPT_SIGNAL SIGUSR1 /* Interruptible I/O support. */
+#define SHUTDOWN1_SIGNAL SIGHUP /* Shutdown Hooks support. */
+#define SHUTDOWN2_SIGNAL SIGINT
+#define SHUTDOWN3_SIGNAL SIGTERM
+
+#ifndef SIGRTMIN
+#ifdef __OpenBSD__
+#define SIGRTMIN 1
+#else
+#define SIGRTMIN 33
+#endif
+#endif
+#ifndef SIGRTMAX
+#ifdef __OpenBSD__
+#define SIGRTMAX 31
+#else
+#define SIGRTMAX 63
+#endif
+#endif
+#endif /* JVM_MD_H */
+
+// Reconciliation History
+// jvm_solaris.h 1.6 99/06/22 16:38:47
+// End
+
+#endif // OS_BSD_VM_JVM_BSD_H
diff --git a/hotspot/src/os/bsd/vm/mutex_bsd.cpp b/hotspot/src/os/bsd/vm/mutex_bsd.cpp
new file mode 100644
index 0000000..f39482e
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/mutex_bsd.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2007, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "mutex_bsd.inline.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/mutex.hpp"
+#include "thread_bsd.inline.hpp"
+#include "utilities/events.hpp"
+
+// put OS-includes here
+# include <signal.h>
diff --git a/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp b/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp
new file mode 100644
index 0000000..f75267f
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/mutex_bsd.inline.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999, 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 OS_BSD_VM_MUTEX_BSD_INLINE_HPP
+#define OS_BSD_VM_MUTEX_BSD_INLINE_HPP
+
+#include "os_bsd.inline.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "thread_bsd.inline.hpp"
+
+
+// Reconciliation History
+// mutex_solaris.inline.hpp 1.5 99/06/22 16:38:49
+// End
+
+#endif // OS_BSD_VM_MUTEX_BSD_INLINE_HPP
diff --git a/hotspot/src/os/bsd/vm/osThread_bsd.cpp b/hotspot/src/os/bsd/vm/osThread_bsd.cpp
new file mode 100644
index 0000000..efac803
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/osThread_bsd.cpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+// no precompiled headers
+#include "runtime/atomic.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/os.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/safepoint.hpp"
+#include "runtime/vmThread.hpp"
+#ifdef TARGET_ARCH_x86
+# include "assembler_x86.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_sparc
+# include "assembler_sparc.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_zero
+# include "assembler_zero.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_arm
+# include "assembler_arm.inline.hpp"
+#endif
+#ifdef TARGET_ARCH_ppc
+# include "assembler_ppc.inline.hpp"
+#endif
+
+
+void OSThread::pd_initialize() {
+ assert(this != NULL, "check");
+ _thread_id = NULL;
+ _pthread_id = NULL;
+ _siginfo = NULL;
+ _ucontext = NULL;
+ _expanding_stack = 0;
+ _alt_sig_stack = NULL;
+
+ sigemptyset(&_caller_sigmask);
+
+ _startThread_lock = new Monitor(Mutex::event, "startThread_lock", true);
+ assert(_startThread_lock !=NULL, "check");
+}
+
+void OSThread::pd_destroy() {
+ delete _startThread_lock;
+}
diff --git a/hotspot/src/os/bsd/vm/osThread_bsd.hpp b/hotspot/src/os/bsd/vm/osThread_bsd.hpp
new file mode 100644
index 0000000..82dd34f
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/osThread_bsd.hpp
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 1999, 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 OS_BSD_VM_OSTHREAD_BSD_HPP
+#define OS_BSD_VM_OSTHREAD_BSD_HPP
+
+ private:
+ int _thread_type;
+
+ public:
+
+ int thread_type() const {
+ return _thread_type;
+ }
+ void set_thread_type(int type) {
+ _thread_type = type;
+ }
+
+ private:
+
+#ifdef _ALLBSD_SOURCE
+ // _thread_id and _pthread_id are the same on BSD
+ // keep both to minimize code divergence in os_bsd.cpp
+ pthread_t _thread_id;
+ pthread_t _pthread_id;
+#else
+ // _thread_id is kernel thread id (similar to LWP id on Solaris). Each
+ // thread has a unique thread_id (BsdThreads or NPTL). It can be used
+ // to access /proc.
+ pid_t _thread_id;
+
+ // _pthread_id is the pthread id, which is used by library calls
+ // (e.g. pthread_kill).
+ pthread_t _pthread_id;
+#endif
+
+ sigset_t _caller_sigmask; // Caller's signal mask
+
+ public:
+
+ // Methods to save/restore caller's signal mask
+ sigset_t caller_sigmask() const { return _caller_sigmask; }
+ void set_caller_sigmask(sigset_t sigmask) { _caller_sigmask = sigmask; }
+
+#ifdef _ALLBSD_SOURCE
+ pthread_t thread_id() const {
+ return _thread_id;
+ }
+#else
+ pid_t thread_id() const {
+ return _thread_id;
+ }
+#endif
+#ifndef PRODUCT
+ // Used for debugging, return a unique integer for each thread.
+ intptr_t thread_identifier() const { return (intptr_t)_pthread_id; }
+#endif
+#ifdef ASSERT
+ // We expect no reposition failures so kill vm if we get one.
+ //
+ bool valid_reposition_failure() {
+ return false;
+ }
+#endif // ASSERT
+#ifdef _ALLBSD_SOURCE
+ void set_thread_id(pthread_t id) {
+ _thread_id = id;
+ }
+#else
+ void set_thread_id(pid_t id) {
+ _thread_id = id;
+ }
+#endif
+ pthread_t pthread_id() const {
+ return _pthread_id;
+ }
+ void set_pthread_id(pthread_t tid) {
+ _pthread_id = tid;
+ }
+
+ // ***************************************************************
+ // suspension support.
+ // ***************************************************************
+
+public:
+ // flags that support signal based suspend/resume on Bsd are in a
+ // separate class to avoid confusion with many flags in OSThread that
+ // are used by VM level suspend/resume.
+ os::Bsd::SuspendResume sr;
+
+ // _ucontext and _siginfo are used by SR_handler() to save thread context,
+ // and they will later be used to walk the stack or reposition thread PC.
+ // If the thread is not suspended in SR_handler() (e.g. self suspend),
+ // the value in _ucontext is meaningless, so we must use the last Java
+ // frame information as the frame. This will mean that for threads
+ // that are parked on a mutex the profiler (and safepoint mechanism)
+ // will see the thread as if it were still in the Java frame. This
+ // not a problem for the profiler since the Java frame is a close
+ // enough result. For the safepoint mechanism when the give it the
+ // Java frame we are not at a point where the safepoint needs the
+ // frame to that accurate (like for a compiled safepoint) since we
+ // should be in a place where we are native and will block ourselves
+ // if we transition.
+private:
+ void* _siginfo;
+ ucontext_t* _ucontext;
+ int _expanding_stack; /* non zero if manually expanding stack */
+ address _alt_sig_stack; /* address of base of alternate signal stack */
+
+public:
+ void* siginfo() const { return _siginfo; }
+ void set_siginfo(void* ptr) { _siginfo = ptr; }
+ ucontext_t* ucontext() const { return _ucontext; }
+ void set_ucontext(ucontext_t* ptr) { _ucontext = ptr; }
+ void set_expanding_stack(void) { _expanding_stack = 1; }
+ void clear_expanding_stack(void) { _expanding_stack = 0; }
+ int expanding_stack(void) { return _expanding_stack; }
+
+ void set_alt_sig_stack(address val) { _alt_sig_stack = val; }
+ address alt_sig_stack(void) { return _alt_sig_stack; }
+
+private:
+ Monitor* _startThread_lock; // sync parent and child in thread creation
+
+public:
+
+ Monitor* startThread_lock() const {
+ return _startThread_lock;
+ }
+
+ // ***************************************************************
+ // Platform dependent initialization and cleanup
+ // ***************************************************************
+
+private:
+
+ void pd_initialize();
+ void pd_destroy();
+
+// Reconciliation History
+// osThread_solaris.hpp 1.24 99/08/27 13:11:54
+// End
+
+#endif // OS_BSD_VM_OSTHREAD_BSD_HPP
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
new file mode 100644
index 0000000..b783de6
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -0,0 +1,5709 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+// no precompiled headers
+#include "classfile/classLoader.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "code/icBuffer.hpp"
+#include "code/vtableStubs.hpp"
+#include "compiler/compileBroker.hpp"
+#include "interpreter/interpreter.hpp"
+#include "jvm_bsd.h"
+#include "memory/allocation.inline.hpp"
+#include "memory/filemap.hpp"
+#include "mutex_bsd.inline.hpp"
+#include "oops/oop.inline.hpp"
+#include "os_share_bsd.hpp"
+#include "prims/jniFastGetField.hpp"
+#include "prims/jvm.h"
+#include "prims/jvm_misc.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/extendedPC.hpp"
+#include "runtime/globals.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/java.hpp"
+#include "runtime/javaCalls.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/objectMonitor.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/perfMemory.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/statSampler.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/threadCritical.hpp"
+#include "runtime/timer.hpp"
+#include "services/attachListener.hpp"
+#include "services/runtimeService.hpp"
+#include "thread_bsd.inline.hpp"
+#include "utilities/decoder.hpp"
+#include "utilities/defaultStream.hpp"
+#include "utilities/events.hpp"
+#include "utilities/growableArray.hpp"
+#include "utilities/vmError.hpp"
+#ifdef TARGET_ARCH_x86
+# include "assembler_x86.inline.hpp"
+# include "nativeInst_x86.hpp"
+#endif
+#ifdef TARGET_ARCH_sparc
+# include "assembler_sparc.inline.hpp"
+# include "nativeInst_sparc.hpp"
+#endif
+#ifdef TARGET_ARCH_zero
+# include "assembler_zero.inline.hpp"
+# include "nativeInst_zero.hpp"
+#endif
+#ifdef TARGET_ARCH_arm
+# include "assembler_arm.inline.hpp"
+# include "nativeInst_arm.hpp"
+#endif
+#ifdef TARGET_ARCH_ppc
+# include "assembler_ppc.inline.hpp"
+# include "nativeInst_ppc.hpp"
+#endif
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
+
+// put OS-includes here
+# include <sys/types.h>
+# include <sys/mman.h>
+# include <sys/stat.h>
+# include <sys/select.h>
+# include <pthread.h>
+# include <signal.h>
+# include <errno.h>
+# include <dlfcn.h>
+# include <stdio.h>
+# include <unistd.h>
+# include <sys/resource.h>
+# include <pthread.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <sys/times.h>
+# include <sys/utsname.h>
+# include <sys/socket.h>
+# include <sys/wait.h>
+# include <time.h>
+# include <pwd.h>
+# include <poll.h>
+# include <semaphore.h>
+# include <fcntl.h>
+# include <string.h>
+#ifdef _ALLBSD_SOURCE
+# include <sys/param.h>
+# include <sys/sysctl.h>
+#else
+# include <syscall.h>
+# include <sys/sysinfo.h>
+# include <gnu/libc-version.h>
+#endif
+# include <sys/ipc.h>
+# include <sys/shm.h>
+#ifndef __APPLE__
+# include <link.h>
+#endif
+# include <stdint.h>
+# include <inttypes.h>
+# include <sys/ioctl.h>
+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+# include <elf.h>
+#endif
+
+#ifdef __APPLE__
+#include <mach/mach.h> // semaphore_* API
+#include <mach-o/dyld.h>
+#endif
+
+#ifndef MAP_ANONYMOUS
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+#define MAX_PATH (2 * K)
+
+// for timer info max values which include all bits
+#define ALL_64_BITS CONST64(0xFFFFFFFFFFFFFFFF)
+#define SEC_IN_NANOSECS 1000000000LL
+
+#define LARGEPAGES_BIT (1 << 6)
+////////////////////////////////////////////////////////////////////////////////
+// global variables
+julong os::Bsd::_physical_memory = 0;
+
+#ifndef _ALLBSD_SOURCE
+address os::Bsd::_initial_thread_stack_bottom = NULL;
+uintptr_t os::Bsd::_initial_thread_stack_size = 0;
+#endif
+
+int (*os::Bsd::_clock_gettime)(clockid_t, struct timespec *) = NULL;
+#ifndef _ALLBSD_SOURCE
+int (*os::Bsd::_pthread_getcpuclockid)(pthread_t, clockid_t *) = NULL;
+Mutex* os::Bsd::_createThread_lock = NULL;
+#endif
+pthread_t os::Bsd::_main_thread;
+int os::Bsd::_page_size = -1;
+#ifndef _ALLBSD_SOURCE
+bool os::Bsd::_is_floating_stack = false;
+bool os::Bsd::_is_NPTL = false;
+bool os::Bsd::_supports_fast_thread_cpu_time = false;
+const char * os::Bsd::_glibc_version = NULL;
+const char * os::Bsd::_libpthread_version = NULL;
+#endif
+
+static jlong initial_time_count=0;
+
+static int clock_tics_per_sec = 100;
+
+// For diagnostics to print a message once. see run_periodic_checks
+static sigset_t check_signal_done;
+static bool check_signals = true;;
+
+static pid_t _initial_pid = 0;
+
+/* Signal number used to suspend/resume a thread */
+
+/* do not use any signal number less than SIGSEGV, see 4355769 */
+static int SR_signum = SIGUSR2;
+sigset_t SR_sigset;
+
+
+////////////////////////////////////////////////////////////////////////////////
+// utility functions
+
+static int SR_initialize();
+static int SR_finalize();
+
+julong os::available_memory() {
+ return Bsd::available_memory();
+}
+
+julong os::Bsd::available_memory() {
+#ifdef _ALLBSD_SOURCE
+ // XXXBSD: this is just a stopgap implementation
+ return physical_memory() >> 2;
+#else
+ // values in struct sysinfo are "unsigned long"
+ struct sysinfo si;
+ sysinfo(&si);
+
+ return (julong)si.freeram * si.mem_unit;
+#endif
+}
+
+julong os::physical_memory() {
+ return Bsd::physical_memory();
+}
+
+julong os::allocatable_physical_memory(julong size) {
+#ifdef _LP64
+ return size;
+#else
+ julong result = MIN2(size, (julong)3800*M);
+ if (!is_allocatable(result)) {
+ // See comments under solaris for alignment considerations
+ julong reasonable_size = (julong)2*G - 2 * os::vm_page_size();
+ result = MIN2(size, reasonable_size);
+ }
+ return result;
+#endif // _LP64
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// environment support
+
+bool os::getenv(const char* name, char* buf, int len) {
+ const char* val = ::getenv(name);
+ if (val != NULL && strlen(val) < (size_t)len) {
+ strcpy(buf, val);
+ return true;
+ }
+ if (len > 0) buf[0] = 0; // return a null string
+ return false;
+}
+
+
+// Return true if user is running as root.
+
+bool os::have_special_privileges() {
+ static bool init = false;
+ static bool privileges = false;
+ if (!init) {
+ privileges = (getuid() != geteuid()) || (getgid() != getegid());
+ init = true;
+ }
+ return privileges;
+}
+
+
+#ifndef _ALLBSD_SOURCE
+#ifndef SYS_gettid
+// i386: 224, ia64: 1105, amd64: 186, sparc 143
+#ifdef __ia64__
+#define SYS_gettid 1105
+#elif __i386__
+#define SYS_gettid 224
+#elif __amd64__
+#define SYS_gettid 186
+#elif __sparc__
+#define SYS_gettid 143
+#else
+#error define gettid for the arch
+#endif
+#endif
+#endif
+
+// Cpu architecture string
+#if defined(ZERO)
+static char cpu_arch[] = ZERO_LIBARCH;
+#elif defined(IA64)
+static char cpu_arch[] = "ia64";
+#elif defined(IA32)
+static char cpu_arch[] = "i386";
+#elif defined(AMD64)
+static char cpu_arch[] = "amd64";
+#elif defined(ARM)
+static char cpu_arch[] = "arm";
+#elif defined(PPC)
+static char cpu_arch[] = "ppc";
+#elif defined(SPARC)
+# ifdef _LP64
+static char cpu_arch[] = "sparcv9";
+# else
+static char cpu_arch[] = "sparc";
+# endif
+#else
+#error Add appropriate cpu_arch setting
+#endif
+
+
+#ifndef _ALLBSD_SOURCE
+// pid_t gettid()
+//
+// Returns the kernel thread id of the currently running thread. Kernel
+// thread id is used to access /proc.
+//
+// (Note that getpid() on BsdThreads returns kernel thread id too; but
+// on NPTL, it returns the same pid for all threads, as required by POSIX.)
+//
+pid_t os::Bsd::gettid() {
+ int rslt = syscall(SYS_gettid);
+ if (rslt == -1) {
+ // old kernel, no NPTL support
+ return getpid();
+ } else {
+ return (pid_t)rslt;
+ }
+}
+
+// Most versions of bsd have a bug where the number of processors are
+// determined by looking at the /proc file system. In a chroot environment,
+// the system call returns 1. This causes the VM to act as if it is
+// a single processor and elide locking (see is_MP() call).
+static bool unsafe_chroot_detected = false;
+static const char *unstable_chroot_error = "/proc file system not found.\n"
+ "Java may be unstable running multithreaded in a chroot "
+ "environment on Bsd when /proc filesystem is not mounted.";
+#endif
+
+#ifdef _ALLBSD_SOURCE
+void os::Bsd::initialize_system_info() {
+ int mib[2];
+ size_t len;
+ int cpu_val;
+ u_long mem_val;
+
+ /* get processors count via hw.ncpus sysctl */
+ mib[0] = CTL_HW;
+ mib[1] = HW_NCPU;
+ len = sizeof(cpu_val);
+ if (sysctl(mib, 2, &cpu_val, &len, NULL, 0) != -1 && cpu_val >= 1) {
+ set_processor_count(cpu_val);
+ }
+ else {
+ set_processor_count(1); // fallback
+ }
+
+ /* get physical memory via hw.usermem sysctl (hw.usermem is used
+ * instead of hw.physmem because we need size of allocatable memory
+ */
+ mib[0] = CTL_HW;
+ mib[1] = HW_USERMEM;
+ len = sizeof(mem_val);
+ if (sysctl(mib, 2, &mem_val, &len, NULL, 0) != -1)
+ _physical_memory = mem_val;
+ else
+ _physical_memory = 256*1024*1024; // fallback (XXXBSD?)
+
+#ifdef __OpenBSD__
+ {
+ // limit _physical_memory memory view on OpenBSD since
+ // datasize rlimit restricts us anyway.
+ struct rlimit limits;
+ getrlimit(RLIMIT_DATA, &limits);
+ _physical_memory = MIN2(_physical_memory, (julong)limits.rlim_cur);
+ }
+#endif
+}
+#else
+void os::Bsd::initialize_system_info() {
+ set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
+ if (processor_count() == 1) {
+ pid_t pid = os::Bsd::gettid();
+ char fname[32];
+ jio_snprintf(fname, sizeof(fname), "/proc/%d", pid);
+ FILE *fp = fopen(fname, "r");
+ if (fp == NULL) {
+ unsafe_chroot_detected = true;
+ } else {
+ fclose(fp);
+ }
+ }
+ _physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
+ assert(processor_count() > 0, "bsd error");
+}
+#endif
+
+void os::init_system_properties_values() {
+// char arch[12];
+// sysinfo(SI_ARCHITECTURE, arch, sizeof(arch));
+
+ // The next steps are taken in the product version:
+ //
+ // Obtain the JAVA_HOME value from the location of libjvm[_g].so.
+ // This library should be located at:
+ // <JAVA_HOME>/jre/lib/<arch>/{client|server}/libjvm[_g].so.
+ //
+ // If "/jre/lib/" appears at the right place in the path, then we
+ // assume libjvm[_g].so is installed in a JDK and we use this path.
+ //
+ // Otherwise exit with message: "Could not create the Java virtual machine."
+ //
+ // The following extra steps are taken in the debugging version:
+ //
+ // If "/jre/lib/" does NOT appear at the right place in the path
+ // instead of exit check for $JAVA_HOME environment variable.
+ //
+ // If it is defined and we are able to locate $JAVA_HOME/jre/lib/<arch>,
+ // then we append a fake suffix "hotspot/libjvm[_g].so" to this path so
+ // it looks like libjvm[_g].so is installed there
+ // <JAVA_HOME>/jre/lib/<arch>/hotspot/libjvm[_g].so.
+ //
+ // Otherwise exit.
+ //
+ // Important note: if the location of libjvm.so changes this
+ // code needs to be changed accordingly.
+
+ // The next few definitions allow the code to be verbatim:
+#define malloc(n) (char*)NEW_C_HEAP_ARRAY(char, (n))
+#define getenv(n) ::getenv(n)
+
+/*
+ * See ld(1):
+ * The linker uses the following search paths to locate required
+ * shared libraries:
+ * 1: ...
+ * ...
+ * 7: The default directories, normally /lib and /usr/lib.
+ */
+#ifndef DEFAULT_LIBPATH
+#define DEFAULT_LIBPATH "/lib:/usr/lib"
+#endif
+
+#define EXTENSIONS_DIR "/lib/ext"
+#define ENDORSED_DIR "/lib/endorsed"
+#define REG_DIR "/usr/java/packages"
+
+ {
+ /* sysclasspath, java_home, dll_dir */
+ {
+ char *home_path;
+ char *dll_path;
+ char *pslash;
+ char buf[MAXPATHLEN];
+ os::jvm_path(buf, sizeof(buf));
+
+ // Found the full path to libjvm.so.
+ // Now cut the path to <java_home>/jre if we can.
+ *(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
+ pslash = strrchr(buf, '/');
+ if (pslash != NULL)
+ *pslash = '\0'; /* get rid of /{client|server|hotspot} */
+ dll_path = malloc(strlen(buf) + 1);
+ if (dll_path == NULL)
+ return;
+ strcpy(dll_path, buf);
+ Arguments::set_dll_dir(dll_path);
+
+ if (pslash != NULL) {
+ pslash = strrchr(buf, '/');
+ if (pslash != NULL) {
+ *pslash = '\0'; /* get rid of /<arch> */
+ pslash = strrchr(buf, '/');
+ if (pslash != NULL)
+ *pslash = '\0'; /* get rid of /lib */
+ }
+ }
+
+ home_path = malloc(strlen(buf) + 1);
+ if (home_path == NULL)
+ return;
+ strcpy(home_path, buf);
+ Arguments::set_java_home(home_path);
+
+ if (!set_boot_path('/', ':'))
+ return;
+ }
+
+ /*
+ * Where to look for native libraries
+ *
+ * Note: Due to a legacy implementation, most of the library path
+ * is set in the launcher. This was to accomodate linking restrictions
+ * on legacy Bsd implementations (which are no longer supported).
+ * Eventually, all the library path setting will be done here.
+ *
+ * However, to prevent the proliferation of improperly built native
+ * libraries, the new path component /usr/java/packages is added here.
+ * Eventually, all the library path setting will be done here.
+ */
+ {
+ char *ld_library_path;
+
+ /*
+ * Construct the invariant part of ld_library_path. Note that the
+ * space for the colon and the trailing null are provided by the
+ * nulls included by the sizeof operator (so actually we allocate
+ * a byte more than necessary).
+ */
+ ld_library_path = (char *) malloc(sizeof(REG_DIR) + sizeof("/lib/") +
+ strlen(cpu_arch) + sizeof(DEFAULT_LIBPATH));
+ sprintf(ld_library_path, REG_DIR "/lib/%s:" DEFAULT_LIBPATH, cpu_arch);
+
+ /*
+ * Get the user setting of LD_LIBRARY_PATH, and prepended it. It
+ * should always exist (until the legacy problem cited above is
+ * addressed).
+ */
+#ifdef __APPLE__
+ char *v = getenv("DYLD_LIBRARY_PATH");
+#else
+ char *v = getenv("LD_LIBRARY_PATH");
+#endif
+ if (v != NULL) {
+ char *t = ld_library_path;
+ /* That's +1 for the colon and +1 for the trailing '\0' */
+ ld_library_path = (char *) malloc(strlen(v) + 1 + strlen(t) + 1);
+ sprintf(ld_library_path, "%s:%s", v, t);
+ }
+ Arguments::set_library_path(ld_library_path);
+ }
+
+ /*
+ * Extensions directories.
+ *
+ * Note that the space for the colon and the trailing null are provided
+ * by the nulls included by the sizeof operator (so actually one byte more
+ * than necessary is allocated).
+ */
+ {
+ char *buf = malloc(strlen(Arguments::get_java_home()) +
+ sizeof(EXTENSIONS_DIR) + sizeof(REG_DIR) + sizeof(EXTENSIONS_DIR));
+ sprintf(buf, "%s" EXTENSIONS_DIR ":" REG_DIR EXTENSIONS_DIR,
+ Arguments::get_java_home());
+ Arguments::set_ext_dirs(buf);
+ }
+
+ /* Endorsed standards default directory. */
+ {
+ char * buf;
+ buf = malloc(strlen(Arguments::get_java_home()) + sizeof(ENDORSED_DIR));
+ sprintf(buf, "%s" ENDORSED_DIR, Arguments::get_java_home());
+ Arguments::set_endorsed_dirs(buf);
+ }
+ }
+
+#undef malloc
+#undef getenv
+#undef EXTENSIONS_DIR
+#undef ENDORSED_DIR
+
+ // Done
+ return;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// breakpoint support
+
+void os::breakpoint() {
+ BREAKPOINT;
+}
+
+extern "C" void breakpoint() {
+ // use debugger to set breakpoint here
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// signal support
+
+debug_only(static bool signal_sets_initialized = false);
+static sigset_t unblocked_sigs, vm_sigs, allowdebug_blocked_sigs;
+
+bool os::Bsd::is_sig_ignored(int sig) {
+ struct sigaction oact;
+ sigaction(sig, (struct sigaction*)NULL, &oact);
+ void* ohlr = oact.sa_sigaction ? CAST_FROM_FN_PTR(void*, oact.sa_sigaction)
+ : CAST_FROM_FN_PTR(void*, oact.sa_handler);
+ if (ohlr == CAST_FROM_FN_PTR(void*, SIG_IGN))
+ return true;
+ else
+ return false;
+}
+
+void os::Bsd::signal_sets_init() {
+ // Should also have an assertion stating we are still single-threaded.
+ assert(!signal_sets_initialized, "Already initialized");
+ // Fill in signals that are necessarily unblocked for all threads in
+ // the VM. Currently, we unblock the following signals:
+ // SHUTDOWN{1,2,3}_SIGNAL: for shutdown hooks support (unless over-ridden
+ // by -Xrs (=ReduceSignalUsage));
+ // BREAK_SIGNAL which is unblocked only by the VM thread and blocked by all
+ // other threads. The "ReduceSignalUsage" boolean tells us not to alter
+ // the dispositions or masks wrt these signals.
+ // Programs embedding the VM that want to use the above signals for their
+ // own purposes must, at this time, use the "-Xrs" option to prevent
+ // interference with shutdown hooks and BREAK_SIGNAL thread dumping.
+ // (See bug 4345157, and other related bugs).
+ // In reality, though, unblocking these signals is really a nop, since
+ // these signals are not blocked by default.
+ sigemptyset(&unblocked_sigs);
+ sigemptyset(&allowdebug_blocked_sigs);
+ sigaddset(&unblocked_sigs, SIGILL);
+ sigaddset(&unblocked_sigs, SIGSEGV);
+ sigaddset(&unblocked_sigs, SIGBUS);
+ sigaddset(&unblocked_sigs, SIGFPE);
+ sigaddset(&unblocked_sigs, SR_signum);
+
+ if (!ReduceSignalUsage) {
+ if (!os::Bsd::is_sig_ignored(SHUTDOWN1_SIGNAL)) {
+ sigaddset(&unblocked_sigs, SHUTDOWN1_SIGNAL);
+ sigaddset(&allowdebug_blocked_sigs, SHUTDOWN1_SIGNAL);
+ }
+ if (!os::Bsd::is_sig_ignored(SHUTDOWN2_SIGNAL)) {
+ sigaddset(&unblocked_sigs, SHUTDOWN2_SIGNAL);
+ sigaddset(&allowdebug_blocked_sigs, SHUTDOWN2_SIGNAL);
+ }
+ if (!os::Bsd::is_sig_ignored(SHUTDOWN3_SIGNAL)) {
+ sigaddset(&unblocked_sigs, SHUTDOWN3_SIGNAL);
+ sigaddset(&allowdebug_blocked_sigs, SHUTDOWN3_SIGNAL);
+ }
+ }
+ // Fill in signals that are blocked by all but the VM thread.
+ sigemptyset(&vm_sigs);
+ if (!ReduceSignalUsage)
+ sigaddset(&vm_sigs, BREAK_SIGNAL);
+ debug_only(signal_sets_initialized = true);
+
+}
+
+// These are signals that are unblocked while a thread is running Java.
+// (For some reason, they get blocked by default.)
+sigset_t* os::Bsd::unblocked_signals() {
+ assert(signal_sets_initialized, "Not initialized");
+ return &unblocked_sigs;
+}
+
+// These are the signals that are blocked while a (non-VM) thread is
+// running Java. Only the VM thread handles these signals.
+sigset_t* os::Bsd::vm_signals() {
+ assert(signal_sets_initialized, "Not initialized");
+ return &vm_sigs;
+}
+
+// These are signals that are blocked during cond_wait to allow debugger in
+sigset_t* os::Bsd::allowdebug_blocked_signals() {
+ assert(signal_sets_initialized, "Not initialized");
+ return &allowdebug_blocked_sigs;
+}
+
+void os::Bsd::hotspot_sigmask(Thread* thread) {
+
+ //Save caller's signal mask before setting VM signal mask
+ sigset_t caller_sigmask;
+ pthread_sigmask(SIG_BLOCK, NULL, &caller_sigmask);
+
+ OSThread* osthread = thread->osthread();
+ osthread->set_caller_sigmask(caller_sigmask);
+
+ pthread_sigmask(SIG_UNBLOCK, os::Bsd::unblocked_signals(), NULL);
+
+ if (!ReduceSignalUsage) {
+ if (thread->is_VM_thread()) {
+ // Only the VM thread handles BREAK_SIGNAL ...
+ pthread_sigmask(SIG_UNBLOCK, vm_signals(), NULL);
+ } else {
+ // ... all other threads block BREAK_SIGNAL
+ pthread_sigmask(SIG_BLOCK, vm_signals(), NULL);
+ }
+ }
+}
+
+#ifndef _ALLBSD_SOURCE
+//////////////////////////////////////////////////////////////////////////////
+// detecting pthread library
+
+void os::Bsd::libpthread_init() {
+ // Save glibc and pthread version strings. Note that _CS_GNU_LIBC_VERSION
+ // and _CS_GNU_LIBPTHREAD_VERSION are supported in glibc >= 2.3.2. Use a
+ // generic name for earlier versions.
+ // Define macros here so we can build HotSpot on old systems.
+# ifndef _CS_GNU_LIBC_VERSION
+# define _CS_GNU_LIBC_VERSION 2
+# endif
+# ifndef _CS_GNU_LIBPTHREAD_VERSION
+# define _CS_GNU_LIBPTHREAD_VERSION 3
+# endif
+
+ size_t n = confstr(_CS_GNU_LIBC_VERSION, NULL, 0);
+ if (n > 0) {
+ char *str = (char *)malloc(n);
+ confstr(_CS_GNU_LIBC_VERSION, str, n);
+ os::Bsd::set_glibc_version(str);
+ } else {
+ // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
+ static char _gnu_libc_version[32];
+ jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
+ "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
+ os::Bsd::set_glibc_version(_gnu_libc_version);
+ }
+
+ n = confstr(_CS_GNU_LIBPTHREAD_VERSION, NULL, 0);
+ if (n > 0) {
+ char *str = (char *)malloc(n);
+ confstr(_CS_GNU_LIBPTHREAD_VERSION, str, n);
+ // Vanilla RH-9 (glibc 2.3.2) has a bug that confstr() always tells
+ // us "NPTL-0.29" even we are running with BsdThreads. Check if this
+ // is the case. BsdThreads has a hard limit on max number of threads.
+ // So sysconf(_SC_THREAD_THREADS_MAX) will return a positive value.
+ // On the other hand, NPTL does not have such a limit, sysconf()
+ // will return -1 and errno is not changed. Check if it is really NPTL.
+ if (strcmp(os::Bsd::glibc_version(), "glibc 2.3.2") == 0 &&
+ strstr(str, "NPTL") &&
+ sysconf(_SC_THREAD_THREADS_MAX) > 0) {
+ free(str);
+ os::Bsd::set_libpthread_version("bsdthreads");
+ } else {
+ os::Bsd::set_libpthread_version(str);
+ }
+ } else {
+ // glibc before 2.3.2 only has BsdThreads.
+ os::Bsd::set_libpthread_version("bsdthreads");
+ }
+
+ if (strstr(libpthread_version(), "NPTL")) {
+ os::Bsd::set_is_NPTL();
+ } else {
+ os::Bsd::set_is_BsdThreads();
+ }
+
+ // BsdThreads have two flavors: floating-stack mode, which allows variable
+ // stack size; and fixed-stack mode. NPTL is always floating-stack.
+ if (os::Bsd::is_NPTL() || os::Bsd::supports_variable_stack_size()) {
+ os::Bsd::set_is_floating_stack();
+ }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// thread stack
+
+// Force Bsd kernel to expand current thread stack. If "bottom" is close
+// to the stack guard, caller should block all signals.
+//
+// MAP_GROWSDOWN:
+// A special mmap() flag that is used to implement thread stacks. It tells
+// kernel that the memory region should extend downwards when needed. This
+// allows early versions of BsdThreads to only mmap the first few pages
+// when creating a new thread. Bsd kernel will automatically expand thread
+// stack as needed (on page faults).
+//
+// However, because the memory region of a MAP_GROWSDOWN stack can grow on
+// demand, if a page fault happens outside an already mapped MAP_GROWSDOWN
+// region, it's hard to tell if the fault is due to a legitimate stack
+// access or because of reading/writing non-exist memory (e.g. buffer
+// overrun). As a rule, if the fault happens below current stack pointer,
+// Bsd kernel does not expand stack, instead a SIGSEGV is sent to the
+// application (see Bsd kernel fault.c).
+//
+// This Bsd feature can cause SIGSEGV when VM bangs thread stack for
+// stack overflow detection.
+//
+// Newer version of BsdThreads (since glibc-2.2, or, RH-7.x) and NPTL do
+// not use this flag. However, the stack of initial thread is not created
+// by pthread, it is still MAP_GROWSDOWN. Also it's possible (though
+// unlikely) that user code can create a thread with MAP_GROWSDOWN stack
+// and then attach the thread to JVM.
+//
+// To get around the problem and allow stack banging on Bsd, we need to
+// manually expand thread stack after receiving the SIGSEGV.
+//
+// There are two ways to expand thread stack to address "bottom", we used
+// both of them in JVM before 1.5:
+// 1. adjust stack pointer first so that it is below "bottom", and then
+// touch "bottom"
+// 2. mmap() the page in question
+//
+// Now alternate signal stack is gone, it's harder to use 2. For instance,
+// if current sp is already near the lower end of page 101, and we need to
+// call mmap() to map page 100, it is possible that part of the mmap() frame
+// will be placed in page 100. When page 100 is mapped, it is zero-filled.
+// That will destroy the mmap() frame and cause VM to crash.
+//
+// The following code works by adjusting sp first, then accessing the "bottom"
+// page to force a page fault. Bsd kernel will then automatically expand the
+// stack mapping.
+//
+// _expand_stack_to() assumes its frame size is less than page size, which
+// should always be true if the function is not inlined.
+
+#if __GNUC__ < 3 // gcc 2.x does not support noinline attribute
+#define NOINLINE
+#else
+#define NOINLINE __attribute__ ((noinline))
+#endif
+
+static void _expand_stack_to(address bottom) NOINLINE;
+
+static void _expand_stack_to(address bottom) {
+ address sp;
+ size_t size;
+ volatile char *p;
+
+ // Adjust bottom to point to the largest address within the same page, it
+ // gives us a one-page buffer if alloca() allocates slightly more memory.
+ bottom = (address)align_size_down((uintptr_t)bottom, os::Bsd::page_size());
+ bottom += os::Bsd::page_size() - 1;
+
+ // sp might be slightly above current stack pointer; if that's the case, we
+ // will alloca() a little more space than necessary, which is OK. Don't use
+ // os::current_stack_pointer(), as its result can be slightly below current
+ // stack pointer, causing us to not alloca enough to reach "bottom".
+ sp = (address)&sp;
+
+ if (sp > bottom) {
+ size = sp - bottom;
+ p = (volatile char *)alloca(size);
+ assert(p != NULL && p <= (volatile char *)bottom, "alloca problem?");
+ p[0] = '\0';
+ }
+}
+
+bool os::Bsd::manually_expand_stack(JavaThread * t, address addr) {
+ assert(t!=NULL, "just checking");
+ assert(t->osthread()->expanding_stack(), "expand should be set");
+ assert(t->stack_base() != NULL, "stack_base was not initialized");
+
+ if (addr < t->stack_base() && addr >= t->stack_yellow_zone_base()) {
+ sigset_t mask_all, old_sigset;
+ sigfillset(&mask_all);
+ pthread_sigmask(SIG_SETMASK, &mask_all, &old_sigset);
+ _expand_stack_to(addr);
+ pthread_sigmask(SIG_SETMASK, &old_sigset, NULL);
+ return true;
+ }
+ return false;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+// create new thread
+
+static address highest_vm_reserved_address();
+
+// check if it's safe to start a new thread
+static bool _thread_safety_check(Thread* thread) {
+#ifdef _ALLBSD_SOURCE
+ return true;
+#else
+ if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) {
+ // Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat)
+ // Heap is mmap'ed at lower end of memory space. Thread stacks are
+ // allocated (MAP_FIXED) from high address space. Every thread stack
+ // occupies a fixed size slot (usually 2Mbytes, but user can change
+ // it to other values if they rebuild BsdThreads).
+ //
+ // Problem with MAP_FIXED is that mmap() can still succeed even part of
+ // the memory region has already been mmap'ed. That means if we have too
+ // many threads and/or very large heap, eventually thread stack will
+ // collide with heap.
+ //
+ // Here we try to prevent heap/stack collision by comparing current
+ // stack bottom with the highest address that has been mmap'ed by JVM
+ // plus a safety margin for memory maps created by native code.
+ //
+ // This feature can be disabled by setting ThreadSafetyMargin to 0
+ //
+ if (ThreadSafetyMargin > 0) {
+ address stack_bottom = os::current_stack_base() - os::current_stack_size();
+
+ // not safe if our stack extends below the safety margin
+ return stack_bottom - ThreadSafetyMargin >= highest_vm_reserved_address();
+ } else {
+ return true;
+ }
+ } else {
+ // Floating stack BsdThreads or NPTL:
+ // Unlike fixed stack BsdThreads, thread stacks are not MAP_FIXED. When
+ // there's not enough space left, pthread_create() will fail. If we come
+ // here, that means enough space has been reserved for stack.
+ return true;
+ }
+#endif
+}
+
+// Thread start routine for all newly created threads
+static void *java_start(Thread *thread) {
+ // Try to randomize the cache line index of hot stack frames.
+ // This helps when threads of the same stack traces evict each other's
+ // cache lines. The threads can be either from the same JVM instance, or
+ // from different JVM instances. The benefit is especially true for
+ // processors with hyperthreading technology.
+ static int counter = 0;
+ int pid = os::current_process_id();
+ alloca(((pid ^ counter++) & 7) * 128);
+
+ ThreadLocalStorage::set_thread(thread);
+
+ OSThread* osthread = thread->osthread();
+ Monitor* sync = osthread->startThread_lock();
+
+ // non floating stack BsdThreads needs extra check, see above
+ if (!_thread_safety_check(thread)) {
+ // notify parent thread
+ MutexLockerEx ml(sync, Mutex::_no_safepoint_check_flag);
+ osthread->set_state(ZOMBIE);
+ sync->notify_all();
+ return NULL;
+ }
+
+#ifdef _ALLBSD_SOURCE
+ // thread_id is pthread_id on BSD
+ osthread->set_thread_id(::pthread_self());
+#else
+ // thread_id is kernel thread id (similar to Solaris LWP id)
+ osthread->set_thread_id(os::Bsd::gettid());
+
+ if (UseNUMA) {
+ int lgrp_id = os::numa_get_group_id();
+ if (lgrp_id != -1) {
+ thread->set_lgrp_id(lgrp_id);
+ }
+ }
+#endif
+ // initialize signal mask for this thread
+ os::Bsd::hotspot_sigmask(thread);
+
+ // initialize floating point control register
+ os::Bsd::init_thread_fpu_state();
+
+ // handshaking with parent thread
+ {
+ MutexLockerEx ml(sync, Mutex::_no_safepoint_check_flag);
+
+ // notify parent thread
+ osthread->set_state(INITIALIZED);
+ sync->notify_all();
+
+ // wait until os::start_thread()
+ while (osthread->get_state() == INITIALIZED) {
+ sync->wait(Mutex::_no_safepoint_check_flag);
+ }
+ }
+
+ // call one more level start routine
+ thread->run();
+
+ return 0;
+}
+
+bool os::create_thread(Thread* thread, ThreadType thr_type, size_t stack_size) {
+ assert(thread->osthread() == NULL, "caller responsible");
+
+ // Allocate the OSThread object
+ OSThread* osthread = new OSThread(NULL, NULL);
+ if (osthread == NULL) {
+ return false;
+ }
+
+ // set the correct thread state
+ osthread->set_thread_type(thr_type);
+
+ // Initial state is ALLOCATED but not INITIALIZED
+ osthread->set_state(ALLOCATED);
+
+ thread->set_osthread(osthread);
+
+ // init thread attributes
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+ // stack size
+ if (os::Bsd::supports_variable_stack_size()) {
+ // calculate stack size if it's not specified by caller
+ if (stack_size == 0) {
+ stack_size = os::Bsd::default_stack_size(thr_type);
+
+ switch (thr_type) {
+ case os::java_thread:
+ // Java threads use ThreadStackSize which default value can be
+ // changed with the flag -Xss
+ assert (JavaThread::stack_size_at_create() > 0, "this should be set");
+ stack_size = JavaThread::stack_size_at_create();
+ break;
+ case os::compiler_thread:
+ if (CompilerThreadStackSize > 0) {
+ stack_size = (size_t)(CompilerThreadStackSize * K);
+ break;
+ } // else fall through:
+ // use VMThreadStackSize if CompilerThreadStackSize is not defined
+ case os::vm_thread:
+ case os::pgc_thread:
+ case os::cgc_thread:
+ case os::watcher_thread:
+ if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+ break;
+ }
+ }
+
+ stack_size = MAX2(stack_size, os::Bsd::min_stack_allowed);
+ pthread_attr_setstacksize(&attr, stack_size);
+ } else {
+ // let pthread_create() pick the default value.
+ }
+
+#ifndef _ALLBSD_SOURCE
+ // glibc guard page
+ pthread_attr_setguardsize(&attr, os::Bsd::default_guard_size(thr_type));
+#endif
+
+ ThreadState state;
+
+ {
+
+#ifndef _ALLBSD_SOURCE
+ // Serialize thread creation if we are running with fixed stack BsdThreads
+ bool lock = os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack();
+ if (lock) {
+ os::Bsd::createThread_lock()->lock_without_safepoint_check();
+ }
+#endif
+
+ pthread_t tid;
+ int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
+
+ pthread_attr_destroy(&attr);
+
+ if (ret != 0) {
+ if (PrintMiscellaneous && (Verbose || WizardMode)) {
+ perror("pthread_create()");
+ }
+ // Need to clean up stuff we've allocated so far
+ thread->set_osthread(NULL);
+ delete osthread;
+#ifndef _ALLBSD_SOURCE
+ if (lock) os::Bsd::createThread_lock()->unlock();
+#endif
+ return false;
+ }
+
+ // Store pthread info into the OSThread
+ osthread->set_pthread_id(tid);
+
+ // Wait until child thread is either initialized or aborted
+ {
+ Monitor* sync_with_child = osthread->startThread_lock();
+ MutexLockerEx ml(sync_with_child, Mutex::_no_safepoint_check_flag);
+ while ((state = osthread->get_state()) == ALLOCATED) {
+ sync_with_child->wait(Mutex::_no_safepoint_check_flag);
+ }
+ }
+
+#ifndef _ALLBSD_SOURCE
+ if (lock) {
+ os::Bsd::createThread_lock()->unlock();
+ }
+#endif
+ }
+
+ // Aborted due to thread limit being reached
+ if (state == ZOMBIE) {
+ thread->set_osthread(NULL);
+ delete osthread;
+ return false;
+ }
+
+ // The thread is returned suspended (in state INITIALIZED),
+ // and is started higher up in the call chain
+ assert(state == INITIALIZED, "race condition");
+ return true;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// attach existing thread
+
+// bootstrap the main thread
+bool os::create_main_thread(JavaThread* thread) {
+ assert(os::Bsd::_main_thread == pthread_self(), "should be called inside main thread");
+ return create_attached_thread(thread);
+}
+
+bool os::create_attached_thread(JavaThread* thread) {
+#ifdef ASSERT
+ thread->verify_not_published();
+#endif
+
+ // Allocate the OSThread object
+ OSThread* osthread = new OSThread(NULL, NULL);
+
+ if (osthread == NULL) {
+ return false;
+ }
+
+ // Store pthread info into the OSThread
+#ifdef _ALLBSD_SOURCE
+ osthread->set_thread_id(::pthread_self());
+#else
+ osthread->set_thread_id(os::Bsd::gettid());
+#endif
+ osthread->set_pthread_id(::pthread_self());
+
+ // initialize floating point control register
+ os::Bsd::init_thread_fpu_state();
+
+ // Initial thread state is RUNNABLE
+ osthread->set_state(RUNNABLE);
+
+ thread->set_osthread(osthread);
+
+#ifndef _ALLBSD_SOURCE
+ if (UseNUMA) {
+ int lgrp_id = os::numa_get_group_id();
+ if (lgrp_id != -1) {
+ thread->set_lgrp_id(lgrp_id);
+ }
+ }
+
+ if (os::Bsd::is_initial_thread()) {
+ // If current thread is initial thread, its stack is mapped on demand,
+ // see notes about MAP_GROWSDOWN. Here we try to force kernel to map
+ // the entire stack region to avoid SEGV in stack banging.
+ // It is also useful to get around the heap-stack-gap problem on SuSE
+ // kernel (see 4821821 for details). We first expand stack to the top
+ // of yellow zone, then enable stack yellow zone (order is significant,
+ // enabling yellow zone first will crash JVM on SuSE Bsd), so there
+ // is no gap between the last two virtual memory regions.
+
+ JavaThread *jt = (JavaThread *)thread;
+ address addr = jt->stack_yellow_zone_base();
+ assert(addr != NULL, "initialization problem?");
+ assert(jt->stack_available(addr) > 0, "stack guard should not be enabled");
+
+ osthread->set_expanding_stack();
+ os::Bsd::manually_expand_stack(jt, addr);
+ osthread->clear_expanding_stack();
+ }
+#endif
+
+ // initialize signal mask for this thread
+ // and save the caller's signal mask
+ os::Bsd::hotspot_sigmask(thread);
+
+ return true;
+}
+
+void os::pd_start_thread(Thread* thread) {
+ OSThread * osthread = thread->osthread();
+ assert(osthread->get_state() != INITIALIZED, "just checking");
+ Monitor* sync_with_child = osthread->startThread_lock();
+ MutexLockerEx ml(sync_with_child, Mutex::_no_safepoint_check_flag);
+ sync_with_child->notify();
+}
+
+// Free Bsd resources related to the OSThread
+void os::free_thread(OSThread* osthread) {
+ assert(osthread != NULL, "osthread not set");
+
+ if (Thread::current()->osthread() == osthread) {
+ // Restore caller's signal mask
+ sigset_t sigmask = osthread->caller_sigmask();
+ pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
+ }
+
+ delete osthread;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// thread local storage
+
+int os::allocate_thread_local_storage() {
+ pthread_key_t key;
+ int rslt = pthread_key_create(&key, NULL);
+ assert(rslt == 0, "cannot allocate thread local storage");
+ return (int)key;
+}
+
+// Note: This is currently not used by VM, as we don't destroy TLS key
+// on VM exit.
+void os::free_thread_local_storage(int index) {
+ int rslt = pthread_key_delete((pthread_key_t)index);
+ assert(rslt == 0, "invalid index");
+}
+
+void os::thread_local_storage_at_put(int index, void* value) {
+ int rslt = pthread_setspecific((pthread_key_t)index, value);
+ assert(rslt == 0, "pthread_setspecific failed");
+}
+
+extern "C" Thread* get_thread() {
+ return ThreadLocalStorage::thread();
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// initial thread
+
+#ifndef _ALLBSD_SOURCE
+// Check if current thread is the initial thread, similar to Solaris thr_main.
+bool os::Bsd::is_initial_thread(void) {
+ char dummy;
+ // If called before init complete, thread stack bottom will be null.
+ // Can be called if fatal error occurs before initialization.
+ if (initial_thread_stack_bottom() == NULL) return false;
+ assert(initial_thread_stack_bottom() != NULL &&
+ initial_thread_stack_size() != 0,
+ "os::init did not locate initial thread's stack region");
+ if ((address)&dummy >= initial_thread_stack_bottom() &&
+ (address)&dummy < initial_thread_stack_bottom() + initial_thread_stack_size())
+ return true;
+ else return false;
+}
+
+// Find the virtual memory area that contains addr
+static bool find_vma(address addr, address* vma_low, address* vma_high) {
+ FILE *fp = fopen("/proc/self/maps", "r");
+ if (fp) {
+ address low, high;
+ while (!feof(fp)) {
+ if (fscanf(fp, "%p-%p", &low, &high) == 2) {
+ if (low <= addr && addr < high) {
+ if (vma_low) *vma_low = low;
+ if (vma_high) *vma_high = high;
+ fclose (fp);
+ return true;
+ }
+ }
+ for (;;) {
+ int ch = fgetc(fp);
+ if (ch == EOF || ch == (int)'\n') break;
+ }
+ }
+ fclose(fp);
+ }
+ return false;
+}
+
+// Locate initial thread stack. This special handling of initial thread stack
+// is needed because pthread_getattr_np() on most (all?) Bsd distros returns
+// bogus value for initial thread.
+void os::Bsd::capture_initial_stack(size_t max_size) {
+ // stack size is the easy part, get it from RLIMIT_STACK
+ size_t stack_size;
+ struct rlimit rlim;
+ getrlimit(RLIMIT_STACK, &rlim);
+ stack_size = rlim.rlim_cur;
+
+ // 6308388: a bug in ld.so will relocate its own .data section to the
+ // lower end of primordial stack; reduce ulimit -s value a little bit
+ // so we won't install guard page on ld.so's data section.
+ stack_size -= 2 * page_size();
+
+ // 4441425: avoid crash with "unlimited" stack size on SuSE 7.1 or Redhat
+ // 7.1, in both cases we will get 2G in return value.
+ // 4466587: glibc 2.2.x compiled w/o "--enable-kernel=2.4.0" (RH 7.0,
+ // SuSE 7.2, Debian) can not handle alternate signal stack correctly
+ // for initial thread if its stack size exceeds 6M. Cap it at 2M,
+ // in case other parts in glibc still assumes 2M max stack size.
+ // FIXME: alt signal stack is gone, maybe we can relax this constraint?
+#ifndef IA64
+ if (stack_size > 2 * K * K) stack_size = 2 * K * K;
+#else
+ // Problem still exists RH7.2 (IA64 anyway) but 2MB is a little small
+ if (stack_size > 4 * K * K) stack_size = 4 * K * K;
+#endif
+
+ // Try to figure out where the stack base (top) is. This is harder.
+ //
+ // When an application is started, glibc saves the initial stack pointer in
+ // a global variable "__libc_stack_end", which is then used by system
+ // libraries. __libc_stack_end should be pretty close to stack top. The
+ // variable is available since the very early days. However, because it is
+ // a private interface, it could disappear in the future.
+ //
+ // Bsd kernel saves start_stack information in /proc/<pid>/stat. Similar
+ // to __libc_stack_end, it is very close to stack top, but isn't the real
+ // stack top. Note that /proc may not exist if VM is running as a chroot
+ // program, so reading /proc/<pid>/stat could fail. Also the contents of
+ // /proc/<pid>/stat could change in the future (though unlikely).
+ //
+ // We try __libc_stack_end first. If that doesn't work, look for
+ // /proc/<pid>/stat. If neither of them works, we use current stack pointer
+ // as a hint, which should work well in most cases.
+
+ uintptr_t stack_start;
+
+ // try __libc_stack_end first
+ uintptr_t *p = (uintptr_t *)dlsym(RTLD_DEFAULT, "__libc_stack_end");
+ if (p && *p) {
+ stack_start = *p;
+ } else {
+ // see if we can get the start_stack field from /proc/self/stat
+ FILE *fp;
+ int pid;
+ char state;
+ int ppid;
+ int pgrp;
+ int session;
+ int nr;
+ int tpgrp;
+ unsigned long flags;
+ unsigned long minflt;
+ unsigned long cminflt;
+ unsigned long majflt;
+ unsigned long cmajflt;
+ unsigned long utime;
+ unsigned long stime;
+ long cutime;
+ long cstime;
+ long prio;
+ long nice;
+ long junk;
+ long it_real;
+ uintptr_t start;
+ uintptr_t vsize;
+ intptr_t rss;
+ uintptr_t rsslim;
+ uintptr_t scodes;
+ uintptr_t ecode;
+ int i;
+
+ // Figure what the primordial thread stack base is. Code is inspired
+ // by email from Hans Boehm. /proc/self/stat begins with current pid,
+ // followed by command name surrounded by parentheses, state, etc.
+ char stat[2048];
+ int statlen;
+
+ fp = fopen("/proc/self/stat", "r");
+ if (fp) {
+ statlen = fread(stat, 1, 2047, fp);
+ stat[statlen] = '\0';
+ fclose(fp);
+
+ // Skip pid and the command string. Note that we could be dealing with
+ // weird command names, e.g. user could decide to rename java launcher
+ // to "java 1.4.2 :)", then the stat file would look like
+ // 1234 (java 1.4.2 :)) R ... ...
+ // We don't really need to know the command string, just find the last
+ // occurrence of ")" and then start parsing from there. See bug 4726580.
+ char * s = strrchr(stat, ')');
+
+ i = 0;
+ if (s) {
+ // Skip blank chars
+ do s++; while (isspace(*s));
+
+#define _UFM UINTX_FORMAT
+#define _DFM INTX_FORMAT
+
+ /* 1 1 1 1 1 1 1 1 1 1 2 2 2 2 2 2 2 2 2 */
+ /* 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 */
+ i = sscanf(s, "%c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu %ld %ld %ld %ld %ld %ld " _UFM _UFM _DFM _UFM _UFM _UFM _UFM,
+ &state, /* 3 %c */
+ &ppid, /* 4 %d */
+ &pgrp, /* 5 %d */
+ &session, /* 6 %d */
+ &nr, /* 7 %d */
+ &tpgrp, /* 8 %d */
+ &flags, /* 9 %lu */
+ &minflt, /* 10 %lu */
+ &cminflt, /* 11 %lu */
+ &majflt, /* 12 %lu */
+ &cmajflt, /* 13 %lu */
+ &utime, /* 14 %lu */
+ &stime, /* 15 %lu */
+ &cutime, /* 16 %ld */
+ &cstime, /* 17 %ld */
+ &prio, /* 18 %ld */
+ &nice, /* 19 %ld */
+ &junk, /* 20 %ld */
+ &it_real, /* 21 %ld */
+ &start, /* 22 UINTX_FORMAT */
+ &vsize, /* 23 UINTX_FORMAT */
+ &rss, /* 24 INTX_FORMAT */
+ &rsslim, /* 25 UINTX_FORMAT */
+ &scodes, /* 26 UINTX_FORMAT */
+ &ecode, /* 27 UINTX_FORMAT */
+ &stack_start); /* 28 UINTX_FORMAT */
+ }
+
+#undef _UFM
+#undef _DFM
+
+ if (i != 28 - 2) {
+ assert(false, "Bad conversion from /proc/self/stat");
+ // product mode - assume we are the initial thread, good luck in the
+ // embedded case.
+ warning("Can't detect initial thread stack location - bad conversion");
+ stack_start = (uintptr_t) &rlim;
+ }
+ } else {
+ // For some reason we can't open /proc/self/stat (for example, running on
+ // FreeBSD with a Bsd emulator, or inside chroot), this should work for
+ // most cases, so don't abort:
+ warning("Can't detect initial thread stack location - no /proc/self/stat");
+ stack_start = (uintptr_t) &rlim;
+ }
+ }
+
+ // Now we have a pointer (stack_start) very close to the stack top, the
+ // next thing to do is to figure out the exact location of stack top. We
+ // can find out the virtual memory area that contains stack_start by
+ // reading /proc/self/maps, it should be the last vma in /proc/self/maps,
+ // and its upper limit is the real stack top. (again, this would fail if
+ // running inside chroot, because /proc may not exist.)
+
+ uintptr_t stack_top;
+ address low, high;
+ if (find_vma((address)stack_start, &low, &high)) {
+ // success, "high" is the true stack top. (ignore "low", because initial
+ // thread stack grows on demand, its real bottom is high - RLIMIT_STACK.)
+ stack_top = (uintptr_t)high;
+ } else {
+ // failed, likely because /proc/self/maps does not exist
+ warning("Can't detect initial thread stack location - find_vma failed");
+ // best effort: stack_start is normally within a few pages below the real
+ // stack top, use it as stack top, and reduce stack size so we won't put
+ // guard page outside stack.
+ stack_top = stack_start;
+ stack_size -= 16 * page_size();
+ }
+
+ // stack_top could be partially down the page so align it
+ stack_top = align_size_up(stack_top, page_size());
+
+ if (max_size && stack_size > max_size) {
+ _initial_thread_stack_size = max_size;
+ } else {
+ _initial_thread_stack_size = stack_size;
+ }
+
+ _initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
+ _initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
+}
+#endif
+
+////////////////////////////////////////////////////////////////////////////////
+// time support
+
+// Time since start-up in seconds to a fine granularity.
+// Used by VMSelfDestructTimer and the MemProfiler.
+double os::elapsedTime() {
+
+ return (double)(os::elapsed_counter()) * 0.000001;
+}
+
+jlong os::elapsed_counter() {
+ timeval time;
+ int status = gettimeofday(&time, NULL);
+ return jlong(time.tv_sec) * 1000 * 1000 + jlong(time.tv_usec) - initial_time_count;
+}
+
+jlong os::elapsed_frequency() {
+ return (1000 * 1000);
+}
+
+// XXX: For now, code this as if BSD does not support vtime.
+bool os::supports_vtime() { return false; }
+bool os::enable_vtime() { return false; }
+bool os::vtime_enabled() { return false; }
+double os::elapsedVTime() {
+ // better than nothing, but not much
+ return elapsedTime();
+}
+
+jlong os::javaTimeMillis() {
+ timeval time;
+ int status = gettimeofday(&time, NULL);
+ assert(status != -1, "bsd error");
+ return jlong(time.tv_sec) * 1000 + jlong(time.tv_usec / 1000);
+}
+
+#ifndef CLOCK_MONOTONIC
+#define CLOCK_MONOTONIC (1)
+#endif
+
+#ifdef __APPLE__
+void os::Bsd::clock_init() {
+ // XXXDARWIN: Investigate replacement monotonic clock
+}
+#elif defined(_ALLBSD_SOURCE)
+void os::Bsd::clock_init() {
+ struct timespec res;
+ struct timespec tp;
+ if (::clock_getres(CLOCK_MONOTONIC, &res) == 0 &&
+ ::clock_gettime(CLOCK_MONOTONIC, &tp) == 0) {
+ // yes, monotonic clock is supported
+ _clock_gettime = ::clock_gettime;
+ }
+}
+#else
+void os::Bsd::clock_init() {
+ // we do dlopen's in this particular order due to bug in bsd
+ // dynamical loader (see 6348968) leading to crash on exit
+ void* handle = dlopen("librt.so.1", RTLD_LAZY);
+ if (handle == NULL) {
+ handle = dlopen("librt.so", RTLD_LAZY);
+ }
+
+ if (handle) {
+ int (*clock_getres_func)(clockid_t, struct timespec*) =
+ (int(*)(clockid_t, struct timespec*))dlsym(handle, "clock_getres");
+ int (*clock_gettime_func)(clockid_t, struct timespec*) =
+ (int(*)(clockid_t, struct timespec*))dlsym(handle, "clock_gettime");
+ if (clock_getres_func && clock_gettime_func) {
+ // See if monotonic clock is supported by the kernel. Note that some
+ // early implementations simply return kernel jiffies (updated every
+ // 1/100 or 1/1000 second). It would be bad to use such a low res clock
+ // for nano time (though the monotonic property is still nice to have).
+ // It's fixed in newer kernels, however clock_getres() still returns
+ // 1/HZ. We check if clock_getres() works, but will ignore its reported
+ // resolution for now. Hopefully as people move to new kernels, this
+ // won't be a problem.
+ struct timespec res;
+ struct timespec tp;
+ if (clock_getres_func (CLOCK_MONOTONIC, &res) == 0 &&
+ clock_gettime_func(CLOCK_MONOTONIC, &tp) == 0) {
+ // yes, monotonic clock is supported
+ _clock_gettime = clock_gettime_func;
+ } else {
+ // close librt if there is no monotonic clock
+ dlclose(handle);
+ }
+ }
+ }
+}
+#endif
+
+#ifndef _ALLBSD_SOURCE
+#ifndef SYS_clock_getres
+
+#if defined(IA32) || defined(AMD64)
+#define SYS_clock_getres IA32_ONLY(266) AMD64_ONLY(229)
+#define sys_clock_getres(x,y) ::syscall(SYS_clock_getres, x, y)
+#else
+#warning "SYS_clock_getres not defined for this platform, disabling fast_thread_cpu_time"
+#define sys_clock_getres(x,y) -1
+#endif
+
+#else
+#define sys_clock_getres(x,y) ::syscall(SYS_clock_getres, x, y)
+#endif
+
+void os::Bsd::fast_thread_clock_init() {
+ if (!UseBsdPosixThreadCPUClocks) {
+ return;
+ }
+ clockid_t clockid;
+ struct timespec tp;
+ int (*pthread_getcpuclockid_func)(pthread_t, clockid_t *) =
+ (int(*)(pthread_t, clockid_t *)) dlsym(RTLD_DEFAULT, "pthread_getcpuclockid");
+
+ // Switch to using fast clocks for thread cpu time if
+ // the sys_clock_getres() returns 0 error code.
+ // Note, that some kernels may support the current thread
+ // clock (CLOCK_THREAD_CPUTIME_ID) but not the clocks
+ // returned by the pthread_getcpuclockid().
+ // If the fast Posix clocks are supported then the sys_clock_getres()
+ // must return at least tp.tv_sec == 0 which means a resolution
+ // better than 1 sec. This is extra check for reliability.
+
+ if(pthread_getcpuclockid_func &&
+ pthread_getcpuclockid_func(_main_thread, &clockid) == 0 &&
+ sys_clock_getres(clockid, &tp) == 0 && tp.tv_sec == 0) {
+
+ _supports_fast_thread_cpu_time = true;
+ _pthread_getcpuclockid = pthread_getcpuclockid_func;
+ }
+}
+#endif
+
+jlong os::javaTimeNanos() {
+ if (Bsd::supports_monotonic_clock()) {
+ struct timespec tp;
+ int status = Bsd::clock_gettime(CLOCK_MONOTONIC, &tp);
+ assert(status == 0, "gettime error");
+ jlong result = jlong(tp.tv_sec) * (1000 * 1000 * 1000) + jlong(tp.tv_nsec);
+ return result;
+ } else {
+ timeval time;
+ int status = gettimeofday(&time, NULL);
+ assert(status != -1, "bsd error");
+ jlong usecs = jlong(time.tv_sec) * (1000 * 1000) + jlong(time.tv_usec);
+ return 1000 * usecs;
+ }
+}
+
+void os::javaTimeNanos_info(jvmtiTimerInfo *info_ptr) {
+ if (Bsd::supports_monotonic_clock()) {
+ info_ptr->max_value = ALL_64_BITS;
+
+ // CLOCK_MONOTONIC - amount of time since some arbitrary point in the past
+ info_ptr->may_skip_backward = false; // not subject to resetting or drifting
+ info_ptr->may_skip_forward = false; // not subject to resetting or drifting
+ } else {
+ // gettimeofday - based on time in seconds since the Epoch thus does not wrap
+ info_ptr->max_value = ALL_64_BITS;
+
+ // gettimeofday is a real time clock so it skips
+ info_ptr->may_skip_backward = true;
+ info_ptr->may_skip_forward = true;
+ }
+
+ info_ptr->kind = JVMTI_TIMER_ELAPSED; // elapsed not CPU time
+}
+
+// Return the real, user, and system times in seconds from an
+// arbitrary fixed point in the past.
+bool os::getTimesSecs(double* process_real_time,
+ double* process_user_time,
+ double* process_system_time) {
+ struct tms ticks;
+ clock_t real_ticks = times(&ticks);
+
+ if (real_ticks == (clock_t) (-1)) {
+ return false;
+ } else {
+ double ticks_per_second = (double) clock_tics_per_sec;
+ *process_user_time = ((double) ticks.tms_utime) / ticks_per_second;
+ *process_system_time = ((double) ticks.tms_stime) / ticks_per_second;
+ *process_real_time = ((double) real_ticks) / ticks_per_second;
+
+ return true;
+ }
+}
+
+
+char * os::local_time_string(char *buf, size_t buflen) {
+ struct tm t;
+ time_t long_time;
+ time(&long_time);
+ localtime_r(&long_time, &t);
+ jio_snprintf(buf, buflen, "%d-%02d-%02d %02d:%02d:%02d",
+ t.tm_year + 1900, t.tm_mon + 1, t.tm_mday,
+ t.tm_hour, t.tm_min, t.tm_sec);
+ return buf;
+}
+
+struct tm* os::localtime_pd(const time_t* clock, struct tm* res) {
+ return localtime_r(clock, res);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// runtime exit support
+
+// Note: os::shutdown() might be called very early during initialization, or
+// called from signal handler. Before adding something to os::shutdown(), make
+// sure it is async-safe and can handle partially initialized VM.
+void os::shutdown() {
+
+ // allow PerfMemory to attempt cleanup of any persistent resources
+ perfMemory_exit();
+
+ // needs to remove object in file system
+ AttachListener::abort();
+
+ // flush buffered output, finish log files
+ ostream_abort();
+
+ // Check for abort hook
+ abort_hook_t abort_hook = Arguments::abort_hook();
+ if (abort_hook != NULL) {
+ abort_hook();
+ }
+
+}
+
+// Note: os::abort() might be called very early during initialization, or
+// called from signal handler. Before adding something to os::abort(), make
+// sure it is async-safe and can handle partially initialized VM.
+void os::abort(bool dump_core) {
+ os::shutdown();
+ if (dump_core) {
+#ifndef PRODUCT
+ fdStream out(defaultStream::output_fd());
+ out.print_raw("Current thread is ");
+ char buf[16];
+ jio_snprintf(buf, sizeof(buf), UINTX_FORMAT, os::current_thread_id());
+ out.print_raw_cr(buf);
+ out.print_raw_cr("Dumping core ...");
+#endif
+ ::abort(); // dump core
+ }
+
+ ::exit(1);
+}
+
+// Die immediately, no exit hook, no abort hook, no cleanup.
+void os::die() {
+ // _exit() on BsdThreads only kills current thread
+ ::abort();
+}
+
+// unused on bsd for now.
+void os::set_error_file(const char *logfile) {}
+
+
+// This method is a copy of JDK's sysGetLastErrorString
+// from src/solaris/hpi/src/system_md.c
+
+size_t os::lasterror(char *buf, size_t len) {
+
+ if (errno == 0) return 0;
+
+ const char *s = ::strerror(errno);
+ size_t n = ::strlen(s);
+ if (n >= len) {
+ n = len - 1;
+ }
+ ::strncpy(buf, s, n);
+ buf[n] = '\0';
+ return n;
+}
+
+intx os::current_thread_id() { return (intx)pthread_self(); }
+int os::current_process_id() {
+
+ // Under the old bsd thread library, bsd gives each thread
+ // its own process id. Because of this each thread will return
+ // a different pid if this method were to return the result
+ // of getpid(2). Bsd provides no api that returns the pid
+ // of the launcher thread for the vm. This implementation
+ // returns a unique pid, the pid of the launcher thread
+ // that starts the vm 'process'.
+
+ // Under the NPTL, getpid() returns the same pid as the
+ // launcher thread rather than a unique pid per thread.
+ // Use gettid() if you want the old pre NPTL behaviour.
+
+ // if you are looking for the result of a call to getpid() that
+ // returns a unique pid for the calling thread, then look at the
+ // OSThread::thread_id() method in osThread_bsd.hpp file
+
+ return (int)(_initial_pid ? _initial_pid : getpid());
+}
+
+// DLL functions
+
+#define JNI_LIB_PREFIX "lib"
+#ifdef __APPLE__
+#define JNI_LIB_SUFFIX ".dylib"
+#else
+#define JNI_LIB_SUFFIX ".so"
+#endif
+
+const char* os::dll_file_extension() { return JNI_LIB_SUFFIX; }
+
+// This must be hard coded because it's the system's temporary
+// directory not the java application's temp directory, ala java.io.tmpdir.
+const char* os::get_temp_directory() { return "/tmp"; }
+
+static bool file_exists(const char* filename) {
+ struct stat statbuf;
+ if (filename == NULL || strlen(filename) == 0) {
+ return false;
+ }
+ return os::stat(filename, &statbuf) == 0;
+}
+
+void os::dll_build_name(char* buffer, size_t buflen,
+ const char* pname, const char* fname) {
+ // Copied from libhpi
+ const size_t pnamelen = pname ? strlen(pname) : 0;
+
+ // Quietly truncate on buffer overflow. Should be an error.
+ if (pnamelen + strlen(fname) + strlen(JNI_LIB_PREFIX) + strlen(JNI_LIB_SUFFIX) + 2 > buflen) {
+ *buffer = '\0';
+ return;
+ }
+
+ if (pnamelen == 0) {
+ snprintf(buffer, buflen, JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX, fname);
+ } else if (strchr(pname, *os::path_separator()) != NULL) {
+ int n;
+ char** pelements = split_path(pname, &n);
+ for (int i = 0 ; i < n ; i++) {
+ // Really shouldn't be NULL, but check can't hurt
+ if (pelements[i] == NULL || strlen(pelements[i]) == 0) {
+ continue; // skip the empty path values
+ }
+ snprintf(buffer, buflen, "%s/" JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX,
+ pelements[i], fname);
+ if (file_exists(buffer)) {
+ break;
+ }
+ }
+ // release the storage
+ for (int i = 0 ; i < n ; i++) {
+ if (pelements[i] != NULL) {
+ FREE_C_HEAP_ARRAY(char, pelements[i]);
+ }
+ }
+ if (pelements != NULL) {
+ FREE_C_HEAP_ARRAY(char*, pelements);
+ }
+ } else {
+ snprintf(buffer, buflen, "%s/" JNI_LIB_PREFIX "%s" JNI_LIB_SUFFIX, pname, fname);
+ }
+}
+
+const char* os::get_current_directory(char *buf, int buflen) {
+ return getcwd(buf, buflen);
+}
+
+// check if addr is inside libjvm[_g].so
+bool os::address_is_in_vm(address addr) {
+ static address libjvm_base_addr;
+ Dl_info dlinfo;
+
+ if (libjvm_base_addr == NULL) {
+ dladdr(CAST_FROM_FN_PTR(void *, os::address_is_in_vm), &dlinfo);
+ libjvm_base_addr = (address)dlinfo.dli_fbase;
+ assert(libjvm_base_addr !=NULL, "Cannot obtain base address for libjvm");
+ }
+
+ if (dladdr((void *)addr, &dlinfo)) {
+ if (libjvm_base_addr == (address)dlinfo.dli_fbase) return true;
+ }
+
+ return false;
+}
+
+bool os::dll_address_to_function_name(address addr, char *buf,
+ int buflen, int *offset) {
+ Dl_info dlinfo;
+
+ if (dladdr((void*)addr, &dlinfo) && dlinfo.dli_sname != NULL) {
+ if (buf != NULL) {
+ if(!Decoder::demangle(dlinfo.dli_sname, buf, buflen)) {
+ jio_snprintf(buf, buflen, "%s", dlinfo.dli_sname);
+ }
+ }
+ if (offset != NULL) *offset = addr - (address)dlinfo.dli_saddr;
+ return true;
+ } else if (dlinfo.dli_fname != NULL && dlinfo.dli_fbase != 0) {
+ if (Decoder::decode((address)(addr - (address)dlinfo.dli_fbase),
+ dlinfo.dli_fname, buf, buflen, offset) == Decoder::no_error) {
+ return true;
+ }
+ }
+
+ if (buf != NULL) buf[0] = '\0';
+ if (offset != NULL) *offset = -1;
+ return false;
+}
+
+#ifdef _ALLBSD_SOURCE
+// ported from solaris version
+bool os::dll_address_to_library_name(address addr, char* buf,
+ int buflen, int* offset) {
+ Dl_info dlinfo;
+
+ if (dladdr((void*)addr, &dlinfo)){
+ if (buf) jio_snprintf(buf, buflen, "%s", dlinfo.dli_fname);
+ if (offset) *offset = addr - (address)dlinfo.dli_fbase;
+ return true;
+ } else {
+ if (buf) buf[0] = '\0';
+ if (offset) *offset = -1;
+ return false;
+ }
+}
+#else
+struct _address_to_library_name {
+ address addr; // input : memory address
+ size_t buflen; // size of fname
+ char* fname; // output: library name
+ address base; // library base addr
+};
+
+static int address_to_library_name_callback(struct dl_phdr_info *info,
+ size_t size, void *data) {
+ int i;
+ bool found = false;
+ address libbase = NULL;
+ struct _address_to_library_name * d = (struct _address_to_library_name *)data;
+
+ // iterate through all loadable segments
+ for (i = 0; i < info->dlpi_phnum; i++) {
+ address segbase = (address)(info->dlpi_addr + info->dlpi_phdr[i].p_vaddr);
+ if (info->dlpi_phdr[i].p_type == PT_LOAD) {
+ // base address of a library is the lowest address of its loaded
+ // segments.
+ if (libbase == NULL || libbase > segbase) {
+ libbase = segbase;
+ }
+ // see if 'addr' is within current segment
+ if (segbase <= d->addr &&
+ d->addr < segbase + info->dlpi_phdr[i].p_memsz) {
+ found = true;
+ }
+ }
+ }
+
+ // dlpi_name is NULL or empty if the ELF file is executable, return 0
+ // so dll_address_to_library_name() can fall through to use dladdr() which
+ // can figure out executable name from argv[0].
+ if (found && info->dlpi_name && info->dlpi_name[0]) {
+ d->base = libbase;
+ if (d->fname) {
+ jio_snprintf(d->fname, d->buflen, "%s", info->dlpi_name);
+ }
+ return 1;
+ }
+ return 0;
+}
+
+bool os::dll_address_to_library_name(address addr, char* buf,
+ int buflen, int* offset) {
+ Dl_info dlinfo;
+ struct _address_to_library_name data;
+
+ // There is a bug in old glibc dladdr() implementation that it could resolve
+ // to wrong library name if the .so file has a base address != NULL. Here
+ // we iterate through the program headers of all loaded libraries to find
+ // out which library 'addr' really belongs to. This workaround can be
+ // removed once the minimum requirement for glibc is moved to 2.3.x.
+ data.addr = addr;
+ data.fname = buf;
+ data.buflen = buflen;
+ data.base = NULL;
+ int rslt = dl_iterate_phdr(address_to_library_name_callback, (void *)&data);
+
+ if (rslt) {
+ // buf already contains library name
+ if (offset) *offset = addr - data.base;
+ return true;
+ } else if (dladdr((void*)addr, &dlinfo)){
+ if (buf) jio_snprintf(buf, buflen, "%s", dlinfo.dli_fname);
+ if (offset) *offset = addr - (address)dlinfo.dli_fbase;
+ return true;
+ } else {
+ if (buf) buf[0] = '\0';
+ if (offset) *offset = -1;
+ return false;
+ }
+}
+#endif
+
+ // Loads .dll/.so and
+ // in case of error it checks if .dll/.so was built for the
+ // same architecture as Hotspot is running on
+
+#ifdef __APPLE__
+void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+ void * result= ::dlopen(filename, RTLD_LAZY);
+ if (result != NULL) {
+ // Successful loading
+ return result;
+ }
+
+ // Read system error message into ebuf
+ ::strncpy(ebuf, ::dlerror(), ebuflen-1);
+ ebuf[ebuflen-1]='\0';
+
+ return NULL;
+}
+#else
+void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
+{
+ void * result= ::dlopen(filename, RTLD_LAZY);
+ if (result != NULL) {
+ // Successful loading
+ return result;
+ }
+
+ Elf32_Ehdr elf_head;
+
+ // Read system error message into ebuf
+ // It may or may not be overwritten below
+ ::strncpy(ebuf, ::dlerror(), ebuflen-1);
+ ebuf[ebuflen-1]='\0';
+ int diag_msg_max_length=ebuflen-strlen(ebuf);
+ char* diag_msg_buf=ebuf+strlen(ebuf);
+
+ if (diag_msg_max_length==0) {
+ // No more space in ebuf for additional diagnostics message
+ return NULL;
+ }
+
+
+ int file_descriptor= ::open(filename, O_RDONLY | O_NONBLOCK);
+
+ if (file_descriptor < 0) {
+ // Can't open library, report dlerror() message
+ return NULL;
+ }
+
+ bool failed_to_read_elf_head=
+ (sizeof(elf_head)!=
+ (::read(file_descriptor, &elf_head,sizeof(elf_head)))) ;
+
+ ::close(file_descriptor);
+ if (failed_to_read_elf_head) {
+ // file i/o error - report dlerror() msg
+ return NULL;
+ }
+
+ typedef struct {
+ Elf32_Half code; // Actual value as defined in elf.h
+ Elf32_Half compat_class; // Compatibility of archs at VM's sense
+ char elf_class; // 32 or 64 bit
+ char endianess; // MSB or LSB
+ char* name; // String representation
+ } arch_t;
+
+ #ifndef EM_486
+ #define EM_486 6 /* Intel 80486 */
+ #endif
+
+ #ifndef EM_MIPS_RS3_LE
+ #define EM_MIPS_RS3_LE 10 /* MIPS */
+ #endif
+
+ #ifndef EM_PPC64
+ #define EM_PPC64 21 /* PowerPC64 */
+ #endif
+
+ #ifndef EM_S390
+ #define EM_S390 22 /* IBM System/390 */
+ #endif
+
+ #ifndef EM_IA_64
+ #define EM_IA_64 50 /* HP/Intel IA-64 */
+ #endif
+
+ #ifndef EM_X86_64
+ #define EM_X86_64 62 /* AMD x86-64 */
+ #endif
+
+ static const arch_t arch_array[]={
+ {EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
+ {EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
+ {EM_IA_64, EM_IA_64, ELFCLASS64, ELFDATA2LSB, (char*)"IA 64"},
+ {EM_X86_64, EM_X86_64, ELFCLASS64, ELFDATA2LSB, (char*)"AMD 64"},
+ {EM_SPARC, EM_SPARC, ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
+ {EM_SPARC32PLUS, EM_SPARC, ELFCLASS32, ELFDATA2MSB, (char*)"Sparc 32"},
+ {EM_SPARCV9, EM_SPARCV9, ELFCLASS64, ELFDATA2MSB, (char*)"Sparc v9 64"},
+ {EM_PPC, EM_PPC, ELFCLASS32, ELFDATA2MSB, (char*)"Power PC 32"},
+ {EM_PPC64, EM_PPC64, ELFCLASS64, ELFDATA2MSB, (char*)"Power PC 64"},
+ {EM_ARM, EM_ARM, ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
+ {EM_S390, EM_S390, ELFCLASSNONE, ELFDATA2MSB, (char*)"IBM System/390"},
+ {EM_ALPHA, EM_ALPHA, ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
+ {EM_MIPS_RS3_LE, EM_MIPS_RS3_LE, ELFCLASS32, ELFDATA2LSB, (char*)"MIPSel"},
+ {EM_MIPS, EM_MIPS, ELFCLASS32, ELFDATA2MSB, (char*)"MIPS"},
+ {EM_PARISC, EM_PARISC, ELFCLASS32, ELFDATA2MSB, (char*)"PARISC"},
+ {EM_68K, EM_68K, ELFCLASS32, ELFDATA2MSB, (char*)"M68k"}
+ };
+
+ #if (defined IA32)
+ static Elf32_Half running_arch_code=EM_386;
+ #elif (defined AMD64)
+ static Elf32_Half running_arch_code=EM_X86_64;
+ #elif (defined IA64)
+ static Elf32_Half running_arch_code=EM_IA_64;
+ #elif (defined __sparc) && (defined _LP64)
+ static Elf32_Half running_arch_code=EM_SPARCV9;
+ #elif (defined __sparc) && (!defined _LP64)
+ static Elf32_Half running_arch_code=EM_SPARC;
+ #elif (defined __powerpc64__)
+ static Elf32_Half running_arch_code=EM_PPC64;
+ #elif (defined __powerpc__)
+ static Elf32_Half running_arch_code=EM_PPC;
+ #elif (defined ARM)
+ static Elf32_Half running_arch_code=EM_ARM;
+ #elif (defined S390)
+ static Elf32_Half running_arch_code=EM_S390;
+ #elif (defined ALPHA)
+ static Elf32_Half running_arch_code=EM_ALPHA;
+ #elif (defined MIPSEL)
+ static Elf32_Half running_arch_code=EM_MIPS_RS3_LE;
+ #elif (defined PARISC)
+ static Elf32_Half running_arch_code=EM_PARISC;
+ #elif (defined MIPS)
+ static Elf32_Half running_arch_code=EM_MIPS;
+ #elif (defined M68K)
+ static Elf32_Half running_arch_code=EM_68K;
+ #else
+ #error Method os::dll_load requires that one of following is defined:\
+ IA32, AMD64, IA64, __sparc, __powerpc__, ARM, S390, ALPHA, MIPS, MIPSEL, PARISC, M68K
+ #endif
+
+ // Identify compatability class for VM's architecture and library's architecture
+ // Obtain string descriptions for architectures
+
+ arch_t lib_arch={elf_head.e_machine,0,elf_head.e_ident[EI_CLASS], elf_head.e_ident[EI_DATA], NULL};
+ int running_arch_index=-1;
+
+ for (unsigned int i=0 ; i < ARRAY_SIZE(arch_array) ; i++ ) {
+ if (running_arch_code == arch_array[i].code) {
+ running_arch_index = i;
+ }
+ if (lib_arch.code == arch_array[i].code) {
+ lib_arch.compat_class = arch_array[i].compat_class;
+ lib_arch.name = arch_array[i].name;
+ }
+ }
+
+ assert(running_arch_index != -1,
+ "Didn't find running architecture code (running_arch_code) in arch_array");
+ if (running_arch_index == -1) {
+ // Even though running architecture detection failed
+ // we may still continue with reporting dlerror() message
+ return NULL;
+ }
+
+ if (lib_arch.endianess != arch_array[running_arch_index].endianess) {
+ ::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: endianness mismatch)");
+ return NULL;
+ }
+
+#ifndef S390
+ if (lib_arch.elf_class != arch_array[running_arch_index].elf_class) {
+ ::snprintf(diag_msg_buf, diag_msg_max_length-1," (Possible cause: architecture word width mismatch)");
+ return NULL;
+ }
+#endif // !S390
+
+ if (lib_arch.compat_class != arch_array[running_arch_index].compat_class) {
+ if ( lib_arch.name!=NULL ) {
+ ::snprintf(diag_msg_buf, diag_msg_max_length-1,
+ " (Possible cause: can't load %s-bit .so on a %s-bit platform)",
+ lib_arch.name, arch_array[running_arch_index].name);
+ } else {
+ ::snprintf(diag_msg_buf, diag_msg_max_length-1,
+ " (Possible cause: can't load this .so (machine code=0x%x) on a %s-bit platform)",
+ lib_arch.code,
+ arch_array[running_arch_index].name);
+ }
+ }
+
+ return NULL;
+}
+#endif /* !__APPLE__ */
+
+// XXX: Do we need a lock around this as per Linux?
+void* os::dll_lookup(void* handle, const char* name) {
+ return dlsym(handle, name);
+}
+
+
+static bool _print_ascii_file(const char* filename, outputStream* st) {
+ int fd = ::open(filename, O_RDONLY);
+ if (fd == -1) {
+ return false;
+ }
+
+ char buf[32];
+ int bytes;
+ while ((bytes = ::read(fd, buf, sizeof(buf))) > 0) {
+ st->print_raw(buf, bytes);
+ }
+
+ ::close(fd);
+
+ return true;
+}
+
+void os::print_dll_info(outputStream *st) {
+ st->print_cr("Dynamic libraries:");
+#ifdef _ALLBSD_SOURCE
+#ifdef RTLD_DI_LINKMAP
+ Dl_info dli;
+ void *handle;
+ Link_map *map;
+ Link_map *p;
+
+ if (!dladdr(CAST_FROM_FN_PTR(void *, os::print_dll_info), &dli)) {
+ st->print_cr("Error: Cannot print dynamic libraries.");
+ return;
+ }
+ handle = dlopen(dli.dli_fname, RTLD_LAZY);
+ if (handle == NULL) {
+ st->print_cr("Error: Cannot print dynamic libraries.");
+ return;
+ }
+ dlinfo(handle, RTLD_DI_LINKMAP, &map);
+ if (map == NULL) {
+ st->print_cr("Error: Cannot print dynamic libraries.");
+ return;
+ }
+
+ while (map->l_prev != NULL)
+ map = map->l_prev;
+
+ while (map != NULL) {
+ st->print_cr(PTR_FORMAT " \t%s", map->l_addr, map->l_name);
+ map = map->l_next;
+ }
+
+ dlclose(handle);
+#elif defined(__APPLE__)
+ uint32_t count;
+ uint32_t i;
+
+ count = _dyld_image_count();
+ for (i = 1; i < count; i++) {
+ const char *name = _dyld_get_image_name(i);
+ intptr_t slide = _dyld_get_image_vmaddr_slide(i);
+ st->print_cr(PTR_FORMAT " \t%s", slide, name);
+ }
+#else
+ st->print_cr("Error: Cannot print dynamic libraries.");
+#endif
+#else
+ char fname[32];
+ pid_t pid = os::Bsd::gettid();
+
+ jio_snprintf(fname, sizeof(fname), "/proc/%d/maps", pid);
+
+ if (!_print_ascii_file(fname, st)) {
+ st->print("Can not get library information for pid = %d\n", pid);
+ }
+#endif
+}
+
+
+void os::print_os_info(outputStream* st) {
+ st->print("OS:");
+
+ // Try to identify popular distros.
+ // Most Bsd distributions have /etc/XXX-release file, which contains
+ // the OS version string. Some have more than one /etc/XXX-release file
+ // (e.g. Mandrake has both /etc/mandrake-release and /etc/redhat-release.),
+ // so the order is important.
+ if (!_print_ascii_file("/etc/mandrake-release", st) &&
+ !_print_ascii_file("/etc/sun-release", st) &&
+ !_print_ascii_file("/etc/redhat-release", st) &&
+ !_print_ascii_file("/etc/SuSE-release", st) &&
+ !_print_ascii_file("/etc/turbobsd-release", st) &&
+ !_print_ascii_file("/etc/gentoo-release", st) &&
+ !_print_ascii_file("/etc/debian_version", st) &&
+ !_print_ascii_file("/etc/ltib-release", st) &&
+ !_print_ascii_file("/etc/angstrom-version", st)) {
+ st->print("Bsd");
+ }
+ st->cr();
+
+ // kernel
+ st->print("uname:");
+ struct utsname name;
+ uname(&name);
+ st->print(name.sysname); st->print(" ");
+ st->print(name.release); st->print(" ");
+ st->print(name.version); st->print(" ");
+ st->print(name.machine);
+ st->cr();
+
+#ifndef _ALLBSD_SOURCE
+ // Print warning if unsafe chroot environment detected
+ if (unsafe_chroot_detected) {
+ st->print("WARNING!! ");
+ st->print_cr(unstable_chroot_error);
+ }
+
+ // libc, pthread
+ st->print("libc:");
+ st->print(os::Bsd::glibc_version()); st->print(" ");
+ st->print(os::Bsd::libpthread_version()); st->print(" ");
+ if (os::Bsd::is_BsdThreads()) {
+ st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
+ }
+ st->cr();
+#endif
+
+ // rlimit
+ st->print("rlimit:");
+ struct rlimit rlim;
+
+ st->print(" STACK ");
+ getrlimit(RLIMIT_STACK, &rlim);
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%uk", rlim.rlim_cur >> 10);
+
+ st->print(", CORE ");
+ getrlimit(RLIMIT_CORE, &rlim);
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%uk", rlim.rlim_cur >> 10);
+
+ st->print(", NPROC ");
+ getrlimit(RLIMIT_NPROC, &rlim);
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%d", rlim.rlim_cur);
+
+ st->print(", NOFILE ");
+ getrlimit(RLIMIT_NOFILE, &rlim);
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%d", rlim.rlim_cur);
+
+#ifndef _ALLBSD_SOURCE
+ st->print(", AS ");
+ getrlimit(RLIMIT_AS, &rlim);
+ if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
+ else st->print("%uk", rlim.rlim_cur >> 10);
+ st->cr();
+
+ // load average
+ st->print("load average:");
+ double loadavg[3];
+ os::loadavg(loadavg, 3);
+ st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
+ st->cr();
+#endif
+}
+
+void os::pd_print_cpu_info(outputStream* st) {
+ // Nothing to do for now.
+}
+
+void os::print_memory_info(outputStream* st) {
+
+ st->print("Memory:");
+ st->print(" %dk page", os::vm_page_size()>>10);
+
+#ifndef _ALLBSD_SOURCE
+ // values in struct sysinfo are "unsigned long"
+ struct sysinfo si;
+ sysinfo(&si);
+#endif
+
+ st->print(", physical " UINT64_FORMAT "k",
+ os::physical_memory() >> 10);
+ st->print("(" UINT64_FORMAT "k free)",
+ os::available_memory() >> 10);
+#ifndef _ALLBSD_SOURCE
+ st->print(", swap " UINT64_FORMAT "k",
+ ((jlong)si.totalswap * si.mem_unit) >> 10);
+ st->print("(" UINT64_FORMAT "k free)",
+ ((jlong)si.freeswap * si.mem_unit) >> 10);
+#endif
+ st->cr();
+
+ // meminfo
+ st->print("\n/proc/meminfo:\n");
+ _print_ascii_file("/proc/meminfo", st);
+ st->cr();
+}
+
+// Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific
+// but they're the same for all the bsd arch that we support
+// and they're the same for solaris but there's no common place to put this.
+const char *ill_names[] = { "ILL0", "ILL_ILLOPC", "ILL_ILLOPN", "ILL_ILLADR",
+ "ILL_ILLTRP", "ILL_PRVOPC", "ILL_PRVREG",
+ "ILL_COPROC", "ILL_BADSTK" };
+
+const char *fpe_names[] = { "FPE0", "FPE_INTDIV", "FPE_INTOVF", "FPE_FLTDIV",
+ "FPE_FLTOVF", "FPE_FLTUND", "FPE_FLTRES",
+ "FPE_FLTINV", "FPE_FLTSUB", "FPE_FLTDEN" };
+
+const char *segv_names[] = { "SEGV0", "SEGV_MAPERR", "SEGV_ACCERR" };
+
+const char *bus_names[] = { "BUS0", "BUS_ADRALN", "BUS_ADRERR", "BUS_OBJERR" };
+
+void os::print_siginfo(outputStream* st, void* siginfo) {
+ st->print("siginfo:");
+
+ const int buflen = 100;
+ char buf[buflen];
+ siginfo_t *si = (siginfo_t*)siginfo;
+ st->print("si_signo=%s: ", os::exception_name(si->si_signo, buf, buflen));
+ if (si->si_errno != 0 && strerror_r(si->si_errno, buf, buflen) == 0) {
+ st->print("si_errno=%s", buf);
+ } else {
+ st->print("si_errno=%d", si->si_errno);
+ }
+ const int c = si->si_code;
+ assert(c > 0, "unexpected si_code");
+ switch (si->si_signo) {
+ case SIGILL:
+ st->print(", si_code=%d (%s)", c, c > 8 ? "" : ill_names[c]);
+ st->print(", si_addr=" PTR_FORMAT, si->si_addr);
+ break;
+ case SIGFPE:
+ st->print(", si_code=%d (%s)", c, c > 9 ? "" : fpe_names[c]);
+ st->print(", si_addr=" PTR_FORMAT, si->si_addr);
+ break;
+ case SIGSEGV:
+ st->print(", si_code=%d (%s)", c, c > 2 ? "" : segv_names[c]);
+ st->print(", si_addr=" PTR_FORMAT, si->si_addr);
+ break;
+ case SIGBUS:
+ st->print(", si_code=%d (%s)", c, c > 3 ? "" : bus_names[c]);
+ st->print(", si_addr=" PTR_FORMAT, si->si_addr);
+ break;
+ default:
+ st->print(", si_code=%d", si->si_code);
+ // no si_addr
+ }
+
+ if ((si->si_signo == SIGBUS || si->si_signo == SIGSEGV) &&
+ UseSharedSpaces) {
+ FileMapInfo* mapinfo = FileMapInfo::current_info();
+ if (mapinfo->is_in_shared_space(si->si_addr)) {
+ st->print("\n\nError accessing class data sharing archive." \
+ " Mapped file inaccessible during execution, " \
+ " possible disk/network problem.");
+ }
+ }
+ st->cr();
+}
+
+
+static void print_signal_handler(outputStream* st, int sig,
+ char* buf, size_t buflen);
+
+void os::print_signal_handlers(outputStream* st, char* buf, size_t buflen) {
+ st->print_cr("Signal Handlers:");
+ print_signal_handler(st, SIGSEGV, buf, buflen);
+ print_signal_handler(st, SIGBUS , buf, buflen);
+ print_signal_handler(st, SIGFPE , buf, buflen);
+ print_signal_handler(st, SIGPIPE, buf, buflen);
+ print_signal_handler(st, SIGXFSZ, buf, buflen);
+ print_signal_handler(st, SIGILL , buf, buflen);
+ print_signal_handler(st, INTERRUPT_SIGNAL, buf, buflen);
+ print_signal_handler(st, SR_signum, buf, buflen);
+ print_signal_handler(st, SHUTDOWN1_SIGNAL, buf, buflen);
+ print_signal_handler(st, SHUTDOWN2_SIGNAL , buf, buflen);
+ print_signal_handler(st, SHUTDOWN3_SIGNAL , buf, buflen);
+ print_signal_handler(st, BREAK_SIGNAL, buf, buflen);
+}
+
+static char saved_jvm_path[MAXPATHLEN] = {0};
+
+// Find the full path to the current module, libjvm.so or libjvm_g.so
+void os::jvm_path(char *buf, jint buflen) {
+ // Error checking.
+ if (buflen < MAXPATHLEN) {
+ assert(false, "must use a large-enough buffer");
+ buf[0] = '\0';
+ return;
+ }
+ // Lazy resolve the path to current module.
+ if (saved_jvm_path[0] != 0) {
+ strcpy(buf, saved_jvm_path);
+ return;
+ }
+
+ char dli_fname[MAXPATHLEN];
+ bool ret = dll_address_to_library_name(
+ CAST_FROM_FN_PTR(address, os::jvm_path),
+ dli_fname, sizeof(dli_fname), NULL);
+ assert(ret != 0, "cannot locate libjvm");
+ char *rp = realpath(dli_fname, buf);
+ if (rp == NULL)
+ return;
+
+ if (Arguments::created_by_gamma_launcher()) {
+ // Support for the gamma launcher. Typical value for buf is
+ // "<JAVA_HOME>/jre/lib/<arch>/<vmtype>/libjvm.so". If "/jre/lib/" appears at
+ // the right place in the string, then assume we are installed in a JDK and
+ // we're done. Otherwise, check for a JAVA_HOME environment variable and fix
+ // up the path so it looks like libjvm.so is installed there (append a
+ // fake suffix hotspot/libjvm.so).
+ const char *p = buf + strlen(buf) - 1;
+ for (int count = 0; p > buf && count < 5; ++count) {
+ for (--p; p > buf && *p != '/'; --p)
+ /* empty */ ;
+ }
+
+ if (strncmp(p, "/jre/lib/", 9) != 0) {
+ // Look for JAVA_HOME in the environment.
+ char* java_home_var = ::getenv("JAVA_HOME");
+ if (java_home_var != NULL && java_home_var[0] != 0) {
+ char* jrelib_p;
+ int len;
+
+ // Check the current module name "libjvm.so" or "libjvm_g.so".
+ p = strrchr(buf, '/');
+ assert(strstr(p, "/libjvm") == p, "invalid library name");
+ p = strstr(p, "_g") ? "_g" : "";
+
+ rp = realpath(java_home_var, buf);
+ if (rp == NULL)
+ return;
+
+ // determine if this is a legacy image or modules image
+ // modules image doesn't have "jre" subdirectory
+ len = strlen(buf);
+ jrelib_p = buf + len;
+ snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
+ if (0 != access(buf, F_OK)) {
+ snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
+ }
+
+ if (0 == access(buf, F_OK)) {
+ // Use current module name "libjvm[_g].so" instead of
+ // "libjvm"debug_only("_g")".so" since for fastdebug version
+ // we should have "libjvm.so" but debug_only("_g") adds "_g"!
+ len = strlen(buf);
+ snprintf(buf + len, buflen-len, "/hotspot/libjvm%s.so", p);
+ } else {
+ // Go back to path of .so
+ rp = realpath(dli_fname, buf);
+ if (rp == NULL)
+ return;
+ }
+ }
+ }
+ }
+
+ strcpy(saved_jvm_path, buf);
+}
+
+void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
+ // no prefix required, not even "_"
+}
+
+void os::print_jni_name_suffix_on(outputStream* st, int args_size) {
+ // no suffix required
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// sun.misc.Signal support
+
+static volatile jint sigint_count = 0;
+
+static void
+UserHandler(int sig, void *siginfo, void *context) {
+ // 4511530 - sem_post is serialized and handled by the manager thread. When
+ // the program is interrupted by Ctrl-C, SIGINT is sent to every thread. We
+ // don't want to flood the manager thread with sem_post requests.
+ if (sig == SIGINT && Atomic::add(1, &sigint_count) > 1)
+ return;
+
+ // Ctrl-C is pressed during error reporting, likely because the error
+ // handler fails to abort. Let VM die immediately.
+ if (sig == SIGINT && is_error_reported()) {
+ os::die();
+ }
+
+ os::signal_notify(sig);
+}
+
+void* os::user_handler() {
+ return CAST_FROM_FN_PTR(void*, UserHandler);
+}
+
+extern "C" {
+ typedef void (*sa_handler_t)(int);
+ typedef void (*sa_sigaction_t)(int, siginfo_t *, void *);
+}
+
+void* os::signal(int signal_number, void* handler) {
+ struct sigaction sigAct, oldSigAct;
+
+ sigfillset(&(sigAct.sa_mask));
+ sigAct.sa_flags = SA_RESTART|SA_SIGINFO;
+ sigAct.sa_handler = CAST_TO_FN_PTR(sa_handler_t, handler);
+
+ if (sigaction(signal_number, &sigAct, &oldSigAct)) {
+ // -1 means registration failed
+ return (void *)-1;
+ }
+
+ return CAST_FROM_FN_PTR(void*, oldSigAct.sa_handler);
+}
+
+void os::signal_raise(int signal_number) {
+ ::raise(signal_number);
+}
+
+/*
+ * The following code is moved from os.cpp for making this
+ * code platform specific, which it is by its very nature.
+ */
+
+// Will be modified when max signal is changed to be dynamic
+int os::sigexitnum_pd() {
+ return NSIG;
+}
+
+// a counter for each possible signal value
+static volatile jint pending_signals[NSIG+1] = { 0 };
+
+// Bsd(POSIX) specific hand shaking semaphore.
+#ifdef __APPLE__
+static semaphore_t sig_sem;
+#define SEM_INIT(sem, value) semaphore_create(mach_task_self(), &sem, SYNC_POLICY_FIFO, value)
+#define SEM_WAIT(sem) semaphore_wait(sem);
+#define SEM_POST(sem) semaphore_signal(sem);
+#else
+static sem_t sig_sem;
+#define SEM_INIT(sem, value) sem_init(&sem, 0, value)
+#define SEM_WAIT(sem) sem_wait(&sem);
+#define SEM_POST(sem) sem_post(&sem);
+#endif
+
+void os::signal_init_pd() {
+ // Initialize signal structures
+ ::memset((void*)pending_signals, 0, sizeof(pending_signals));
+
+ // Initialize signal semaphore
+ ::SEM_INIT(sig_sem, 0);
+}
+
+void os::signal_notify(int sig) {
+ Atomic::inc(&pending_signals[sig]);
+ ::SEM_POST(sig_sem);
+}
+
+static int check_pending_signals(bool wait) {
+ Atomic::store(0, &sigint_count);
+ for (;;) {
+ for (int i = 0; i < NSIG + 1; i++) {
+ jint n = pending_signals[i];
+ if (n > 0 && n == Atomic::cmpxchg(n - 1, &pending_signals[i], n)) {
+ return i;
+ }
+ }
+ if (!wait) {
+ return -1;
+ }
+ JavaThread *thread = JavaThread::current();
+ ThreadBlockInVM tbivm(thread);
+
+ bool threadIsSuspended;
+ do {
+ thread->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
+ ::SEM_WAIT(sig_sem);
+
+ // were we externally suspended while we were waiting?
+ threadIsSuspended = thread->handle_special_suspend_equivalent_condition();
+ if (threadIsSuspended) {
+ //
+ // The semaphore has been incremented, but while we were waiting
+ // another thread suspended us. We don't want to continue running
+ // while suspended because that would surprise the thread that
+ // suspended us.
+ //
+ ::SEM_POST(sig_sem);
+
+ thread->java_suspend_self();
+ }
+ } while (threadIsSuspended);
+ }
+}
+
+int os::signal_lookup() {
+ return check_pending_signals(false);
+}
+
+int os::signal_wait() {
+ return check_pending_signals(true);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Virtual Memory
+
+int os::vm_page_size() {
+ // Seems redundant as all get out
+ assert(os::Bsd::page_size() != -1, "must call os::init");
+ return os::Bsd::page_size();
+}
+
+// Solaris allocates memory by pages.
+int os::vm_allocation_granularity() {
+ assert(os::Bsd::page_size() != -1, "must call os::init");
+ return os::Bsd::page_size();
+}
+
+// Rationale behind this function:
+// current (Mon Apr 25 20:12:18 MSD 2005) oprofile drops samples without executable
+// mapping for address (see lookup_dcookie() in the kernel module), thus we cannot get
+// samples for JITted code. Here we create private executable mapping over the code cache
+// and then we can use standard (well, almost, as mapping can change) way to provide
+// info for the reporting script by storing timestamp and location of symbol
+void bsd_wrap_code(char* base, size_t size) {
+ static volatile jint cnt = 0;
+
+ if (!UseOprofile) {
+ return;
+ }
+
+ char buf[PATH_MAX + 1];
+ int num = Atomic::add(1, &cnt);
+
+ snprintf(buf, PATH_MAX + 1, "%s/hs-vm-%d-%d",
+ os::get_temp_directory(), os::current_process_id(), num);
+ unlink(buf);
+
+ int fd = ::open(buf, O_CREAT | O_RDWR, S_IRWXU);
+
+ if (fd != -1) {
+ off_t rv = ::lseek(fd, size-2, SEEK_SET);
+ if (rv != (off_t)-1) {
+ if (::write(fd, "", 1) == 1) {
+ mmap(base, size,
+ PROT_READ|PROT_WRITE|PROT_EXEC,
+ MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE, fd, 0);
+ }
+ }
+ ::close(fd);
+ unlink(buf);
+ }
+}
+
+// NOTE: Bsd kernel does not really reserve the pages for us.
+// All it does is to check if there are enough free pages
+// left at the time of mmap(). This could be a potential
+// problem.
+bool os::commit_memory(char* addr, size_t size, bool exec) {
+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+#ifdef __OpenBSD__
+ // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
+ return ::mprotect(addr, size, prot) == 0;
+#else
+ uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
+ return res != (uintptr_t) MAP_FAILED;
+#endif
+}
+
+#ifndef _ALLBSD_SOURCE
+// Define MAP_HUGETLB here so we can build HotSpot on old systems.
+#ifndef MAP_HUGETLB
+#define MAP_HUGETLB 0x40000
+#endif
+
+// Define MADV_HUGEPAGE here so we can build HotSpot on old systems.
+#ifndef MADV_HUGEPAGE
+#define MADV_HUGEPAGE 14
+#endif
+#endif
+
+bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
+ bool exec) {
+#ifndef _ALLBSD_SOURCE
+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+ uintptr_t res =
+ (uintptr_t) ::mmap(addr, size, prot,
+ MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB,
+ -1, 0);
+ return res != (uintptr_t) MAP_FAILED;
+ }
+#endif
+
+ return commit_memory(addr, size, exec);
+}
+
+void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
+#ifndef _ALLBSD_SOURCE
+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not
+ // be supported or the memory may already be backed by huge pages.
+ ::madvise(addr, bytes, MADV_HUGEPAGE);
+ }
+#endif
+}
+
+void os::free_memory(char *addr, size_t bytes) {
+ ::madvise(addr, bytes, MADV_DONTNEED);
+}
+
+void os::numa_make_global(char *addr, size_t bytes) {
+}
+
+void os::numa_make_local(char *addr, size_t bytes, int lgrp_hint) {
+}
+
+bool os::numa_topology_changed() { return false; }
+
+size_t os::numa_get_groups_num() {
+ return 1;
+}
+
+int os::numa_get_group_id() {
+ return 0;
+}
+
+size_t os::numa_get_leaf_groups(int *ids, size_t size) {
+ if (size > 0) {
+ ids[0] = 0;
+ return 1;
+ }
+ return 0;
+}
+
+bool os::get_page_info(char *start, page_info* info) {
+ return false;
+}
+
+char *os::scan_pages(char *start, char* end, page_info* page_expected, page_info* page_found) {
+ return end;
+}
+
+#ifndef _ALLBSD_SOURCE
+// Something to do with the numa-aware allocator needs these symbols
+extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
+extern "C" JNIEXPORT void numa_error(char *where) { }
+extern "C" JNIEXPORT int fork1() { return fork(); }
+
+
+// If we are running with libnuma version > 2, then we should
+// be trying to use symbols with versions 1.1
+// If we are running with earlier version, which did not have symbol versions,
+// we should use the base version.
+void* os::Bsd::libnuma_dlsym(void* handle, const char *name) {
+ void *f = dlvsym(handle, name, "libnuma_1.1");
+ if (f == NULL) {
+ f = dlsym(handle, name);
+ }
+ return f;
+}
+
+bool os::Bsd::libnuma_init() {
+ // sched_getcpu() should be in libc.
+ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t,
+ dlsym(RTLD_DEFAULT, "sched_getcpu")));
+
+ if (sched_getcpu() != -1) { // Does it work?
+ void *handle = dlopen("libnuma.so.1", RTLD_LAZY);
+ if (handle != NULL) {
+ set_numa_node_to_cpus(CAST_TO_FN_PTR(numa_node_to_cpus_func_t,
+ libnuma_dlsym(handle, "numa_node_to_cpus")));
+ set_numa_max_node(CAST_TO_FN_PTR(numa_max_node_func_t,
+ libnuma_dlsym(handle, "numa_max_node")));
+ set_numa_available(CAST_TO_FN_PTR(numa_available_func_t,
+ libnuma_dlsym(handle, "numa_available")));
+ set_numa_tonode_memory(CAST_TO_FN_PTR(numa_tonode_memory_func_t,
+ libnuma_dlsym(handle, "numa_tonode_memory")));
+ set_numa_interleave_memory(CAST_TO_FN_PTR(numa_interleave_memory_func_t,
+ libnuma_dlsym(handle, "numa_interleave_memory")));
+
+
+ if (numa_available() != -1) {
+ set_numa_all_nodes((unsigned long*)libnuma_dlsym(handle, "numa_all_nodes"));
+ // Create a cpu -> node mapping
+ _cpu_to_node = new (ResourceObj::C_HEAP) GrowableArray<int>(0, true);
+ rebuild_cpu_to_node_map();
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+// rebuild_cpu_to_node_map() constructs a table mapping cpud id to node id.
+// The table is later used in get_node_by_cpu().
+void os::Bsd::rebuild_cpu_to_node_map() {
+ const size_t NCPUS = 32768; // Since the buffer size computation is very obscure
+ // in libnuma (possible values are starting from 16,
+ // and continuing up with every other power of 2, but less
+ // than the maximum number of CPUs supported by kernel), and
+ // is a subject to change (in libnuma version 2 the requirements
+ // are more reasonable) we'll just hardcode the number they use
+ // in the library.
+ const size_t BitsPerCLong = sizeof(long) * CHAR_BIT;
+
+ size_t cpu_num = os::active_processor_count();
+ size_t cpu_map_size = NCPUS / BitsPerCLong;
+ size_t cpu_map_valid_size =
+ MIN2((cpu_num + BitsPerCLong - 1) / BitsPerCLong, cpu_map_size);
+
+ cpu_to_node()->clear();
+ cpu_to_node()->at_grow(cpu_num - 1);
+ size_t node_num = numa_get_groups_num();
+
+ unsigned long *cpu_map = NEW_C_HEAP_ARRAY(unsigned long, cpu_map_size);
+ for (size_t i = 0; i < node_num; i++) {
+ if (numa_node_to_cpus(i, cpu_map, cpu_map_size * sizeof(unsigned long)) != -1) {
+ for (size_t j = 0; j < cpu_map_valid_size; j++) {
+ if (cpu_map[j] != 0) {
+ for (size_t k = 0; k < BitsPerCLong; k++) {
+ if (cpu_map[j] & (1UL << k)) {
+ cpu_to_node()->at_put(j * BitsPerCLong + k, i);
+ }
+ }
+ }
+ }
+ }
+ }
+ FREE_C_HEAP_ARRAY(unsigned long, cpu_map);
+}
+
+int os::Bsd::get_node_by_cpu(int cpu_id) {
+ if (cpu_to_node() != NULL && cpu_id >= 0 && cpu_id < cpu_to_node()->length()) {
+ return cpu_to_node()->at(cpu_id);
+ }
+ return -1;
+}
+
+GrowableArray<int>* os::Bsd::_cpu_to_node;
+os::Bsd::sched_getcpu_func_t os::Bsd::_sched_getcpu;
+os::Bsd::numa_node_to_cpus_func_t os::Bsd::_numa_node_to_cpus;
+os::Bsd::numa_max_node_func_t os::Bsd::_numa_max_node;
+os::Bsd::numa_available_func_t os::Bsd::_numa_available;
+os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory;
+os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory;
+unsigned long* os::Bsd::_numa_all_nodes;
+#endif
+
+bool os::uncommit_memory(char* addr, size_t size) {
+#ifdef __OpenBSD__
+ // XXX: Work-around mmap/MAP_FIXED bug temporarily on OpenBSD
+ return ::mprotect(addr, size, PROT_NONE) == 0;
+#else
+ uintptr_t res = (uintptr_t) ::mmap(addr, size, PROT_NONE,
+ MAP_PRIVATE|MAP_FIXED|MAP_NORESERVE|MAP_ANONYMOUS, -1, 0);
+ return res != (uintptr_t) MAP_FAILED;
+#endif
+}
+
+bool os::create_stack_guard_pages(char* addr, size_t size) {
+ return os::commit_memory(addr, size);
+}
+
+// If this is a growable mapping, remove the guard pages entirely by
+// munmap()ping them. If not, just call uncommit_memory().
+bool os::remove_stack_guard_pages(char* addr, size_t size) {
+ return os::uncommit_memory(addr, size);
+}
+
+static address _highest_vm_reserved_address = NULL;
+
+// If 'fixed' is true, anon_mmap() will attempt to reserve anonymous memory
+// at 'requested_addr'. If there are existing memory mappings at the same
+// location, however, they will be overwritten. If 'fixed' is false,
+// 'requested_addr' is only treated as a hint, the return value may or
+// may not start from the requested address. Unlike Bsd mmap(), this
+// function returns NULL to indicate failure.
+static char* anon_mmap(char* requested_addr, size_t bytes, bool fixed) {
+ char * addr;
+ int flags;
+
+ flags = MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS;
+ if (fixed) {
+ assert((uintptr_t)requested_addr % os::Bsd::page_size() == 0, "unaligned address");
+ flags |= MAP_FIXED;
+ }
+
+ // Map uncommitted pages PROT_READ and PROT_WRITE, change access
+ // to PROT_EXEC if executable when we commit the page.
+ addr = (char*)::mmap(requested_addr, bytes, PROT_READ|PROT_WRITE,
+ flags, -1, 0);
+
+ if (addr != MAP_FAILED) {
+ // anon_mmap() should only get called during VM initialization,
+ // don't need lock (actually we can skip locking even it can be called
+ // from multiple threads, because _highest_vm_reserved_address is just a
+ // hint about the upper limit of non-stack memory regions.)
+ if ((address)addr + bytes > _highest_vm_reserved_address) {
+ _highest_vm_reserved_address = (address)addr + bytes;
+ }
+ }
+
+ return addr == MAP_FAILED ? NULL : addr;
+}
+
+// Don't update _highest_vm_reserved_address, because there might be memory
+// regions above addr + size. If so, releasing a memory region only creates
+// a hole in the address space, it doesn't help prevent heap-stack collision.
+//
+static int anon_munmap(char * addr, size_t size) {
+ return ::munmap(addr, size) == 0;
+}
+
+char* os::reserve_memory(size_t bytes, char* requested_addr,
+ size_t alignment_hint) {
+ return anon_mmap(requested_addr, bytes, (requested_addr != NULL));
+}
+
+bool os::release_memory(char* addr, size_t size) {
+ return anon_munmap(addr, size);
+}
+
+static address highest_vm_reserved_address() {
+ return _highest_vm_reserved_address;
+}
+
+static bool bsd_mprotect(char* addr, size_t size, int prot) {
+ // Bsd wants the mprotect address argument to be page aligned.
+ char* bottom = (char*)align_size_down((intptr_t)addr, os::Bsd::page_size());
+
+ // According to SUSv3, mprotect() should only be used with mappings
+ // established by mmap(), and mmap() always maps whole pages. Unaligned
+ // 'addr' likely indicates problem in the VM (e.g. trying to change
+ // protection of malloc'ed or statically allocated memory). Check the
+ // caller if you hit this assert.
+ assert(addr == bottom, "sanity check");
+
+ size = align_size_up(pointer_delta(addr, bottom, 1) + size, os::Bsd::page_size());
+ return ::mprotect(bottom, size, prot) == 0;
+}
+
+// Set protections specified
+bool os::protect_memory(char* addr, size_t bytes, ProtType prot,
+ bool is_committed) {
+ unsigned int p = 0;
+ switch (prot) {
+ case MEM_PROT_NONE: p = PROT_NONE; break;
+ case MEM_PROT_READ: p = PROT_READ; break;
+ case MEM_PROT_RW: p = PROT_READ|PROT_WRITE; break;
+ case MEM_PROT_RWX: p = PROT_READ|PROT_WRITE|PROT_EXEC; break;
+ default:
+ ShouldNotReachHere();
+ }
+ // is_committed is unused.
+ return bsd_mprotect(addr, bytes, p);
+}
+
+bool os::guard_memory(char* addr, size_t size) {
+ return bsd_mprotect(addr, size, PROT_NONE);
+}
+
+bool os::unguard_memory(char* addr, size_t size) {
+ return bsd_mprotect(addr, size, PROT_READ|PROT_WRITE);
+}
+
+bool os::Bsd::hugetlbfs_sanity_check(bool warn, size_t page_size) {
+ bool result = false;
+#ifndef _ALLBSD_SOURCE
+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
+ -1, 0);
+
+ if (p != (void *) -1) {
+ // We don't know if this really is a huge page or not.
+ FILE *fp = fopen("/proc/self/maps", "r");
+ if (fp) {
+ while (!feof(fp)) {
+ char chars[257];
+ long x = 0;
+ if (fgets(chars, sizeof(chars), fp)) {
+ if (sscanf(chars, "%lx-%*x", &x) == 1
+ && x == (long)p) {
+ if (strstr (chars, "hugepage")) {
+ result = true;
+ break;
+ }
+ }
+ }
+ }
+ fclose(fp);
+ }
+ munmap (p, page_size);
+ if (result)
+ return true;
+ }
+
+ if (warn) {
+ warning("HugeTLBFS is not supported by the operating system.");
+ }
+#endif
+
+ return result;
+}
+
+/*
+* Set the coredump_filter bits to include largepages in core dump (bit 6)
+*
+* From the coredump_filter documentation:
+*
+* - (bit 0) anonymous private memory
+* - (bit 1) anonymous shared memory
+* - (bit 2) file-backed private memory
+* - (bit 3) file-backed shared memory
+* - (bit 4) ELF header pages in file-backed private memory areas (it is
+* effective only if the bit 2 is cleared)
+* - (bit 5) hugetlb private memory
+* - (bit 6) hugetlb shared memory
+*/
+static void set_coredump_filter(void) {
+ FILE *f;
+ long cdm;
+
+ if ((f = fopen("/proc/self/coredump_filter", "r+")) == NULL) {
+ return;
+ }
+
+ if (fscanf(f, "%lx", &cdm) != 1) {
+ fclose(f);
+ return;
+ }
+
+ rewind(f);
+
+ if ((cdm & LARGEPAGES_BIT) == 0) {
+ cdm |= LARGEPAGES_BIT;
+ fprintf(f, "%#lx", cdm);
+ }
+
+ fclose(f);
+}
+
+// Large page support
+
+static size_t _large_page_size = 0;
+
+void os::large_page_init() {
+#ifndef _ALLBSD_SOURCE
+ if (!UseLargePages) {
+ UseHugeTLBFS = false;
+ UseSHM = false;
+ return;
+ }
+
+ if (FLAG_IS_DEFAULT(UseHugeTLBFS) && FLAG_IS_DEFAULT(UseSHM)) {
+ // If UseLargePages is specified on the command line try both methods,
+ // if it's default, then try only HugeTLBFS.
+ if (FLAG_IS_DEFAULT(UseLargePages)) {
+ UseHugeTLBFS = true;
+ } else {
+ UseHugeTLBFS = UseSHM = true;
+ }
+ }
+
+ if (LargePageSizeInBytes) {
+ _large_page_size = LargePageSizeInBytes;
+ } else {
+ // large_page_size on Bsd is used to round up heap size. x86 uses either
+ // 2M or 4M page, depending on whether PAE (Physical Address Extensions)
+ // mode is enabled. AMD64/EM64T uses 2M page in 64bit mode. IA64 can use
+ // page as large as 256M.
+ //
+ // Here we try to figure out page size by parsing /proc/meminfo and looking
+ // for a line with the following format:
+ // Hugepagesize: 2048 kB
+ //
+ // If we can't determine the value (e.g. /proc is not mounted, or the text
+ // format has been changed), we'll use the largest page size supported by
+ // the processor.
+
+#ifndef ZERO
+ _large_page_size = IA32_ONLY(4 * M) AMD64_ONLY(2 * M) IA64_ONLY(256 * M) SPARC_ONLY(4 * M)
+ ARM_ONLY(2 * M) PPC_ONLY(4 * M);
+#endif // ZERO
+
+ FILE *fp = fopen("/proc/meminfo", "r");
+ if (fp) {
+ while (!feof(fp)) {
+ int x = 0;
+ char buf[16];
+ if (fscanf(fp, "Hugepagesize: %d", &x) == 1) {
+ if (x && fgets(buf, sizeof(buf), fp) && strcmp(buf, " kB\n") == 0) {
+ _large_page_size = x * K;
+ break;
+ }
+ } else {
+ // skip to next line
+ for (;;) {
+ int ch = fgetc(fp);
+ if (ch == EOF || ch == (int)'\n') break;
+ }
+ }
+ }
+ fclose(fp);
+ }
+ }
+
+ // print a warning if any large page related flag is specified on command line
+ bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS);
+
+ const size_t default_page_size = (size_t)Bsd::page_size();
+ if (_large_page_size > default_page_size) {
+ _page_sizes[0] = _large_page_size;
+ _page_sizes[1] = default_page_size;
+ _page_sizes[2] = 0;
+ }
+ UseHugeTLBFS = UseHugeTLBFS &&
+ Bsd::hugetlbfs_sanity_check(warn_on_failure, _large_page_size);
+
+ if (UseHugeTLBFS)
+ UseSHM = false;
+
+ UseLargePages = UseHugeTLBFS || UseSHM;
+
+ set_coredump_filter();
+#endif
+}
+
+#ifndef _ALLBSD_SOURCE
+#ifndef SHM_HUGETLB
+#define SHM_HUGETLB 04000
+#endif
+#endif
+
+char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
+ // "exec" is passed in but not used. Creating the shared image for
+ // the code cache doesn't have an SHM_X executable permission to check.
+ assert(UseLargePages && UseSHM, "only for SHM large pages");
+
+ key_t key = IPC_PRIVATE;
+ char *addr;
+
+ bool warn_on_failure = UseLargePages &&
+ (!FLAG_IS_DEFAULT(UseLargePages) ||
+ !FLAG_IS_DEFAULT(LargePageSizeInBytes)
+ );
+ char msg[128];
+
+ // Create a large shared memory region to attach to based on size.
+ // Currently, size is the total size of the heap
+#ifndef _ALLBSD_SOURCE
+ int shmid = shmget(key, bytes, SHM_HUGETLB|IPC_CREAT|SHM_R|SHM_W);
+#else
+ int shmid = shmget(key, bytes, IPC_CREAT|SHM_R|SHM_W);
+#endif
+ if (shmid == -1) {
+ // Possible reasons for shmget failure:
+ // 1. shmmax is too small for Java heap.
+ // > check shmmax value: cat /proc/sys/kernel/shmmax
+ // > increase shmmax value: echo "0xffffffff" > /proc/sys/kernel/shmmax
+ // 2. not enough large page memory.
+ // > check available large pages: cat /proc/meminfo
+ // > increase amount of large pages:
+ // echo new_value > /proc/sys/vm/nr_hugepages
+ // Note 1: different Bsd may use different name for this property,
+ // e.g. on Redhat AS-3 it is "hugetlb_pool".
+ // Note 2: it's possible there's enough physical memory available but
+ // they are so fragmented after a long run that they can't
+ // coalesce into large pages. Try to reserve large pages when
+ // the system is still "fresh".
+ if (warn_on_failure) {
+ jio_snprintf(msg, sizeof(msg), "Failed to reserve shared memory (errno = %d).", errno);
+ warning(msg);
+ }
+ return NULL;
+ }
+
+ // attach to the region
+ addr = (char*)shmat(shmid, req_addr, 0);
+ int err = errno;
+
+ // Remove shmid. If shmat() is successful, the actual shared memory segment
+ // will be deleted when it's detached by shmdt() or when the process
+ // terminates. If shmat() is not successful this will remove the shared
+ // segment immediately.
+ shmctl(shmid, IPC_RMID, NULL);
+
+ if ((intptr_t)addr == -1) {
+ if (warn_on_failure) {
+ jio_snprintf(msg, sizeof(msg), "Failed to attach shared memory (errno = %d).", err);
+ warning(msg);
+ }
+ return NULL;
+ }
+
+ return addr;
+}
+
+bool os::release_memory_special(char* base, size_t bytes) {
+ // detaching the SHM segment will also delete it, see reserve_memory_special()
+ int rslt = shmdt(base);
+ return rslt == 0;
+}
+
+size_t os::large_page_size() {
+ return _large_page_size;
+}
+
+// HugeTLBFS allows application to commit large page memory on demand;
+// with SysV SHM the entire memory region must be allocated as shared
+// memory.
+bool os::can_commit_large_page_memory() {
+ return UseHugeTLBFS;
+}
+
+bool os::can_execute_large_page_memory() {
+ return UseHugeTLBFS;
+}
+
+// Reserve memory at an arbitrary address, only if that area is
+// available (and not reserved for something else).
+
+char* os::attempt_reserve_memory_at(size_t bytes, char* requested_addr) {
+ const int max_tries = 10;
+ char* base[max_tries];
+ size_t size[max_tries];
+ const size_t gap = 0x000000;
+
+ // Assert only that the size is a multiple of the page size, since
+ // that's all that mmap requires, and since that's all we really know
+ // about at this low abstraction level. If we need higher alignment,
+ // we can either pass an alignment to this method or verify alignment
+ // in one of the methods further up the call chain. See bug 5044738.
+ assert(bytes % os::vm_page_size() == 0, "reserving unexpected size block");
+
+ // Repeatedly allocate blocks until the block is allocated at the
+ // right spot. Give up after max_tries. Note that reserve_memory() will
+ // automatically update _highest_vm_reserved_address if the call is
+ // successful. The variable tracks the highest memory address every reserved
+ // by JVM. It is used to detect heap-stack collision if running with
+ // fixed-stack BsdThreads. Because here we may attempt to reserve more
+ // space than needed, it could confuse the collision detecting code. To
+ // solve the problem, save current _highest_vm_reserved_address and
+ // calculate the correct value before return.
+ address old_highest = _highest_vm_reserved_address;
+
+ // Bsd mmap allows caller to pass an address as hint; give it a try first,
+ // if kernel honors the hint then we can return immediately.
+ char * addr = anon_mmap(requested_addr, bytes, false);
+ if (addr == requested_addr) {
+ return requested_addr;
+ }
+
+ if (addr != NULL) {
+ // mmap() is successful but it fails to reserve at the requested address
+ anon_munmap(addr, bytes);
+ }
+
+ int i;
+ for (i = 0; i < max_tries; ++i) {
+ base[i] = reserve_memory(bytes);
+
+ if (base[i] != NULL) {
+ // Is this the block we wanted?
+ if (base[i] == requested_addr) {
+ size[i] = bytes;
+ break;
+ }
+
+ // Does this overlap the block we wanted? Give back the overlapped
+ // parts and try again.
+
+ size_t top_overlap = requested_addr + (bytes + gap) - base[i];
+ if (top_overlap >= 0 && top_overlap < bytes) {
+ unmap_memory(base[i], top_overlap);
+ base[i] += top_overlap;
+ size[i] = bytes - top_overlap;
+ } else {
+ size_t bottom_overlap = base[i] + bytes - requested_addr;
+ if (bottom_overlap >= 0 && bottom_overlap < bytes) {
+ unmap_memory(requested_addr, bottom_overlap);
+ size[i] = bytes - bottom_overlap;
+ } else {
+ size[i] = bytes;
+ }
+ }
+ }
+ }
+
+ // Give back the unused reserved pieces.
+
+ for (int j = 0; j < i; ++j) {
+ if (base[j] != NULL) {
+ unmap_memory(base[j], size[j]);
+ }
+ }
+
+ if (i < max_tries) {
+ _highest_vm_reserved_address = MAX2(old_highest, (address)requested_addr + bytes);
+ return requested_addr;
+ } else {
+ _highest_vm_reserved_address = old_highest;
+ return NULL;
+ }
+}
+
+size_t os::read(int fd, void *buf, unsigned int nBytes) {
+ RESTARTABLE_RETURN_INT(::read(fd, buf, nBytes));
+}
+
+// TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
+// Solaris uses poll(), bsd uses park().
+// Poll() is likely a better choice, assuming that Thread.interrupt()
+// generates a SIGUSRx signal. Note that SIGUSR1 can interfere with
+// SIGSEGV, see 4355769.
+
+const int NANOSECS_PER_MILLISECS = 1000000;
+
+int os::sleep(Thread* thread, jlong millis, bool interruptible) {
+ assert(thread == Thread::current(), "thread consistency check");
+
+ ParkEvent * const slp = thread->_SleepEvent ;
+ slp->reset() ;
+ OrderAccess::fence() ;
+
+ if (interruptible) {
+ jlong prevtime = javaTimeNanos();
+
+ for (;;) {
+ if (os::is_interrupted(thread, true)) {
+ return OS_INTRPT;
+ }
+
+ jlong newtime = javaTimeNanos();
+
+ if (newtime - prevtime < 0) {
+ // time moving backwards, should only happen if no monotonic clock
+ // not a guarantee() because JVM should not abort on kernel/glibc bugs
+ assert(!Bsd::supports_monotonic_clock(), "time moving backwards");
+ } else {
+ millis -= (newtime - prevtime) / NANOSECS_PER_MILLISECS;
+ }
+
+ if(millis <= 0) {
+ return OS_OK;
+ }
+
+ prevtime = newtime;
+
+ {
+ assert(thread->is_Java_thread(), "sanity check");
+ JavaThread *jt = (JavaThread *) thread;
+ ThreadBlockInVM tbivm(jt);
+ OSThreadWaitState osts(jt->osthread(), false /* not Object.wait() */);
+
+ jt->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or
+ // java_suspend_self() via check_and_wait_while_suspended()
+
+ slp->park(millis);
+
+ // were we externally suspended while we were waiting?
+ jt->check_and_wait_while_suspended();
+ }
+ }
+ } else {
+ OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */);
+ jlong prevtime = javaTimeNanos();
+
+ for (;;) {
+ // It'd be nice to avoid the back-to-back javaTimeNanos() calls on
+ // the 1st iteration ...
+ jlong newtime = javaTimeNanos();
+
+ if (newtime - prevtime < 0) {
+ // time moving backwards, should only happen if no monotonic clock
+ // not a guarantee() because JVM should not abort on kernel/glibc bugs
+ assert(!Bsd::supports_monotonic_clock(), "time moving backwards");
+ } else {
+ millis -= (newtime - prevtime) / NANOSECS_PER_MILLISECS;
+ }
+
+ if(millis <= 0) break ;
+
+ prevtime = newtime;
+ slp->park(millis);
+ }
+ return OS_OK ;
+ }
+}
+
+int os::naked_sleep() {
+ // %% make the sleep time an integer flag. for now use 1 millisec.
+ return os::sleep(Thread::current(), 1, false);
+}
+
+// Sleep forever; naked call to OS-specific sleep; use with CAUTION
+void os::infinite_sleep() {
+ while (true) { // sleep forever ...
+ ::sleep(100); // ... 100 seconds at a time
+ }
+}
+
+// Used to convert frequent JVM_Yield() to nops
+bool os::dont_yield() {
+ return DontYieldALot;
+}
+
+void os::yield() {
+ sched_yield();
+}
+
+os::YieldResult os::NakedYield() { sched_yield(); return os::YIELD_UNKNOWN ;}
+
+void os::yield_all(int attempts) {
+ // Yields to all threads, including threads with lower priorities
+ // Threads on Bsd are all with same priority. The Solaris style
+ // os::yield_all() with nanosleep(1ms) is not necessary.
+ sched_yield();
+}
+
+// Called from the tight loops to possibly influence time-sharing heuristics
+void os::loop_breaker(int attempts) {
+ os::yield_all(attempts);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// thread priority support
+
+// Note: Normal Bsd applications are run with SCHED_OTHER policy. SCHED_OTHER
+// only supports dynamic priority, static priority must be zero. For real-time
+// applications, Bsd supports SCHED_RR which allows static priority (1-99).
+// However, for large multi-threaded applications, SCHED_RR is not only slower
+// than SCHED_OTHER, but also very unstable (my volano tests hang hard 4 out
+// of 5 runs - Sep 2005).
+//
+// The following code actually changes the niceness of kernel-thread/LWP. It
+// has an assumption that setpriority() only modifies one kernel-thread/LWP,
+// not the entire user process, and user level threads are 1:1 mapped to kernel
+// threads. It has always been the case, but could change in the future. For
+// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
+// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
+
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
+int os::java_to_os_priority[MaxPriority + 1] = {
+ 19, // 0 Entry should never be used
+
+ 0, // 1 MinPriority
+ 3, // 2
+ 6, // 3
+
+ 10, // 4
+ 15, // 5 NormPriority
+ 18, // 6
+
+ 21, // 7
+ 25, // 8
+ 28, // 9 NearMaxPriority
+
+ 31 // 10 MaxPriority
+};
+#elif defined(__APPLE__)
+/* Using Mach high-level priority assignments */
+int os::java_to_os_priority[MaxPriority + 1] = {
+ 0, // 0 Entry should never be used (MINPRI_USER)
+
+ 27, // 1 MinPriority
+ 28, // 2
+ 29, // 3
+
+ 30, // 4
+ 31, // 5 NormPriority (BASEPRI_DEFAULT)
+ 32, // 6
+
+ 33, // 7
+ 34, // 8
+ 35, // 9 NearMaxPriority
+
+ 36 // 10 MaxPriority
+};
+#else
+int os::java_to_os_priority[MaxPriority + 1] = {
+ 19, // 0 Entry should never be used
+
+ 4, // 1 MinPriority
+ 3, // 2
+ 2, // 3
+
+ 1, // 4
+ 0, // 5 NormPriority
+ -1, // 6
+
+ -2, // 7
+ -3, // 8
+ -4, // 9 NearMaxPriority
+
+ -5 // 10 MaxPriority
+};
+#endif
+
+static int prio_init() {
+ if (ThreadPriorityPolicy == 1) {
+ // Only root can raise thread priority. Don't allow ThreadPriorityPolicy=1
+ // if effective uid is not root. Perhaps, a more elegant way of doing
+ // this is to test CAP_SYS_NICE capability, but that will require libcap.so
+ if (geteuid() != 0) {
+ if (!FLAG_IS_DEFAULT(ThreadPriorityPolicy)) {
+ warning("-XX:ThreadPriorityPolicy requires root privilege on Bsd");
+ }
+ ThreadPriorityPolicy = 0;
+ }
+ }
+ return 0;
+}
+
+OSReturn os::set_native_priority(Thread* thread, int newpri) {
+ if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
+
+#ifdef __OpenBSD__
+ // OpenBSD pthread_setprio starves low priority threads
+ return OS_OK;
+#elif defined(__FreeBSD__)
+ int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri);
+#elif defined(__APPLE__) || defined(__NetBSD__)
+ struct sched_param sp;
+ int policy;
+ pthread_t self = pthread_self();
+
+ if (pthread_getschedparam(self, &policy, &sp) != 0)
+ return OS_ERR;
+
+ sp.sched_priority = newpri;
+ if (pthread_setschedparam(self, policy, &sp) != 0)
+ return OS_ERR;
+
+ return OS_OK;
+#else
+ int ret = setpriority(PRIO_PROCESS, thread->osthread()->thread_id(), newpri);
+ return (ret == 0) ? OS_OK : OS_ERR;
+#endif
+}
+
+OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
+ if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) {
+ *priority_ptr = java_to_os_priority[NormPriority];
+ return OS_OK;
+ }
+
+ errno = 0;
+#if defined(__OpenBSD__) || defined(__FreeBSD__)
+ *priority_ptr = pthread_getprio(thread->osthread()->pthread_id());
+#elif defined(__APPLE__) || defined(__NetBSD__)
+ int policy;
+ struct sched_param sp;
+
+ pthread_getschedparam(pthread_self(), &policy, &sp);
+ *priority_ptr = sp.sched_priority;
+#else
+ *priority_ptr = getpriority(PRIO_PROCESS, thread->osthread()->thread_id());
+#endif
+ return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
+}
+
+// Hint to the underlying OS that a task switch would not be good.
+// Void return because it's a hint and can fail.
+void os::hint_no_preempt() {}
+
+////////////////////////////////////////////////////////////////////////////////
+// suspend/resume support
+
+// the low-level signal-based suspend/resume support is a remnant from the
+// old VM-suspension that used to be for java-suspension, safepoints etc,
+// within hotspot. Now there is a single use-case for this:
+// - calling get_thread_pc() on the VMThread by the flat-profiler task
+// that runs in the watcher thread.
+// The remaining code is greatly simplified from the more general suspension
+// code that used to be used.
+//
+// The protocol is quite simple:
+// - suspend:
+// - sends a signal to the target thread
+// - polls the suspend state of the osthread using a yield loop
+// - target thread signal handler (SR_handler) sets suspend state
+// and blocks in sigsuspend until continued
+// - resume:
+// - sets target osthread state to continue
+// - sends signal to end the sigsuspend loop in the SR_handler
+//
+// Note that the SR_lock plays no role in this suspend/resume protocol.
+//
+
+static void resume_clear_context(OSThread *osthread) {
+ osthread->set_ucontext(NULL);
+ osthread->set_siginfo(NULL);
+
+ // notify the suspend action is completed, we have now resumed
+ osthread->sr.clear_suspended();
+}
+
+static void suspend_save_context(OSThread *osthread, siginfo_t* siginfo, ucontext_t* context) {
+ osthread->set_ucontext(context);
+ osthread->set_siginfo(siginfo);
+}
+
+//
+// Handler function invoked when a thread's execution is suspended or
+// resumed. We have to be careful that only async-safe functions are
+// called here (Note: most pthread functions are not async safe and
+// should be avoided.)
+//
+// Note: sigwait() is a more natural fit than sigsuspend() from an
+// interface point of view, but sigwait() prevents the signal hander
+// from being run. libpthread would get very confused by not having
+// its signal handlers run and prevents sigwait()'s use with the
+// mutex granting granting signal.
+//
+// Currently only ever called on the VMThread
+//
+static void SR_handler(int sig, siginfo_t* siginfo, ucontext_t* context) {
+ // Save and restore errno to avoid confusing native code with EINTR
+ // after sigsuspend.
+ int old_errno = errno;
+
+ Thread* thread = Thread::current();
+ OSThread* osthread = thread->osthread();
+ assert(thread->is_VM_thread(), "Must be VMThread");
+ // read current suspend action
+ int action = osthread->sr.suspend_action();
+ if (action == SR_SUSPEND) {
+ suspend_save_context(osthread, siginfo, context);
+
+ // Notify the suspend action is about to be completed. do_suspend()
+ // waits until SR_SUSPENDED is set and then returns. We will wait
+ // here for a resume signal and that completes the suspend-other
+ // action. do_suspend/do_resume is always called as a pair from
+ // the same thread - so there are no races
+
+ // notify the caller
+ osthread->sr.set_suspended();
+
+ sigset_t suspend_set; // signals for sigsuspend()
+
+ // get current set of blocked signals and unblock resume signal
+ pthread_sigmask(SIG_BLOCK, NULL, &suspend_set);
+ sigdelset(&suspend_set, SR_signum);
+
+ // wait here until we are resumed
+ do {
+ sigsuspend(&suspend_set);
+ // ignore all returns until we get a resume signal
+ } while (osthread->sr.suspend_action() != SR_CONTINUE);
+
+ resume_clear_context(osthread);
+
+ } else {
+ assert(action == SR_CONTINUE, "unexpected sr action");
+ // nothing special to do - just leave the handler
+ }
+
+ errno = old_errno;
+}
+
+
+static int SR_initialize() {
+ struct sigaction act;
+ char *s;
+ /* Get signal number to use for suspend/resume */
+ if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
+ int sig = ::strtol(s, 0, 10);
+ if (sig > 0 || sig < NSIG) {
+ SR_signum = sig;
+ }
+ }
+
+ assert(SR_signum > SIGSEGV && SR_signum > SIGBUS,
+ "SR_signum must be greater than max(SIGSEGV, SIGBUS), see 4355769");
+
+ sigemptyset(&SR_sigset);
+ sigaddset(&SR_sigset, SR_signum);
+
+ /* Set up signal handler for suspend/resume */
+ act.sa_flags = SA_RESTART|SA_SIGINFO;
+ act.sa_handler = (void (*)(int)) SR_handler;
+
+ // SR_signum is blocked by default.
+ // 4528190 - We also need to block pthread restart signal (32 on all
+ // supported Bsd platforms). Note that BsdThreads need to block
+ // this signal for all threads to work properly. So we don't have
+ // to use hard-coded signal number when setting up the mask.
+ pthread_sigmask(SIG_BLOCK, NULL, &act.sa_mask);
+
+ if (sigaction(SR_signum, &act, 0) == -1) {
+ return -1;
+ }
+
+ // Save signal flag
+ os::Bsd::set_our_sigflags(SR_signum, act.sa_flags);
+ return 0;
+}
+
+static int SR_finalize() {
+ return 0;
+}
+
+
+// returns true on success and false on error - really an error is fatal
+// but this seems the normal response to library errors
+static bool do_suspend(OSThread* osthread) {
+ // mark as suspended and send signal
+ osthread->sr.set_suspend_action(SR_SUSPEND);
+ int status = pthread_kill(osthread->pthread_id(), SR_signum);
+ assert_status(status == 0, status, "pthread_kill");
+
+ // check status and wait until notified of suspension
+ if (status == 0) {
+ for (int i = 0; !osthread->sr.is_suspended(); i++) {
+ os::yield_all(i);
+ }
+ osthread->sr.set_suspend_action(SR_NONE);
+ return true;
+ }
+ else {
+ osthread->sr.set_suspend_action(SR_NONE);
+ return false;
+ }
+}
+
+static void do_resume(OSThread* osthread) {
+ assert(osthread->sr.is_suspended(), "thread should be suspended");
+ osthread->sr.set_suspend_action(SR_CONTINUE);
+
+ int status = pthread_kill(osthread->pthread_id(), SR_signum);
+ assert_status(status == 0, status, "pthread_kill");
+ // check status and wait unit notified of resumption
+ if (status == 0) {
+ for (int i = 0; osthread->sr.is_suspended(); i++) {
+ os::yield_all(i);
+ }
+ }
+ osthread->sr.set_suspend_action(SR_NONE);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// interrupt support
+
+void os::interrupt(Thread* thread) {
+ assert(Thread::current() == thread || Threads_lock->owned_by_self(),
+ "possibility of dangling Thread pointer");
+
+ OSThread* osthread = thread->osthread();
+
+ if (!osthread->interrupted()) {
+ osthread->set_interrupted(true);
+ // More than one thread can get here with the same value of osthread,
+ // resulting in multiple notifications. We do, however, want the store
+ // to interrupted() to be visible to other threads before we execute unpark().
+ OrderAccess::fence();
+ ParkEvent * const slp = thread->_SleepEvent ;
+ if (slp != NULL) slp->unpark() ;
+ }
+
+ // For JSR166. Unpark even if interrupt status already was set
+ if (thread->is_Java_thread())
+ ((JavaThread*)thread)->parker()->unpark();
+
+ ParkEvent * ev = thread->_ParkEvent ;
+ if (ev != NULL) ev->unpark() ;
+
+}
+
+bool os::is_interrupted(Thread* thread, bool clear_interrupted) {
+ assert(Thread::current() == thread || Threads_lock->owned_by_self(),
+ "possibility of dangling Thread pointer");
+
+ OSThread* osthread = thread->osthread();
+
+ bool interrupted = osthread->interrupted();
+
+ if (interrupted && clear_interrupted) {
+ osthread->set_interrupted(false);
+ // consider thread->_SleepEvent->reset() ... optional optimization
+ }
+
+ return interrupted;
+}
+
+///////////////////////////////////////////////////////////////////////////////////
+// signal handling (except suspend/resume)
+
+// This routine may be used by user applications as a "hook" to catch signals.
+// The user-defined signal handler must pass unrecognized signals to this
+// routine, and if it returns true (non-zero), then the signal handler must
+// return immediately. If the flag "abort_if_unrecognized" is true, then this
+// routine will never retun false (zero), but instead will execute a VM panic
+// routine kill the process.
+//
+// If this routine returns false, it is OK to call it again. This allows
+// the user-defined signal handler to perform checks either before or after
+// the VM performs its own checks. Naturally, the user code would be making
+// a serious error if it tried to handle an exception (such as a null check
+// or breakpoint) that the VM was generating for its own correct operation.
+//
+// This routine may recognize any of the following kinds of signals:
+// SIGBUS, SIGSEGV, SIGILL, SIGFPE, SIGQUIT, SIGPIPE, SIGXFSZ, SIGUSR1.
+// It should be consulted by handlers for any of those signals.
+//
+// The caller of this routine must pass in the three arguments supplied
+// to the function referred to in the "sa_sigaction" (not the "sa_handler")
+// field of the structure passed to sigaction(). This routine assumes that
+// the sa_flags field passed to sigaction() includes SA_SIGINFO and SA_RESTART.
+//
+// Note that the VM will print warnings if it detects conflicting signal
+// handlers, unless invoked with the option "-XX:+AllowUserSignalHandlers".
+//
+extern "C" JNIEXPORT int
+JVM_handle_bsd_signal(int signo, siginfo_t* siginfo,
+ void* ucontext, int abort_if_unrecognized);
+
+void signalHandler(int sig, siginfo_t* info, void* uc) {
+ assert(info != NULL && uc != NULL, "it must be old kernel");
+ JVM_handle_bsd_signal(sig, info, uc, true);
+}
+
+
+// This boolean allows users to forward their own non-matching signals
+// to JVM_handle_bsd_signal, harmlessly.
+bool os::Bsd::signal_handlers_are_installed = false;
+
+// For signal-chaining
+struct sigaction os::Bsd::sigact[MAXSIGNUM];
+unsigned int os::Bsd::sigs = 0;
+bool os::Bsd::libjsig_is_loaded = false;
+typedef struct sigaction *(*get_signal_t)(int);
+get_signal_t os::Bsd::get_signal_action = NULL;
+
+struct sigaction* os::Bsd::get_chained_signal_action(int sig) {
+ struct sigaction *actp = NULL;
+
+ if (libjsig_is_loaded) {
+ // Retrieve the old signal handler from libjsig
+ actp = (*get_signal_action)(sig);
+ }
+ if (actp == NULL) {
+ // Retrieve the preinstalled signal handler from jvm
+ actp = get_preinstalled_handler(sig);
+ }
+
+ return actp;
+}
+
+static bool call_chained_handler(struct sigaction *actp, int sig,
+ siginfo_t *siginfo, void *context) {
+ // Call the old signal handler
+ if (actp->sa_handler == SIG_DFL) {
+ // It's more reasonable to let jvm treat it as an unexpected exception
+ // instead of taking the default action.
+ return false;
+ } else if (actp->sa_handler != SIG_IGN) {
+ if ((actp->sa_flags & SA_NODEFER) == 0) {
+ // automaticlly block the signal
+ sigaddset(&(actp->sa_mask), sig);
+ }
+
+ sa_handler_t hand;
+ sa_sigaction_t sa;
+ bool siginfo_flag_set = (actp->sa_flags & SA_SIGINFO) != 0;
+ // retrieve the chained handler
+ if (siginfo_flag_set) {
+ sa = actp->sa_sigaction;
+ } else {
+ hand = actp->sa_handler;
+ }
+
+ if ((actp->sa_flags & SA_RESETHAND) != 0) {
+ actp->sa_handler = SIG_DFL;
+ }
+
+ // try to honor the signal mask
+ sigset_t oset;
+ pthread_sigmask(SIG_SETMASK, &(actp->sa_mask), &oset);
+
+ // call into the chained handler
+ if (siginfo_flag_set) {
+ (*sa)(sig, siginfo, context);
+ } else {
+ (*hand)(sig);
+ }
+
+ // restore the signal mask
+ pthread_sigmask(SIG_SETMASK, &oset, 0);
+ }
+ // Tell jvm's signal handler the signal is taken care of.
+ return true;
+}
+
+bool os::Bsd::chained_handler(int sig, siginfo_t* siginfo, void* context) {
+ bool chained = false;
+ // signal-chaining
+ if (UseSignalChaining) {
+ struct sigaction *actp = get_chained_signal_action(sig);
+ if (actp != NULL) {
+ chained = call_chained_handler(actp, sig, siginfo, context);
+ }
+ }
+ return chained;
+}
+
+struct sigaction* os::Bsd::get_preinstalled_handler(int sig) {
+ if ((( (unsigned int)1 << sig ) & sigs) != 0) {
+ return &sigact[sig];
+ }
+ return NULL;
+}
+
+void os::Bsd::save_preinstalled_handler(int sig, struct sigaction& oldAct) {
+ assert(sig > 0 && sig < MAXSIGNUM, "vm signal out of expected range");
+ sigact[sig] = oldAct;
+ sigs |= (unsigned int)1 << sig;
+}
+
+// for diagnostic
+int os::Bsd::sigflags[MAXSIGNUM];
+
+int os::Bsd::get_our_sigflags(int sig) {
+ assert(sig > 0 && sig < MAXSIGNUM, "vm signal out of expected range");
+ return sigflags[sig];
+}
+
+void os::Bsd::set_our_sigflags(int sig, int flags) {
+ assert(sig > 0 && sig < MAXSIGNUM, "vm signal out of expected range");
+ sigflags[sig] = flags;
+}
+
+void os::Bsd::set_signal_handler(int sig, bool set_installed) {
+ // Check for overwrite.
+ struct sigaction oldAct;
+ sigaction(sig, (struct sigaction*)NULL, &oldAct);
+
+ void* oldhand = oldAct.sa_sigaction
+ ? CAST_FROM_FN_PTR(void*, oldAct.sa_sigaction)
+ : CAST_FROM_FN_PTR(void*, oldAct.sa_handler);
+ if (oldhand != CAST_FROM_FN_PTR(void*, SIG_DFL) &&
+ oldhand != CAST_FROM_FN_PTR(void*, SIG_IGN) &&
+ oldhand != CAST_FROM_FN_PTR(void*, (sa_sigaction_t)signalHandler)) {
+ if (AllowUserSignalHandlers || !set_installed) {
+ // Do not overwrite; user takes responsibility to forward to us.
+ return;
+ } else if (UseSignalChaining) {
+ // save the old handler in jvm
+ save_preinstalled_handler(sig, oldAct);
+ // libjsig also interposes the sigaction() call below and saves the
+ // old sigaction on it own.
+ } else {
+ fatal(err_msg("Encountered unexpected pre-existing sigaction handler "
+ "%#lx for signal %d.", (long)oldhand, sig));
+ }
+ }
+
+ struct sigaction sigAct;
+ sigfillset(&(sigAct.sa_mask));
+ sigAct.sa_handler = SIG_DFL;
+ if (!set_installed) {
+ sigAct.sa_flags = SA_SIGINFO|SA_RESTART;
+ } else {
+ sigAct.sa_sigaction = signalHandler;
+ sigAct.sa_flags = SA_SIGINFO|SA_RESTART;
+ }
+ // Save flags, which are set by ours
+ assert(sig > 0 && sig < MAXSIGNUM, "vm signal out of expected range");
+ sigflags[sig] = sigAct.sa_flags;
+
+ int ret = sigaction(sig, &sigAct, &oldAct);
+ assert(ret == 0, "check");
+
+ void* oldhand2 = oldAct.sa_sigaction
+ ? CAST_FROM_FN_PTR(void*, oldAct.sa_sigaction)
+ : CAST_FROM_FN_PTR(void*, oldAct.sa_handler);
+ assert(oldhand2 == oldhand, "no concurrent signal handler installation");
+}
+
+// install signal handlers for signals that HotSpot needs to
+// handle in order to support Java-level exception handling.
+
+void os::Bsd::install_signal_handlers() {
+ if (!signal_handlers_are_installed) {
+ signal_handlers_are_installed = true;
+
+ // signal-chaining
+ typedef void (*signal_setting_t)();
+ signal_setting_t begin_signal_setting = NULL;
+ signal_setting_t end_signal_setting = NULL;
+ begin_signal_setting = CAST_TO_FN_PTR(signal_setting_t,
+ dlsym(RTLD_DEFAULT, "JVM_begin_signal_setting"));
+ if (begin_signal_setting != NULL) {
+ end_signal_setting = CAST_TO_FN_PTR(signal_setting_t,
+ dlsym(RTLD_DEFAULT, "JVM_end_signal_setting"));
+ get_signal_action = CAST_TO_FN_PTR(get_signal_t,
+ dlsym(RTLD_DEFAULT, "JVM_get_signal_action"));
+ libjsig_is_loaded = true;
+ assert(UseSignalChaining, "should enable signal-chaining");
+ }
+ if (libjsig_is_loaded) {
+ // Tell libjsig jvm is setting signal handlers
+ (*begin_signal_setting)();
+ }
+
+ set_signal_handler(SIGSEGV, true);
+ set_signal_handler(SIGPIPE, true);
+ set_signal_handler(SIGBUS, true);
+ set_signal_handler(SIGILL, true);
+ set_signal_handler(SIGFPE, true);
+ set_signal_handler(SIGXFSZ, true);
+
+#if defined(__APPLE__)
+ // In Mac OS X 10.4, CrashReporter will write a crash log for all 'fatal' signals, including
+ // signals caught and handled by the JVM. To work around this, we reset the mach task
+ // signal handler that's placed on our process by CrashReporter. This disables
+ // CrashReporter-based reporting.
+ //
+ // This work-around is not necessary for 10.5+, as CrashReporter no longer intercedes
+ // on caught fatal signals.
+ //
+ // Additionally, gdb installs both standard BSD signal handlers, and mach exception
+ // handlers. By replacing the existing task exception handler, we disable gdb's mach
+ // exception handling, while leaving the standard BSD signal handlers functional.
+ kern_return_t kr;
+ kr = task_set_exception_ports(mach_task_self(),
+ EXC_MASK_BAD_ACCESS | EXC_MASK_ARITHMETIC,
+ MACH_PORT_NULL,
+ EXCEPTION_STATE_IDENTITY,
+ MACHINE_THREAD_STATE);
+
+ assert(kr == KERN_SUCCESS, "could not set mach task signal handler");
+#endif
+
+ if (libjsig_is_loaded) {
+ // Tell libjsig jvm finishes setting signal handlers
+ (*end_signal_setting)();
+ }
+
+ // We don't activate signal checker if libjsig is in place, we trust ourselves
+ // and if UserSignalHandler is installed all bets are off
+ if (CheckJNICalls) {
+ if (libjsig_is_loaded) {
+ tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ check_signals = false;
+ }
+ if (AllowUserSignalHandlers) {
+ tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ check_signals = false;
+ }
+ }
+ }
+}
+
+#ifndef _ALLBSD_SOURCE
+// This is the fastest way to get thread cpu time on Bsd.
+// Returns cpu time (user+sys) for any thread, not only for current.
+// POSIX compliant clocks are implemented in the kernels 2.6.16+.
+// It might work on 2.6.10+ with a special kernel/glibc patch.
+// For reference, please, see IEEE Std 1003.1-2004:
+// http://www.unix.org/single_unix_specification
+
+jlong os::Bsd::fast_thread_cpu_time(clockid_t clockid) {
+ struct timespec tp;
+ int rc = os::Bsd::clock_gettime(clockid, &tp);
+ assert(rc == 0, "clock_gettime is expected to return 0 code");
+
+ return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
+}
+#endif
+
+/////
+// glibc on Bsd platform uses non-documented flag
+// to indicate, that some special sort of signal
+// trampoline is used.
+// We will never set this flag, and we should
+// ignore this flag in our diagnostic
+#ifdef SIGNIFICANT_SIGNAL_MASK
+#undef SIGNIFICANT_SIGNAL_MASK
+#endif
+#define SIGNIFICANT_SIGNAL_MASK (~0x04000000)
+
+static const char* get_signal_handler_name(address handler,
+ char* buf, int buflen) {
+ int offset;
+ bool found = os::dll_address_to_library_name(handler, buf, buflen, &offset);
+ if (found) {
+ // skip directory names
+ const char *p1, *p2;
+ p1 = buf;
+ size_t len = strlen(os::file_separator());
+ while ((p2 = strstr(p1, os::file_separator())) != NULL) p1 = p2 + len;
+ jio_snprintf(buf, buflen, "%s+0x%x", p1, offset);
+ } else {
+ jio_snprintf(buf, buflen, PTR_FORMAT, handler);
+ }
+ return buf;
+}
+
+static void print_signal_handler(outputStream* st, int sig,
+ char* buf, size_t buflen) {
+ struct sigaction sa;
+
+ sigaction(sig, NULL, &sa);
+
+ // See comment for SIGNIFICANT_SIGNAL_MASK define
+ sa.sa_flags &= SIGNIFICANT_SIGNAL_MASK;
+
+ st->print("%s: ", os::exception_name(sig, buf, buflen));
+
+ address handler = (sa.sa_flags & SA_SIGINFO)
+ ? CAST_FROM_FN_PTR(address, sa.sa_sigaction)
+ : CAST_FROM_FN_PTR(address, sa.sa_handler);
+
+ if (handler == CAST_FROM_FN_PTR(address, SIG_DFL)) {
+ st->print("SIG_DFL");
+ } else if (handler == CAST_FROM_FN_PTR(address, SIG_IGN)) {
+ st->print("SIG_IGN");
+ } else {
+ st->print("[%s]", get_signal_handler_name(handler, buf, buflen));
+ }
+
+ st->print(", sa_mask[0]=" PTR32_FORMAT, *(uint32_t*)&sa.sa_mask);
+
+ address rh = VMError::get_resetted_sighandler(sig);
+ // May be, handler was resetted by VMError?
+ if(rh != NULL) {
+ handler = rh;
+ sa.sa_flags = VMError::get_resetted_sigflags(sig) & SIGNIFICANT_SIGNAL_MASK;
+ }
+
+ st->print(", sa_flags=" PTR32_FORMAT, sa.sa_flags);
+
+ // Check: is it our handler?
+ if(handler == CAST_FROM_FN_PTR(address, (sa_sigaction_t)signalHandler) ||
+ handler == CAST_FROM_FN_PTR(address, (sa_sigaction_t)SR_handler)) {
+ // It is our signal handler
+ // check for flags, reset system-used one!
+ if((int)sa.sa_flags != os::Bsd::get_our_sigflags(sig)) {
+ st->print(
+ ", flags was changed from " PTR32_FORMAT ", consider using jsig library",
+ os::Bsd::get_our_sigflags(sig));
+ }
+ }
+ st->cr();
+}
+
+
+#define DO_SIGNAL_CHECK(sig) \
+ if (!sigismember(&check_signal_done, sig)) \
+ os::Bsd::check_signal_handler(sig)
+
+// This method is a periodic task to check for misbehaving JNI applications
+// under CheckJNI, we can add any periodic checks here
+
+void os::run_periodic_checks() {
+
+ if (check_signals == false) return;
+
+ // SEGV and BUS if overridden could potentially prevent
+ // generation of hs*.log in the event of a crash, debugging
+ // such a case can be very challenging, so we absolutely
+ // check the following for a good measure:
+ DO_SIGNAL_CHECK(SIGSEGV);
+ DO_SIGNAL_CHECK(SIGILL);
+ DO_SIGNAL_CHECK(SIGFPE);
+ DO_SIGNAL_CHECK(SIGBUS);
+ DO_SIGNAL_CHECK(SIGPIPE);
+ DO_SIGNAL_CHECK(SIGXFSZ);
+
+
+ // ReduceSignalUsage allows the user to override these handlers
+ // see comments at the very top and jvm_solaris.h
+ if (!ReduceSignalUsage) {
+ DO_SIGNAL_CHECK(SHUTDOWN1_SIGNAL);
+ DO_SIGNAL_CHECK(SHUTDOWN2_SIGNAL);
+ DO_SIGNAL_CHECK(SHUTDOWN3_SIGNAL);
+ DO_SIGNAL_CHECK(BREAK_SIGNAL);
+ }
+
+ DO_SIGNAL_CHECK(SR_signum);
+ DO_SIGNAL_CHECK(INTERRUPT_SIGNAL);
+}
+
+typedef int (*os_sigaction_t)(int, const struct sigaction *, struct sigaction *);
+
+static os_sigaction_t os_sigaction = NULL;
+
+void os::Bsd::check_signal_handler(int sig) {
+ char buf[O_BUFLEN];
+ address jvmHandler = NULL;
+
+
+ struct sigaction act;
+ if (os_sigaction == NULL) {
+ // only trust the default sigaction, in case it has been interposed
+ os_sigaction = (os_sigaction_t)dlsym(RTLD_DEFAULT, "sigaction");
+ if (os_sigaction == NULL) return;
+ }
+
+ os_sigaction(sig, (struct sigaction*)NULL, &act);
+
+
+ act.sa_flags &= SIGNIFICANT_SIGNAL_MASK;
+
+ address thisHandler = (act.sa_flags & SA_SIGINFO)
+ ? CAST_FROM_FN_PTR(address, act.sa_sigaction)
+ : CAST_FROM_FN_PTR(address, act.sa_handler) ;
+
+
+ switch(sig) {
+ case SIGSEGV:
+ case SIGBUS:
+ case SIGFPE:
+ case SIGPIPE:
+ case SIGILL:
+ case SIGXFSZ:
+ jvmHandler = CAST_FROM_FN_PTR(address, (sa_sigaction_t)signalHandler);
+ break;
+
+ case SHUTDOWN1_SIGNAL:
+ case SHUTDOWN2_SIGNAL:
+ case SHUTDOWN3_SIGNAL:
+ case BREAK_SIGNAL:
+ jvmHandler = (address)user_handler();
+ break;
+
+ case INTERRUPT_SIGNAL:
+ jvmHandler = CAST_FROM_FN_PTR(address, SIG_DFL);
+ break;
+
+ default:
+ if (sig == SR_signum) {
+ jvmHandler = CAST_FROM_FN_PTR(address, (sa_sigaction_t)SR_handler);
+ } else {
+ return;
+ }
+ break;
+ }
+
+ if (thisHandler != jvmHandler) {
+ tty->print("Warning: %s handler ", exception_name(sig, buf, O_BUFLEN));
+ tty->print("expected:%s", get_signal_handler_name(jvmHandler, buf, O_BUFLEN));
+ tty->print_cr(" found:%s", get_signal_handler_name(thisHandler, buf, O_BUFLEN));
+ // No need to check this sig any longer
+ sigaddset(&check_signal_done, sig);
+ } else if(os::Bsd::get_our_sigflags(sig) != 0 && (int)act.sa_flags != os::Bsd::get_our_sigflags(sig)) {
+ tty->print("Warning: %s handler flags ", exception_name(sig, buf, O_BUFLEN));
+ tty->print("expected:" PTR32_FORMAT, os::Bsd::get_our_sigflags(sig));
+ tty->print_cr(" found:" PTR32_FORMAT, act.sa_flags);
+ // No need to check this sig any longer
+ sigaddset(&check_signal_done, sig);
+ }
+
+ // Dump all the signal
+ if (sigismember(&check_signal_done, sig)) {
+ print_signal_handlers(tty, buf, O_BUFLEN);
+ }
+}
+
+extern void report_error(char* file_name, int line_no, char* title, char* format, ...);
+
+extern bool signal_name(int signo, char* buf, size_t len);
+
+const char* os::exception_name(int exception_code, char* buf, size_t size) {
+ if (0 < exception_code && exception_code <= SIGRTMAX) {
+ // signal
+ if (!signal_name(exception_code, buf, size)) {
+ jio_snprintf(buf, size, "SIG%d", exception_code);
+ }
+ return buf;
+ } else {
+ return NULL;
+ }
+}
+
+// this is called _before_ the most of global arguments have been parsed
+void os::init(void) {
+ char dummy; /* used to get a guess on initial stack address */
+// first_hrtime = gethrtime();
+
+ // With BsdThreads the JavaMain thread pid (primordial thread)
+ // is different than the pid of the java launcher thread.
+ // So, on Bsd, the launcher thread pid is passed to the VM
+ // via the sun.java.launcher.pid property.
+ // Use this property instead of getpid() if it was correctly passed.
+ // See bug 6351349.
+ pid_t java_launcher_pid = (pid_t) Arguments::sun_java_launcher_pid();
+
+ _initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
+
+ clock_tics_per_sec = CLK_TCK;
+
+ init_random(1234567);
+
+ ThreadCritical::initialize();
+
+ Bsd::set_page_size(getpagesize());
+ if (Bsd::page_size() == -1) {
+ fatal(err_msg("os_bsd.cpp: os::init: sysconf failed (%s)",
+ strerror(errno)));
+ }
+ init_page_sizes((size_t) Bsd::page_size());
+
+ Bsd::initialize_system_info();
+
+ // main_thread points to the aboriginal thread
+ Bsd::_main_thread = pthread_self();
+
+ Bsd::clock_init();
+ initial_time_count = os::elapsed_counter();
+
+#ifdef __APPLE__
+ // XXXDARWIN
+ // Work around the unaligned VM callbacks in hotspot's
+ // sharedRuntime. The callbacks don't use SSE2 instructions, and work on
+ // Linux, Solaris, and FreeBSD. On Mac OS X, dyld (rightly so) enforces
+ // alignment when doing symbol lookup. To work around this, we force early
+ // binding of all symbols now, thus binding when alignment is known-good.
+ _dyld_bind_fully_image_containing_address((const void *) &os::init);
+#endif
+}
+
+// To install functions for atexit system call
+extern "C" {
+ static void perfMemory_exit_helper() {
+ perfMemory_exit();
+ }
+}
+
+// this is called _after_ the global arguments have been parsed
+jint os::init_2(void)
+{
+#ifndef _ALLBSD_SOURCE
+ Bsd::fast_thread_clock_init();
+#endif
+
+ // Allocate a single page and mark it as readable for safepoint polling
+ address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ guarantee( polling_page != MAP_FAILED, "os::init_2: failed to allocate polling page" );
+
+ os::set_polling_page( polling_page );
+
+#ifndef PRODUCT
+ if(Verbose && PrintMiscellaneous)
+ tty->print("[SafePoint Polling address: " INTPTR_FORMAT "]\n", (intptr_t)polling_page);
+#endif
+
+ if (!UseMembar) {
+ address mem_serialize_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ | PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+ guarantee( mem_serialize_page != NULL, "mmap Failed for memory serialize page");
+ os::set_memory_serialize_page( mem_serialize_page );
+
+#ifndef PRODUCT
+ if(Verbose && PrintMiscellaneous)
+ tty->print("[Memory Serialize Page address: " INTPTR_FORMAT "]\n", (intptr_t)mem_serialize_page);
+#endif
+ }
+
+ os::large_page_init();
+
+ // initialize suspend/resume support - must do this before signal_sets_init()
+ if (SR_initialize() != 0) {
+ perror("SR_initialize failed");
+ return JNI_ERR;
+ }
+
+ Bsd::signal_sets_init();
+ Bsd::install_signal_handlers();
+
+ // Check minimum allowable stack size for thread creation and to initialize
+ // the java system classes, including StackOverflowError - depends on page
+ // size. Add a page for compiler2 recursion in main thread.
+ // Add in 2*BytesPerWord times page size to account for VM stack during
+ // class initialization depending on 32 or 64 bit VM.
+ os::Bsd::min_stack_allowed = MAX2(os::Bsd::min_stack_allowed,
+ (size_t)(StackYellowPages+StackRedPages+StackShadowPages+
+ 2*BytesPerWord COMPILER2_PRESENT(+1)) * Bsd::page_size());
+
+ size_t threadStackSizeInBytes = ThreadStackSize * K;
+ if (threadStackSizeInBytes != 0 &&
+ threadStackSizeInBytes < os::Bsd::min_stack_allowed) {
+ tty->print_cr("\nThe stack size specified is too small, "
+ "Specify at least %dk",
+ os::Bsd::min_stack_allowed/ K);
+ return JNI_ERR;
+ }
+
+ // Make the stack size a multiple of the page size so that
+ // the yellow/red zones can be guarded.
+ JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
+ vm_page_size()));
+
+#ifndef _ALLBSD_SOURCE
+ Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
+
+ Bsd::libpthread_init();
+ if (PrintMiscellaneous && (Verbose || WizardMode)) {
+ tty->print_cr("[HotSpot is running with %s, %s(%s)]\n",
+ Bsd::glibc_version(), Bsd::libpthread_version(),
+ Bsd::is_floating_stack() ? "floating stack" : "fixed stack");
+ }
+
+ if (UseNUMA) {
+ if (!Bsd::libnuma_init()) {
+ UseNUMA = false;
+ } else {
+ if ((Bsd::numa_max_node() < 1)) {
+ // There's only one node(they start from 0), disable NUMA.
+ UseNUMA = false;
+ }
+ }
+ // With SHM large pages we cannot uncommit a page, so there's not way
+ // we can make the adaptive lgrp chunk resizing work. If the user specified
+ // both UseNUMA and UseLargePages (or UseSHM) on the command line - warn and
+ // disable adaptive resizing.
+ if (UseNUMA && UseLargePages && UseSHM) {
+ if (!FLAG_IS_DEFAULT(UseNUMA)) {
+ if (FLAG_IS_DEFAULT(UseLargePages) && FLAG_IS_DEFAULT(UseSHM)) {
+ UseLargePages = false;
+ } else {
+ warning("UseNUMA is not fully compatible with SHM large pages, disabling adaptive resizing");
+ UseAdaptiveSizePolicy = false;
+ UseAdaptiveNUMAChunkSizing = false;
+ }
+ } else {
+ UseNUMA = false;
+ }
+ }
+ if (!UseNUMA && ForceNUMA) {
+ UseNUMA = true;
+ }
+ }
+#endif
+
+ if (MaxFDLimit) {
+ // set the number of file descriptors to max. print out error
+ // if getrlimit/setrlimit fails but continue regardless.
+ struct rlimit nbr_files;
+ int status = getrlimit(RLIMIT_NOFILE, &nbr_files);
+ if (status != 0) {
+ if (PrintMiscellaneous && (Verbose || WizardMode))
+ perror("os::init_2 getrlimit failed");
+ } else {
+ nbr_files.rlim_cur = nbr_files.rlim_max;
+
+#ifdef __APPLE__
+ // Darwin returns RLIM_INFINITY for rlim_max, but fails with EINVAL if
+ // you attempt to use RLIM_INFINITY. As per setrlimit(2), OPEN_MAX must
+ // be used instead
+ nbr_files.rlim_cur = MIN(OPEN_MAX, nbr_files.rlim_cur);
+#endif
+
+ status = setrlimit(RLIMIT_NOFILE, &nbr_files);
+ if (status != 0) {
+ if (PrintMiscellaneous && (Verbose || WizardMode))
+ perror("os::init_2 setrlimit failed");
+ }
+ }
+ }
+
+#ifndef _ALLBSD_SOURCE
+ // Initialize lock used to serialize thread creation (see os::create_thread)
+ Bsd::set_createThread_lock(new Mutex(Mutex::leaf, "createThread_lock", false));
+#endif
+
+ // at-exit methods are called in the reverse order of their registration.
+ // atexit functions are called on return from main or as a result of a
+ // call to exit(3C). There can be only 32 of these functions registered
+ // and atexit() does not set errno.
+
+ if (PerfAllowAtExitRegistration) {
+ // only register atexit functions if PerfAllowAtExitRegistration is set.
+ // atexit functions can be delayed until process exit time, which
+ // can be problematic for embedded VM situations. Embedded VMs should
+ // call DestroyJavaVM() to assure that VM resources are released.
+
+ // note: perfMemory_exit_helper atexit function may be removed in
+ // the future if the appropriate cleanup code can be added to the
+ // VM_Exit VMOperation's doit method.
+ if (atexit(perfMemory_exit_helper) != 0) {
+ warning("os::init2 atexit(perfMemory_exit_helper) failed");
+ }
+ }
+
+ // initialize thread priority policy
+ prio_init();
+
+ return JNI_OK;
+}
+
+// this is called at the end of vm_initialization
+void os::init_3(void) { }
+
+// Mark the polling page as unreadable
+void os::make_polling_page_unreadable(void) {
+ if( !guard_memory((char*)_polling_page, Bsd::page_size()) )
+ fatal("Could not disable polling page");
+};
+
+// Mark the polling page as readable
+void os::make_polling_page_readable(void) {
+ if( !bsd_mprotect((char *)_polling_page, Bsd::page_size(), PROT_READ)) {
+ fatal("Could not enable polling page");
+ }
+};
+
+int os::active_processor_count() {
+#ifdef _ALLBSD_SOURCE
+ return _processor_count;
+#else
+ // Bsd doesn't yet have a (official) notion of processor sets,
+ // so just return the number of online processors.
+ int online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN);
+ assert(online_cpus > 0 && online_cpus <= processor_count(), "sanity check");
+ return online_cpus;
+#endif
+}
+
+bool os::distribute_processes(uint length, uint* distribution) {
+ // Not yet implemented.
+ return false;
+}
+
+bool os::bind_to_processor(uint processor_id) {
+ // Not yet implemented.
+ return false;
+}
+
+///
+
+// Suspends the target using the signal mechanism and then grabs the PC before
+// resuming the target. Used by the flat-profiler only
+ExtendedPC os::get_thread_pc(Thread* thread) {
+ // Make sure that it is called by the watcher for the VMThread
+ assert(Thread::current()->is_Watcher_thread(), "Must be watcher");
+ assert(thread->is_VM_thread(), "Can only be called for VMThread");
+
+ ExtendedPC epc;
+
+ OSThread* osthread = thread->osthread();
+ if (do_suspend(osthread)) {
+ if (osthread->ucontext() != NULL) {
+ epc = os::Bsd::ucontext_get_pc(osthread->ucontext());
+ } else {
+ // NULL context is unexpected, double-check this is the VMThread
+ guarantee(thread->is_VM_thread(), "can only be called for VMThread");
+ }
+ do_resume(osthread);
+ }
+ // failure means pthread_kill failed for some reason - arguably this is
+ // a fatal problem, but such problems are ignored elsewhere
+
+ return epc;
+}
+
+int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
+{
+#ifdef _ALLBSD_SOURCE
+ return pthread_cond_timedwait(_cond, _mutex, _abstime);
+#else
+ if (is_NPTL()) {
+ return pthread_cond_timedwait(_cond, _mutex, _abstime);
+ } else {
+#ifndef IA64
+ // 6292965: BsdThreads pthread_cond_timedwait() resets FPU control
+ // word back to default 64bit precision if condvar is signaled. Java
+ // wants 53bit precision. Save and restore current value.
+ int fpu = get_fpu_control_word();
+#endif // IA64
+ int status = pthread_cond_timedwait(_cond, _mutex, _abstime);
+#ifndef IA64
+ set_fpu_control_word(fpu);
+#endif // IA64
+ return status;
+ }
+#endif
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// debug support
+
+static address same_page(address x, address y) {
+ int page_bits = -os::vm_page_size();
+ if ((intptr_t(x) & page_bits) == (intptr_t(y) & page_bits))
+ return x;
+ else if (x > y)
+ return (address)(intptr_t(y) | ~page_bits) + 1;
+ else
+ return (address)(intptr_t(y) & page_bits);
+}
+
+bool os::find(address addr, outputStream* st) {
+ Dl_info dlinfo;
+ memset(&dlinfo, 0, sizeof(dlinfo));
+ if (dladdr(addr, &dlinfo)) {
+ st->print(PTR_FORMAT ": ", addr);
+ if (dlinfo.dli_sname != NULL) {
+ st->print("%s+%#x", dlinfo.dli_sname,
+ addr - (intptr_t)dlinfo.dli_saddr);
+ } else if (dlinfo.dli_fname) {
+ st->print("<offset %#x>", addr - (intptr_t)dlinfo.dli_fbase);
+ } else {
+ st->print("<absolute address>");
+ }
+ if (dlinfo.dli_fname) {
+ st->print(" in %s", dlinfo.dli_fname);
+ }
+ if (dlinfo.dli_fbase) {
+ st->print(" at " PTR_FORMAT, dlinfo.dli_fbase);
+ }
+ st->cr();
+
+ if (Verbose) {
+ // decode some bytes around the PC
+ address begin = same_page(addr-40, addr);
+ address end = same_page(addr+40, addr);
+ address lowest = (address) dlinfo.dli_sname;
+ if (!lowest) lowest = (address) dlinfo.dli_fbase;
+ if (begin < lowest) begin = lowest;
+ Dl_info dlinfo2;
+ if (dladdr(end, &dlinfo2) && dlinfo2.dli_saddr != dlinfo.dli_saddr
+ && end > dlinfo2.dli_saddr && dlinfo2.dli_saddr > begin)
+ end = (address) dlinfo2.dli_saddr;
+ Disassembler::decode(begin, end, st);
+ }
+ return true;
+ }
+ return false;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// misc
+
+// This does not do anything on Bsd. This is basically a hook for being
+// able to use structured exception handling (thread-local exception filters)
+// on, e.g., Win32.
+void
+os::os_exception_wrapper(java_call_t f, JavaValue* value, methodHandle* method,
+ JavaCallArguments* args, Thread* thread) {
+ f(value, method, args, thread);
+}
+
+void os::print_statistics() {
+}
+
+int os::message_box(const char* title, const char* message) {
+ int i;
+ fdStream err(defaultStream::error_fd());
+ for (i = 0; i < 78; i++) err.print_raw("=");
+ err.cr();
+ err.print_raw_cr(title);
+ for (i = 0; i < 78; i++) err.print_raw("-");
+ err.cr();
+ err.print_raw_cr(message);
+ for (i = 0; i < 78; i++) err.print_raw("=");
+ err.cr();
+
+ char buf[16];
+ // Prevent process from exiting upon "read error" without consuming all CPU
+ while (::read(0, buf, sizeof(buf)) <= 0) { ::sleep(100); }
+
+ return buf[0] == 'y' || buf[0] == 'Y';
+}
+
+int os::stat(const char *path, struct stat *sbuf) {
+ char pathbuf[MAX_PATH];
+ if (strlen(path) > MAX_PATH - 1) {
+ errno = ENAMETOOLONG;
+ return -1;
+ }
+ os::native_path(strcpy(pathbuf, path));
+ return ::stat(pathbuf, sbuf);
+}
+
+bool os::check_heap(bool force) {
+ return true;
+}
+
+int local_vsnprintf(char* buf, size_t count, const char* format, va_list args) {
+ return ::vsnprintf(buf, count, format, args);
+}
+
+// Is a (classpath) directory empty?
+bool os::dir_is_empty(const char* path) {
+ DIR *dir = NULL;
+ struct dirent *ptr;
+
+ dir = opendir(path);
+ if (dir == NULL) return true;
+
+ /* Scan the directory */
+ bool result = true;
+ char buf[sizeof(struct dirent) + MAX_PATH];
+ while (result && (ptr = ::readdir(dir)) != NULL) {
+ if (strcmp(ptr->d_name, ".") != 0 && strcmp(ptr->d_name, "..") != 0) {
+ result = false;
+ }
+ }
+ closedir(dir);
+ return result;
+}
+
+// This code originates from JDK's sysOpen and open64_w
+// from src/solaris/hpi/src/system_md.c
+
+#ifndef O_DELETE
+#define O_DELETE 0x10000
+#endif
+
+// Open a file. Unlink the file immediately after open returns
+// if the specified oflag has the O_DELETE flag set.
+// O_DELETE is used only in j2se/src/share/native/java/util/zip/ZipFile.c
+
+int os::open(const char *path, int oflag, int mode) {
+
+ if (strlen(path) > MAX_PATH - 1) {
+ errno = ENAMETOOLONG;
+ return -1;
+ }
+ int fd;
+ int o_delete = (oflag & O_DELETE);
+ oflag = oflag & ~O_DELETE;
+
+ fd = ::open(path, oflag, mode);
+ if (fd == -1) return -1;
+
+ //If the open succeeded, the file might still be a directory
+ {
+ struct stat buf;
+ int ret = ::fstat(fd, &buf);
+ int st_mode = buf.st_mode;
+
+ if (ret != -1) {
+ if ((st_mode & S_IFMT) == S_IFDIR) {
+ errno = EISDIR;
+ ::close(fd);
+ return -1;
+ }
+ } else {
+ ::close(fd);
+ return -1;
+ }
+ }
+
+ /*
+ * All file descriptors that are opened in the JVM and not
+ * specifically destined for a subprocess should have the
+ * close-on-exec flag set. If we don't set it, then careless 3rd
+ * party native code might fork and exec without closing all
+ * appropriate file descriptors (e.g. as we do in closeDescriptors in
+ * UNIXProcess.c), and this in turn might:
+ *
+ * - cause end-of-file to fail to be detected on some file
+ * descriptors, resulting in mysterious hangs, or
+ *
+ * - might cause an fopen in the subprocess to fail on a system
+ * suffering from bug 1085341.
+ *
+ * (Yes, the default setting of the close-on-exec flag is a Unix
+ * design flaw)
+ *
+ * See:
+ * 1085341: 32-bit stdio routines should support file descriptors >255
+ * 4843136: (process) pipe file descriptor from Runtime.exec not being closed
+ * 6339493: (process) Runtime.exec does not close all file descriptors on Solaris 9
+ */
+#ifdef FD_CLOEXEC
+ {
+ int flags = ::fcntl(fd, F_GETFD);
+ if (flags != -1)
+ ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+ }
+#endif
+
+ if (o_delete != 0) {
+ ::unlink(path);
+ }
+ return fd;
+}
+
+
+// create binary file, rewriting existing file if required
+int os::create_binary_file(const char* path, bool rewrite_existing) {
+ int oflags = O_WRONLY | O_CREAT;
+ if (!rewrite_existing) {
+ oflags |= O_EXCL;
+ }
+ return ::open(path, oflags, S_IREAD | S_IWRITE);
+}
+
+// return current position of file pointer
+jlong os::current_file_offset(int fd) {
+ return (jlong)::lseek(fd, (off_t)0, SEEK_CUR);
+}
+
+// move file pointer to the specified offset
+jlong os::seek_to_file_offset(int fd, jlong offset) {
+ return (jlong)::lseek(fd, (off_t)offset, SEEK_SET);
+}
+
+// This code originates from JDK's sysAvailable
+// from src/solaris/hpi/src/native_threads/src/sys_api_td.c
+
+int os::available(int fd, jlong *bytes) {
+ jlong cur, end;
+ int mode;
+ struct stat buf;
+
+ if (::fstat(fd, &buf) >= 0) {
+ mode = buf.st_mode;
+ if (S_ISCHR(mode) || S_ISFIFO(mode) || S_ISSOCK(mode)) {
+ /*
+ * XXX: is the following call interruptible? If so, this might
+ * need to go through the INTERRUPT_IO() wrapper as for other
+ * blocking, interruptible calls in this file.
+ */
+ int n;
+ if (::ioctl(fd, FIONREAD, &n) >= 0) {
+ *bytes = n;
+ return 1;
+ }
+ }
+ }
+ if ((cur = ::lseek(fd, 0L, SEEK_CUR)) == -1) {
+ return 0;
+ } else if ((end = ::lseek(fd, 0L, SEEK_END)) == -1) {
+ return 0;
+ } else if (::lseek(fd, cur, SEEK_SET) == -1) {
+ return 0;
+ }
+ *bytes = end - cur;
+ return 1;
+}
+
+int os::socket_available(int fd, jint *pbytes) {
+ if (fd < 0)
+ return OS_OK;
+
+ int ret;
+
+ RESTARTABLE(::ioctl(fd, FIONREAD, pbytes), ret);
+
+ //%% note ioctl can return 0 when successful, JVM_SocketAvailable
+ // is expected to return 0 on failure and 1 on success to the jdk.
+
+ return (ret == OS_ERR) ? 0 : 1;
+}
+
+// Map a block of memory.
+char* os::map_memory(int fd, const char* file_name, size_t file_offset,
+ char *addr, size_t bytes, bool read_only,
+ bool allow_exec) {
+ int prot;
+ int flags;
+
+ if (read_only) {
+ prot = PROT_READ;
+ flags = MAP_SHARED;
+ } else {
+ prot = PROT_READ | PROT_WRITE;
+ flags = MAP_PRIVATE;
+ }
+
+ if (allow_exec) {
+ prot |= PROT_EXEC;
+ }
+
+ if (addr != NULL) {
+ flags |= MAP_FIXED;
+ }
+
+ char* mapped_address = (char*)mmap(addr, (size_t)bytes, prot, flags,
+ fd, file_offset);
+ if (mapped_address == MAP_FAILED) {
+ return NULL;
+ }
+ return mapped_address;
+}
+
+
+// Remap a block of memory.
+char* os::remap_memory(int fd, const char* file_name, size_t file_offset,
+ char *addr, size_t bytes, bool read_only,
+ bool allow_exec) {
+ // same as map_memory() on this OS
+ return os::map_memory(fd, file_name, file_offset, addr, bytes, read_only,
+ allow_exec);
+}
+
+
+// Unmap a block of memory.
+bool os::unmap_memory(char* addr, size_t bytes) {
+ return munmap(addr, bytes) == 0;
+}
+
+#ifndef _ALLBSD_SOURCE
+static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
+
+static clockid_t thread_cpu_clockid(Thread* thread) {
+ pthread_t tid = thread->osthread()->pthread_id();
+ clockid_t clockid;
+
+ // Get thread clockid
+ int rc = os::Bsd::pthread_getcpuclockid(tid, &clockid);
+ assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
+ return clockid;
+}
+#endif
+
+// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
+// are used by JVM M&M and JVMTI to get user+sys or user CPU time
+// of a thread.
+//
+// current_thread_cpu_time() and thread_cpu_time(Thread*) returns
+// the fast estimate available on the platform.
+
+jlong os::current_thread_cpu_time() {
+#ifdef __APPLE__
+ return os::thread_cpu_time(Thread::current(), true /* user + sys */);
+#elif !defined(_ALLBSD_SOURCE)
+ if (os::Bsd::supports_fast_thread_cpu_time()) {
+ return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
+ } else {
+ // return user + sys since the cost is the same
+ return slow_thread_cpu_time(Thread::current(), true /* user + sys */);
+ }
+#endif
+}
+
+jlong os::thread_cpu_time(Thread* thread) {
+#ifndef _ALLBSD_SOURCE
+ // consistent with what current_thread_cpu_time() returns
+ if (os::Bsd::supports_fast_thread_cpu_time()) {
+ return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread));
+ } else {
+ return slow_thread_cpu_time(thread, true /* user + sys */);
+ }
+#endif
+}
+
+jlong os::current_thread_cpu_time(bool user_sys_cpu_time) {
+#ifdef __APPLE__
+ return os::thread_cpu_time(Thread::current(), user_sys_cpu_time);
+#elif !defined(_ALLBSD_SOURCE)
+ if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) {
+ return os::Bsd::fast_thread_cpu_time(CLOCK_THREAD_CPUTIME_ID);
+ } else {
+ return slow_thread_cpu_time(Thread::current(), user_sys_cpu_time);
+ }
+#endif
+}
+
+jlong os::thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
+#ifdef __APPLE__
+ struct thread_basic_info tinfo;
+ mach_msg_type_number_t tcount = THREAD_INFO_MAX;
+ kern_return_t kr;
+ mach_port_t mach_thread;
+
+ mach_thread = pthread_mach_thread_np(thread->osthread()->thread_id());
+ kr = thread_info(mach_thread, THREAD_BASIC_INFO, (thread_info_t)&tinfo, &tcount);
+ if (kr != KERN_SUCCESS)
+ return -1;
+
+ if (user_sys_cpu_time) {
+ jlong nanos;
+ nanos = ((jlong) tinfo.system_time.seconds + tinfo.user_time.seconds) * (jlong)1000000000;
+ nanos += ((jlong) tinfo.system_time.microseconds + (jlong) tinfo.user_time.microseconds) * (jlong)1000;
+ return nanos;
+ } else {
+ return ((jlong)tinfo.user_time.seconds * 1000000000) + ((jlong)tinfo.user_time.microseconds * (jlong)1000);
+ }
+#elif !defined(_ALLBSD_SOURCE)
+ if (user_sys_cpu_time && os::Bsd::supports_fast_thread_cpu_time()) {
+ return os::Bsd::fast_thread_cpu_time(thread_cpu_clockid(thread));
+ } else {
+ return slow_thread_cpu_time(thread, user_sys_cpu_time);
+ }
+#endif
+}
+
+#ifndef _ALLBSD_SOURCE
+//
+// -1 on error.
+//
+
+static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time) {
+ static bool proc_pid_cpu_avail = true;
+ static bool proc_task_unchecked = true;
+ static const char *proc_stat_path = "/proc/%d/stat";
+ pid_t tid = thread->osthread()->thread_id();
+ int i;
+ char *s;
+ char stat[2048];
+ int statlen;
+ char proc_name[64];
+ int count;
+ long sys_time, user_time;
+ char string[64];
+ char cdummy;
+ int idummy;
+ long ldummy;
+ FILE *fp;
+
+ // We first try accessing /proc/<pid>/cpu since this is faster to
+ // process. If this file is not present (bsd kernels 2.5 and above)
+ // then we open /proc/<pid>/stat.
+ if ( proc_pid_cpu_avail ) {
+ sprintf(proc_name, "/proc/%d/cpu", tid);
+ fp = fopen(proc_name, "r");
+ if ( fp != NULL ) {
+ count = fscanf( fp, "%s %lu %lu\n", string, &user_time, &sys_time);
+ fclose(fp);
+ if ( count != 3 ) return -1;
+
+ if (user_sys_cpu_time) {
+ return ((jlong)sys_time + (jlong)user_time) * (1000000000 / clock_tics_per_sec);
+ } else {
+ return (jlong)user_time * (1000000000 / clock_tics_per_sec);
+ }
+ }
+ else proc_pid_cpu_avail = false;
+ }
+
+ // The /proc/<tid>/stat aggregates per-process usage on
+ // new Bsd kernels 2.6+ where NPTL is supported.
+ // The /proc/self/task/<tid>/stat still has the per-thread usage.
+ // See bug 6328462.
+ // There can be no directory /proc/self/task on kernels 2.4 with NPTL
+ // and possibly in some other cases, so we check its availability.
+ if (proc_task_unchecked && os::Bsd::is_NPTL()) {
+ // This is executed only once
+ proc_task_unchecked = false;
+ fp = fopen("/proc/self/task", "r");
+ if (fp != NULL) {
+ proc_stat_path = "/proc/self/task/%d/stat";
+ fclose(fp);
+ }
+ }
+
+ sprintf(proc_name, proc_stat_path, tid);
+ fp = fopen(proc_name, "r");
+ if ( fp == NULL ) return -1;
+ statlen = fread(stat, 1, 2047, fp);
+ stat[statlen] = '\0';
+ fclose(fp);
+
+ // Skip pid and the command string. Note that we could be dealing with
+ // weird command names, e.g. user could decide to rename java launcher
+ // to "java 1.4.2 :)", then the stat file would look like
+ // 1234 (java 1.4.2 :)) R ... ...
+ // We don't really need to know the command string, just find the last
+ // occurrence of ")" and then start parsing from there. See bug 4726580.
+ s = strrchr(stat, ')');
+ i = 0;
+ if (s == NULL ) return -1;
+
+ // Skip blank chars
+ do s++; while (isspace(*s));
+
+ count = sscanf(s,"%c %d %d %d %d %d %lu %lu %lu %lu %lu %lu %lu",
+ &cdummy, &idummy, &idummy, &idummy, &idummy, &idummy,
+ &ldummy, &ldummy, &ldummy, &ldummy, &ldummy,
+ &user_time, &sys_time);
+ if ( count != 13 ) return -1;
+ if (user_sys_cpu_time) {
+ return ((jlong)sys_time + (jlong)user_time) * (1000000000 / clock_tics_per_sec);
+ } else {
+ return (jlong)user_time * (1000000000 / clock_tics_per_sec);
+ }
+}
+#endif
+
+void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
+ info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
+ info_ptr->may_skip_backward = false; // elapsed time not wall time
+ info_ptr->may_skip_forward = false; // elapsed time not wall time
+ info_ptr->kind = JVMTI_TIMER_TOTAL_CPU; // user+system time is returned
+}
+
+void os::thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
+ info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
+ info_ptr->may_skip_backward = false; // elapsed time not wall time
+ info_ptr->may_skip_forward = false; // elapsed time not wall time
+ info_ptr->kind = JVMTI_TIMER_TOTAL_CPU; // user+system time is returned
+}
+
+bool os::is_thread_cpu_time_supported() {
+#ifdef __APPLE__
+ return true;
+#elif defined(_ALLBSD_SOURCE)
+ return false;
+#else
+ return true;
+#endif
+}
+
+// System loadavg support. Returns -1 if load average cannot be obtained.
+// Bsd doesn't yet have a (official) notion of processor sets,
+// so just return the system wide load average.
+int os::loadavg(double loadavg[], int nelem) {
+ return ::getloadavg(loadavg, nelem);
+}
+
+void os::pause() {
+ char filename[MAX_PATH];
+ if (PauseAtStartupFile && PauseAtStartupFile[0]) {
+ jio_snprintf(filename, MAX_PATH, PauseAtStartupFile);
+ } else {
+ jio_snprintf(filename, MAX_PATH, "./vm.paused.%d", current_process_id());
+ }
+
+ int fd = ::open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+ if (fd != -1) {
+ struct stat buf;
+ ::close(fd);
+ while (::stat(filename, &buf) == 0) {
+ (void)::poll(NULL, 0, 100);
+ }
+ } else {
+ jio_fprintf(stderr,
+ "Could not open pause file '%s', continuing immediately.\n", filename);
+ }
+}
+
+
+// Refer to the comments in os_solaris.cpp park-unpark.
+//
+// Beware -- Some versions of NPTL embody a flaw where pthread_cond_timedwait() can
+// hang indefinitely. For instance NPTL 0.60 on 2.4.21-4ELsmp is vulnerable.
+// For specifics regarding the bug see GLIBC BUGID 261237 :
+// http://www.mail-archive.com/debian-glibc@lists.debian.org/msg10837.html.
+// Briefly, pthread_cond_timedwait() calls with an expiry time that's not in the future
+// will either hang or corrupt the condvar, resulting in subsequent hangs if the condvar
+// is used. (The simple C test-case provided in the GLIBC bug report manifests the
+// hang). The JVM is vulernable via sleep(), Object.wait(timo), LockSupport.parkNanos()
+// and monitorenter when we're using 1-0 locking. All those operations may result in
+// calls to pthread_cond_timedwait(). Using LD_ASSUME_KERNEL to use an older version
+// of libpthread avoids the problem, but isn't practical.
+//
+// Possible remedies:
+//
+// 1. Establish a minimum relative wait time. 50 to 100 msecs seems to work.
+// This is palliative and probabilistic, however. If the thread is preempted
+// between the call to compute_abstime() and pthread_cond_timedwait(), more
+// than the minimum period may have passed, and the abstime may be stale (in the
+// past) resultin in a hang. Using this technique reduces the odds of a hang
+// but the JVM is still vulnerable, particularly on heavily loaded systems.
+//
+// 2. Modify park-unpark to use per-thread (per ParkEvent) pipe-pairs instead
+// of the usual flag-condvar-mutex idiom. The write side of the pipe is set
+// NDELAY. unpark() reduces to write(), park() reduces to read() and park(timo)
+// reduces to poll()+read(). This works well, but consumes 2 FDs per extant
+// thread.
+//
+// 3. Embargo pthread_cond_timedwait() and implement a native "chron" thread
+// that manages timeouts. We'd emulate pthread_cond_timedwait() by enqueuing
+// a timeout request to the chron thread and then blocking via pthread_cond_wait().
+// This also works well. In fact it avoids kernel-level scalability impediments
+// on certain platforms that don't handle lots of active pthread_cond_timedwait()
+// timers in a graceful fashion.
+//
+// 4. When the abstime value is in the past it appears that control returns
+// correctly from pthread_cond_timedwait(), but the condvar is left corrupt.
+// Subsequent timedwait/wait calls may hang indefinitely. Given that, we
+// can avoid the problem by reinitializing the condvar -- by cond_destroy()
+// followed by cond_init() -- after all calls to pthread_cond_timedwait().
+// It may be possible to avoid reinitialization by checking the return
+// value from pthread_cond_timedwait(). In addition to reinitializing the
+// condvar we must establish the invariant that cond_signal() is only called
+// within critical sections protected by the adjunct mutex. This prevents
+// cond_signal() from "seeing" a condvar that's in the midst of being
+// reinitialized or that is corrupt. Sadly, this invariant obviates the
+// desirable signal-after-unlock optimization that avoids futile context switching.
+//
+// I'm also concerned that some versions of NTPL might allocate an auxilliary
+// structure when a condvar is used or initialized. cond_destroy() would
+// release the helper structure. Our reinitialize-after-timedwait fix
+// put excessive stress on malloc/free and locks protecting the c-heap.
+//
+// We currently use (4). See the WorkAroundNTPLTimedWaitHang flag.
+// It may be possible to refine (4) by checking the kernel and NTPL verisons
+// and only enabling the work-around for vulnerable environments.
+
+// utility to compute the abstime argument to timedwait:
+// millis is the relative timeout time
+// abstime will be the absolute timeout time
+// TODO: replace compute_abstime() with unpackTime()
+
+static struct timespec* compute_abstime(struct timespec* abstime, jlong millis) {
+ if (millis < 0) millis = 0;
+ struct timeval now;
+ int status = gettimeofday(&now, NULL);
+ assert(status == 0, "gettimeofday");
+ jlong seconds = millis / 1000;
+ millis %= 1000;
+ if (seconds > 50000000) { // see man cond_timedwait(3T)
+ seconds = 50000000;
+ }
+ abstime->tv_sec = now.tv_sec + seconds;
+ long usec = now.tv_usec + millis * 1000;
+ if (usec >= 1000000) {
+ abstime->tv_sec += 1;
+ usec -= 1000000;
+ }
+ abstime->tv_nsec = usec * 1000;
+ return abstime;
+}
+
+
+// Test-and-clear _Event, always leaves _Event set to 0, returns immediately.
+// Conceptually TryPark() should be equivalent to park(0).
+
+int os::PlatformEvent::TryPark() {
+ for (;;) {
+ const int v = _Event ;
+ guarantee ((v == 0) || (v == 1), "invariant") ;
+ if (Atomic::cmpxchg (0, &_Event, v) == v) return v ;
+ }
+}
+
+void os::PlatformEvent::park() { // AKA "down()"
+ // Invariant: Only the thread associated with the Event/PlatformEvent
+ // may call park().
+ // TODO: assert that _Assoc != NULL or _Assoc == Self
+ int v ;
+ for (;;) {
+ v = _Event ;
+ if (Atomic::cmpxchg (v-1, &_Event, v) == v) break ;
+ }
+ guarantee (v >= 0, "invariant") ;
+ if (v == 0) {
+ // Do this the hard way by blocking ...
+ int status = pthread_mutex_lock(_mutex);
+ assert_status(status == 0, status, "mutex_lock");
+ guarantee (_nParked == 0, "invariant") ;
+ ++ _nParked ;
+ while (_Event < 0) {
+ status = pthread_cond_wait(_cond, _mutex);
+ // for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
+ // Treat this the same as if the wait was interrupted
+ if (status == ETIMEDOUT) { status = EINTR; }
+ assert_status(status == 0 || status == EINTR, status, "cond_wait");
+ }
+ -- _nParked ;
+
+ // In theory we could move the ST of 0 into _Event past the unlock(),
+ // but then we'd need a MEMBAR after the ST.
+ _Event = 0 ;
+ status = pthread_mutex_unlock(_mutex);
+ assert_status(status == 0, status, "mutex_unlock");
+ }
+ guarantee (_Event >= 0, "invariant") ;
+}
+
+int os::PlatformEvent::park(jlong millis) {
+ guarantee (_nParked == 0, "invariant") ;
+
+ int v ;
+ for (;;) {
+ v = _Event ;
+ if (Atomic::cmpxchg (v-1, &_Event, v) == v) break ;
+ }
+ guarantee (v >= 0, "invariant") ;
+ if (v != 0) return OS_OK ;
+
+ // We do this the hard way, by blocking the thread.
+ // Consider enforcing a minimum timeout value.
+ struct timespec abst;
+ compute_abstime(&abst, millis);
+
+ int ret = OS_TIMEOUT;
+ int status = pthread_mutex_lock(_mutex);
+ assert_status(status == 0, status, "mutex_lock");
+ guarantee (_nParked == 0, "invariant") ;
+ ++_nParked ;
+
+ // Object.wait(timo) will return because of
+ // (a) notification
+ // (b) timeout
+ // (c) thread.interrupt
+ //
+ // Thread.interrupt and object.notify{All} both call Event::set.
+ // That is, we treat thread.interrupt as a special case of notification.
+ // The underlying Solaris implementation, cond_timedwait, admits
+ // spurious/premature wakeups, but the JLS/JVM spec prevents the
+ // JVM from making those visible to Java code. As such, we must
+ // filter out spurious wakeups. We assume all ETIME returns are valid.
+ //
+ // TODO: properly differentiate simultaneous notify+interrupt.
+ // In that case, we should propagate the notify to another waiter.
+
+ while (_Event < 0) {
+ status = os::Bsd::safe_cond_timedwait(_cond, _mutex, &abst);
+ if (status != 0 && WorkAroundNPTLTimedWaitHang) {
+ pthread_cond_destroy (_cond);
+ pthread_cond_init (_cond, NULL) ;
+ }
+ assert_status(status == 0 || status == EINTR ||
+ status == ETIMEDOUT,
+ status, "cond_timedwait");
+ if (!FilterSpuriousWakeups) break ; // previous semantics
+ if (status == ETIMEDOUT) break ;
+ // We consume and ignore EINTR and spurious wakeups.
+ }
+ --_nParked ;
+ if (_Event >= 0) {
+ ret = OS_OK;
+ }
+ _Event = 0 ;
+ status = pthread_mutex_unlock(_mutex);
+ assert_status(status == 0, status, "mutex_unlock");
+ assert (_nParked == 0, "invariant") ;
+ return ret;
+}
+
+void os::PlatformEvent::unpark() {
+ int v, AnyWaiters ;
+ for (;;) {
+ v = _Event ;
+ if (v > 0) {
+ // The LD of _Event could have reordered or be satisfied
+ // by a read-aside from this processor's write buffer.
+ // To avoid problems execute a barrier and then
+ // ratify the value.
+ OrderAccess::fence() ;
+ if (_Event == v) return ;
+ continue ;
+ }
+ if (Atomic::cmpxchg (v+1, &_Event, v) == v) break ;
+ }
+ if (v < 0) {
+ // Wait for the thread associated with the event to vacate
+ int status = pthread_mutex_lock(_mutex);
+ assert_status(status == 0, status, "mutex_lock");
+ AnyWaiters = _nParked ;
+ assert (AnyWaiters == 0 || AnyWaiters == 1, "invariant") ;
+ if (AnyWaiters != 0 && WorkAroundNPTLTimedWaitHang) {
+ AnyWaiters = 0 ;
+ pthread_cond_signal (_cond);
+ }
+ status = pthread_mutex_unlock(_mutex);
+ assert_status(status == 0, status, "mutex_unlock");
+ if (AnyWaiters != 0) {
+ status = pthread_cond_signal(_cond);
+ assert_status(status == 0, status, "cond_signal");
+ }
+ }
+
+ // Note that we signal() _after dropping the lock for "immortal" Events.
+ // This is safe and avoids a common class of futile wakeups. In rare
+ // circumstances this can cause a thread to return prematurely from
+ // cond_{timed}wait() but the spurious wakeup is benign and the victim will
+ // simply re-test the condition and re-park itself.
+}
+
+
+// JSR166
+// -------------------------------------------------------
+
+/*
+ * The solaris and bsd implementations of park/unpark are fairly
+ * conservative for now, but can be improved. They currently use a
+ * mutex/condvar pair, plus a a count.
+ * Park decrements count if > 0, else does a condvar wait. Unpark
+ * sets count to 1 and signals condvar. Only one thread ever waits
+ * on the condvar. Contention seen when trying to park implies that someone
+ * is unparking you, so don't wait. And spurious returns are fine, so there
+ * is no need to track notifications.
+ */
+
+
+#define NANOSECS_PER_SEC 1000000000
+#define NANOSECS_PER_MILLISEC 1000000
+#define MAX_SECS 100000000
+/*
+ * This code is common to bsd and solaris and will be moved to a
+ * common place in dolphin.
+ *
+ * The passed in time value is either a relative time in nanoseconds
+ * or an absolute time in milliseconds. Either way it has to be unpacked
+ * into suitable seconds and nanoseconds components and stored in the
+ * given timespec structure.
+ * Given time is a 64-bit value and the time_t used in the timespec is only
+ * a signed-32-bit value (except on 64-bit Bsd) we have to watch for
+ * overflow if times way in the future are given. Further on Solaris versions
+ * prior to 10 there is a restriction (see cond_timedwait) that the specified
+ * number of seconds, in abstime, is less than current_time + 100,000,000.
+ * As it will be 28 years before "now + 100000000" will overflow we can
+ * ignore overflow and just impose a hard-limit on seconds using the value
+ * of "now + 100,000,000". This places a limit on the timeout of about 3.17
+ * years from "now".
+ */
+
+static void unpackTime(struct timespec* absTime, bool isAbsolute, jlong time) {
+ assert (time > 0, "convertTime");
+
+ struct timeval now;
+ int status = gettimeofday(&now, NULL);
+ assert(status == 0, "gettimeofday");
+
+ time_t max_secs = now.tv_sec + MAX_SECS;
+
+ if (isAbsolute) {
+ jlong secs = time / 1000;
+ if (secs > max_secs) {
+ absTime->tv_sec = max_secs;
+ }
+ else {
+ absTime->tv_sec = secs;
+ }
+ absTime->tv_nsec = (time % 1000) * NANOSECS_PER_MILLISEC;
+ }
+ else {
+ jlong secs = time / NANOSECS_PER_SEC;
+ if (secs >= MAX_SECS) {
+ absTime->tv_sec = max_secs;
+ absTime->tv_nsec = 0;
+ }
+ else {
+ absTime->tv_sec = now.tv_sec + secs;
+ absTime->tv_nsec = (time % NANOSECS_PER_SEC) + now.tv_usec*1000;
+ if (absTime->tv_nsec >= NANOSECS_PER_SEC) {
+ absTime->tv_nsec -= NANOSECS_PER_SEC;
+ ++absTime->tv_sec; // note: this must be <= max_secs
+ }
+ }
+ }
+ assert(absTime->tv_sec >= 0, "tv_sec < 0");
+ assert(absTime->tv_sec <= max_secs, "tv_sec > max_secs");
+ assert(absTime->tv_nsec >= 0, "tv_nsec < 0");
+ assert(absTime->tv_nsec < NANOSECS_PER_SEC, "tv_nsec >= nanos_per_sec");
+}
+
+void Parker::park(bool isAbsolute, jlong time) {
+ // Optional fast-path check:
+ // Return immediately if a permit is available.
+ if (_counter > 0) {
+ _counter = 0 ;
+ OrderAccess::fence();
+ return ;
+ }
+
+ Thread* thread = Thread::current();
+ assert(thread->is_Java_thread(), "Must be JavaThread");
+ JavaThread *jt = (JavaThread *)thread;
+
+ // Optional optimization -- avoid state transitions if there's an interrupt pending.
+ // Check interrupt before trying to wait
+ if (Thread::is_interrupted(thread, false)) {
+ return;
+ }
+
+ // Next, demultiplex/decode time arguments
+ struct timespec absTime;
+ if (time < 0 || (isAbsolute && time == 0) ) { // don't wait at all
+ return;
+ }
+ if (time > 0) {
+ unpackTime(&absTime, isAbsolute, time);
+ }
+
+
+ // Enter safepoint region
+ // Beware of deadlocks such as 6317397.
+ // The per-thread Parker:: mutex is a classic leaf-lock.
+ // In particular a thread must never block on the Threads_lock while
+ // holding the Parker:: mutex. If safepoints are pending both the
+ // the ThreadBlockInVM() CTOR and DTOR may grab Threads_lock.
+ ThreadBlockInVM tbivm(jt);
+
+ // Don't wait if cannot get lock since interference arises from
+ // unblocking. Also. check interrupt before trying wait
+ if (Thread::is_interrupted(thread, false) || pthread_mutex_trylock(_mutex) != 0) {
+ return;
+ }
+
+ int status ;
+ if (_counter > 0) { // no wait needed
+ _counter = 0;
+ status = pthread_mutex_unlock(_mutex);
+ assert (status == 0, "invariant") ;
+ OrderAccess::fence();
+ return;
+ }
+
+#ifdef ASSERT
+ // Don't catch signals while blocked; let the running threads have the signals.
+ // (This allows a debugger to break into the running thread.)
+ sigset_t oldsigs;
+ sigset_t* allowdebug_blocked = os::Bsd::allowdebug_blocked_signals();
+ pthread_sigmask(SIG_BLOCK, allowdebug_blocked, &oldsigs);
+#endif
+
+ OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */);
+ jt->set_suspend_equivalent();
+ // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
+
+ if (time == 0) {
+ status = pthread_cond_wait (_cond, _mutex) ;
+ } else {
+ status = os::Bsd::safe_cond_timedwait (_cond, _mutex, &absTime) ;
+ if (status != 0 && WorkAroundNPTLTimedWaitHang) {
+ pthread_cond_destroy (_cond) ;
+ pthread_cond_init (_cond, NULL);
+ }
+ }
+ assert_status(status == 0 || status == EINTR ||
+ status == ETIMEDOUT,
+ status, "cond_timedwait");
+
+#ifdef ASSERT
+ pthread_sigmask(SIG_SETMASK, &oldsigs, NULL);
+#endif
+
+ _counter = 0 ;
+ status = pthread_mutex_unlock(_mutex) ;
+ assert_status(status == 0, status, "invariant") ;
+ // If externally suspended while waiting, re-suspend
+ if (jt->handle_special_suspend_equivalent_condition()) {
+ jt->java_suspend_self();
+ }
+
+ OrderAccess::fence();
+}
+
+void Parker::unpark() {
+ int s, status ;
+ status = pthread_mutex_lock(_mutex);
+ assert (status == 0, "invariant") ;
+ s = _counter;
+ _counter = 1;
+ if (s < 1) {
+ if (WorkAroundNPTLTimedWaitHang) {
+ status = pthread_cond_signal (_cond) ;
+ assert (status == 0, "invariant") ;
+ status = pthread_mutex_unlock(_mutex);
+ assert (status == 0, "invariant") ;
+ } else {
+ status = pthread_mutex_unlock(_mutex);
+ assert (status == 0, "invariant") ;
+ status = pthread_cond_signal (_cond) ;
+ assert (status == 0, "invariant") ;
+ }
+ } else {
+ pthread_mutex_unlock(_mutex);
+ assert (status == 0, "invariant") ;
+ }
+}
+
+
+/* Darwin has no "environ" in a dynamic library. */
+#ifdef __APPLE__
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#else
+extern char** environ;
+#endif
+
+// Run the specified command in a separate process. Return its exit value,
+// or -1 on failure (e.g. can't fork a new process).
+// Unlike system(), this function can be called from signal handler. It
+// doesn't block SIGINT et al.
+int os::fork_and_exec(char* cmd) {
+ const char * argv[4] = {"sh", "-c", cmd, NULL};
+
+ // fork() in BsdThreads/NPTL is not async-safe. It needs to run
+ // pthread_atfork handlers and reset pthread library. All we need is a
+ // separate process to execve. Make a direct syscall to fork process.
+ // On IA64 there's no fork syscall, we have to use fork() and hope for
+ // the best...
+ pid_t pid = fork();
+
+ if (pid < 0) {
+ // fork failed
+ return -1;
+
+ } else if (pid == 0) {
+ // child process
+
+ // execve() in BsdThreads will call pthread_kill_other_threads_np()
+ // first to kill every thread on the thread list. Because this list is
+ // not reset by fork() (see notes above), execve() will instead kill
+ // every thread in the parent process. We know this is the only thread
+ // in the new process, so make a system call directly.
+ // IA64 should use normal execve() from glibc to match the glibc fork()
+ // above.
+ execve("/bin/sh", (char* const*)argv, environ);
+
+ // execve failed
+ _exit(-1);
+
+ } else {
+ // copied from J2SE ..._waitForProcessExit() in UNIXProcess_md.c; we don't
+ // care about the actual exit code, for now.
+
+ int status;
+
+ // Wait for the child process to exit. This returns immediately if
+ // the child has already exited. */
+ while (waitpid(pid, &status, 0) < 0) {
+ switch (errno) {
+ case ECHILD: return 0;
+ case EINTR: break;
+ default: return -1;
+ }
+ }
+
+ if (WIFEXITED(status)) {
+ // The child exited normally; get its exit code.
+ return WEXITSTATUS(status);
+ } else if (WIFSIGNALED(status)) {
+ // The child exited because of a signal
+ // The best value to return is 0x80 + signal number,
+ // because that is what all Unix shells do, and because
+ // it allows callers to distinguish between process exit and
+ // process death by signal.
+ return 0x80 + WTERMSIG(status);
+ } else {
+ // Unknown exit code; pass it through
+ return status;
+ }
+ }
+}
+
+// is_headless_jre()
+//
+// Test for the existence of libmawt in motif21 or xawt directories
+// in order to report if we are running in a headless jre
+//
+bool os::is_headless_jre() {
+ struct stat statbuf;
+ char buf[MAXPATHLEN];
+ char libmawtpath[MAXPATHLEN];
+ const char *xawtstr = "/xawt/libmawt.so";
+ const char *motifstr = "/motif21/libmawt.so";
+ char *p;
+
+ // Get path to libjvm.so
+ os::jvm_path(buf, sizeof(buf));
+
+ // Get rid of libjvm.so
+ p = strrchr(buf, '/');
+ if (p == NULL) return false;
+ else *p = '\0';
+
+ // Get rid of client or server
+ p = strrchr(buf, '/');
+ if (p == NULL) return false;
+ else *p = '\0';
+
+ // check xawt/libmawt.so
+ strcpy(libmawtpath, buf);
+ strcat(libmawtpath, xawtstr);
+ if (::stat(libmawtpath, &statbuf) == 0) return false;
+
+ // check motif21/libmawt.so
+ strcpy(libmawtpath, buf);
+ strcat(libmawtpath, motifstr);
+ if (::stat(libmawtpath, &statbuf) == 0) return false;
+
+ return true;
+}
diff --git a/hotspot/src/os/bsd/vm/os_bsd.hpp b/hotspot/src/os/bsd/vm/os_bsd.hpp
new file mode 100644
index 0000000..271d1e2
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/os_bsd.hpp
@@ -0,0 +1,368 @@
+/*
+ * Copyright (c) 1999, 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 OS_BSD_VM_OS_BSD_HPP
+#define OS_BSD_VM_OS_BSD_HPP
+
+// Bsd_OS defines the interface to Bsd operating systems
+
+/* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */
+typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *);
+
+#ifdef __APPLE__
+// Mac OS X doesn't support clock_gettime. Stub out the type, it is
+// unused
+typedef int clockid_t;
+#endif
+
+class Bsd {
+ friend class os;
+
+ // For signal-chaining
+#define MAXSIGNUM 32
+ static struct sigaction sigact[MAXSIGNUM]; // saved preinstalled sigactions
+ static unsigned int sigs; // mask of signals that have
+ // preinstalled signal handlers
+ static bool libjsig_is_loaded; // libjsig that interposes sigaction(),
+ // __sigaction(), signal() is loaded
+ static struct sigaction *(*get_signal_action)(int);
+ static struct sigaction *get_preinstalled_handler(int);
+ static void save_preinstalled_handler(int, struct sigaction&);
+
+ static void check_signal_handler(int sig);
+
+ // For signal flags diagnostics
+ static int sigflags[MAXSIGNUM];
+
+ static int (*_clock_gettime)(clockid_t, struct timespec *);
+#ifndef _ALLBSD_SOURCE
+ static int (*_pthread_getcpuclockid)(pthread_t, clockid_t *);
+
+ static address _initial_thread_stack_bottom;
+ static uintptr_t _initial_thread_stack_size;
+
+ static const char *_glibc_version;
+ static const char *_libpthread_version;
+
+ static bool _is_floating_stack;
+ static bool _is_NPTL;
+ static bool _supports_fast_thread_cpu_time;
+#endif
+
+ static GrowableArray<int>* _cpu_to_node;
+
+ protected:
+
+ static julong _physical_memory;
+ static pthread_t _main_thread;
+#ifndef _ALLBSD_SOURCE
+ static Mutex* _createThread_lock;
+#endif
+ static int _page_size;
+
+ static julong available_memory();
+ static julong physical_memory() { return _physical_memory; }
+ static void initialize_system_info();
+
+#ifndef _ALLBSD_SOURCE
+ static void set_glibc_version(const char *s) { _glibc_version = s; }
+ static void set_libpthread_version(const char *s) { _libpthread_version = s; }
+#endif
+
+ static bool supports_variable_stack_size();
+
+#ifndef _ALLBSD_SOURCE
+ static void set_is_NPTL() { _is_NPTL = true; }
+ static void set_is_BsdThreads() { _is_NPTL = false; }
+ static void set_is_floating_stack() { _is_floating_stack = true; }
+#endif
+
+ static void rebuild_cpu_to_node_map();
+ static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
+
+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
+
+ public:
+
+ static void init_thread_fpu_state();
+#ifndef _ALLBSD_SOURCE
+ static int get_fpu_control_word();
+ static void set_fpu_control_word(int fpu_control);
+#endif
+ static pthread_t main_thread(void) { return _main_thread; }
+
+#ifndef _ALLBSD_SOURCE
+ // returns kernel thread id (similar to LWP id on Solaris), which can be
+ // used to access /proc
+ static pid_t gettid();
+ static void set_createThread_lock(Mutex* lk) { _createThread_lock = lk; }
+ static Mutex* createThread_lock(void) { return _createThread_lock; }
+#endif
+ static void hotspot_sigmask(Thread* thread);
+
+#ifndef _ALLBSD_SOURCE
+ static address initial_thread_stack_bottom(void) { return _initial_thread_stack_bottom; }
+ static uintptr_t initial_thread_stack_size(void) { return _initial_thread_stack_size; }
+#endif
+ static bool is_initial_thread(void);
+
+ static int page_size(void) { return _page_size; }
+ static void set_page_size(int val) { _page_size = val; }
+
+ static address ucontext_get_pc(ucontext_t* uc);
+ static intptr_t* ucontext_get_sp(ucontext_t* uc);
+ static intptr_t* ucontext_get_fp(ucontext_t* uc);
+
+ // For Analyzer Forte AsyncGetCallTrace profiling support:
+ //
+ // This interface should be declared in os_bsd_i486.hpp, but
+ // that file provides extensions to the os class and not the
+ // Bsd class.
+ static ExtendedPC fetch_frame_from_ucontext(Thread* thread, ucontext_t* uc,
+ intptr_t** ret_sp, intptr_t** ret_fp);
+
+ // This boolean allows users to forward their own non-matching signals
+ // to JVM_handle_bsd_signal, harmlessly.
+ static bool signal_handlers_are_installed;
+
+ static int get_our_sigflags(int);
+ static void set_our_sigflags(int, int);
+ static void signal_sets_init();
+ static void install_signal_handlers();
+ static void set_signal_handler(int, bool);
+ static bool is_sig_ignored(int sig);
+
+ static sigset_t* unblocked_signals();
+ static sigset_t* vm_signals();
+ static sigset_t* allowdebug_blocked_signals();
+
+ // For signal-chaining
+ static struct sigaction *get_chained_signal_action(int sig);
+ static bool chained_handler(int sig, siginfo_t* siginfo, void* context);
+
+#ifndef _ALLBSD_SOURCE
+ // GNU libc and libpthread version strings
+ static const char *glibc_version() { return _glibc_version; }
+ static const char *libpthread_version() { return _libpthread_version; }
+
+ // NPTL or BsdThreads?
+ static bool is_BsdThreads() { return !_is_NPTL; }
+ static bool is_NPTL() { return _is_NPTL; }
+
+ // NPTL is always floating stack. BsdThreads could be using floating
+ // stack or fixed stack.
+ static bool is_floating_stack() { return _is_floating_stack; }
+
+ static void libpthread_init();
+ static bool libnuma_init();
+ static void* libnuma_dlsym(void* handle, const char* name);
+#endif
+ // Minimum stack size a thread can be created with (allowing
+ // the VM to completely create the thread and enter user code)
+ static size_t min_stack_allowed;
+
+ // Return default stack size or guard size for the specified thread type
+ static size_t default_stack_size(os::ThreadType thr_type);
+ static size_t default_guard_size(os::ThreadType thr_type);
+
+#ifndef _ALLBSD_SOURCE
+ static void capture_initial_stack(size_t max_size);
+
+ // Stack overflow handling
+ static bool manually_expand_stack(JavaThread * t, address addr);
+ static int max_register_window_saves_before_flushing();
+#endif
+
+ // Real-time clock functions
+ static void clock_init(void);
+
+#ifndef _ALLBSD_SOURCE
+ // fast POSIX clocks support
+ static void fast_thread_clock_init(void);
+#endif
+
+ static bool supports_monotonic_clock() {
+ return _clock_gettime != NULL;
+ }
+
+ static int clock_gettime(clockid_t clock_id, struct timespec *tp) {
+ return _clock_gettime ? _clock_gettime(clock_id, tp) : -1;
+ }
+
+#ifndef _ALLBSD_SOURCE
+ static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) {
+ return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1;
+ }
+
+ static bool supports_fast_thread_cpu_time() {
+ return _supports_fast_thread_cpu_time;
+ }
+
+ static jlong fast_thread_cpu_time(clockid_t clockid);
+#endif
+
+ // Stack repair handling
+
+ // none present
+
+ // BsdThreads work-around for 6292965
+ static int safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime);
+
+
+ // Bsd suspend/resume support - this helper is a shadow of its former
+ // self now that low-level suspension is barely used, and old workarounds
+ // for BsdThreads are no longer needed.
+ class SuspendResume {
+ private:
+ volatile int _suspend_action;
+ // values for suspend_action:
+ #define SR_NONE (0x00)
+ #define SR_SUSPEND (0x01) // suspend request
+ #define SR_CONTINUE (0x02) // resume request
+
+ volatile jint _state;
+ // values for _state: + SR_NONE
+ #define SR_SUSPENDED (0x20)
+ public:
+ SuspendResume() { _suspend_action = SR_NONE; _state = SR_NONE; }
+
+ int suspend_action() const { return _suspend_action; }
+ void set_suspend_action(int x) { _suspend_action = x; }
+
+ // atomic updates for _state
+ void set_suspended() {
+ jint temp, temp2;
+ do {
+ temp = _state;
+ temp2 = Atomic::cmpxchg(temp | SR_SUSPENDED, &_state, temp);
+ } while (temp2 != temp);
+ }
+ void clear_suspended() {
+ jint temp, temp2;
+ do {
+ temp = _state;
+ temp2 = Atomic::cmpxchg(temp & ~SR_SUSPENDED, &_state, temp);
+ } while (temp2 != temp);
+ }
+ bool is_suspended() { return _state & SR_SUSPENDED; }
+
+ #undef SR_SUSPENDED
+ };
+
+private:
+ typedef int (*sched_getcpu_func_t)(void);
+ typedef int (*numa_node_to_cpus_func_t)(int node, unsigned long *buffer, int bufferlen);
+ typedef int (*numa_max_node_func_t)(void);
+ typedef int (*numa_available_func_t)(void);
+ typedef int (*numa_tonode_memory_func_t)(void *start, size_t size, int node);
+ typedef void (*numa_interleave_memory_func_t)(void *start, size_t size, unsigned long *nodemask);
+
+ static sched_getcpu_func_t _sched_getcpu;
+ static numa_node_to_cpus_func_t _numa_node_to_cpus;
+ static numa_max_node_func_t _numa_max_node;
+ static numa_available_func_t _numa_available;
+ static numa_tonode_memory_func_t _numa_tonode_memory;
+ static numa_interleave_memory_func_t _numa_interleave_memory;
+ static unsigned long* _numa_all_nodes;
+
+ static void set_sched_getcpu(sched_getcpu_func_t func) { _sched_getcpu = func; }
+ static void set_numa_node_to_cpus(numa_node_to_cpus_func_t func) { _numa_node_to_cpus = func; }
+ static void set_numa_max_node(numa_max_node_func_t func) { _numa_max_node = func; }
+ static void set_numa_available(numa_available_func_t func) { _numa_available = func; }
+ static void set_numa_tonode_memory(numa_tonode_memory_func_t func) { _numa_tonode_memory = func; }
+ static void set_numa_interleave_memory(numa_interleave_memory_func_t func) { _numa_interleave_memory = func; }
+ static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }
+public:
+ static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; }
+ static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
+ return _numa_node_to_cpus != NULL ? _numa_node_to_cpus(node, buffer, bufferlen) : -1;
+ }
+ static int numa_max_node() { return _numa_max_node != NULL ? _numa_max_node() : -1; }
+ static int numa_available() { return _numa_available != NULL ? _numa_available() : -1; }
+ static int numa_tonode_memory(void *start, size_t size, int node) {
+ return _numa_tonode_memory != NULL ? _numa_tonode_memory(start, size, node) : -1;
+ }
+ static void numa_interleave_memory(void *start, size_t size) {
+ if (_numa_interleave_memory != NULL && _numa_all_nodes != NULL) {
+ _numa_interleave_memory(start, size, _numa_all_nodes);
+ }
+ }
+ static int get_node_by_cpu(int cpu_id);
+};
+
+
+class PlatformEvent : public CHeapObj {
+ private:
+ double CachePad [4] ; // increase odds that _mutex is sole occupant of cache line
+ volatile int _Event ;
+ volatile int _nParked ;
+ pthread_mutex_t _mutex [1] ;
+ pthread_cond_t _cond [1] ;
+ double PostPad [2] ;
+ Thread * _Assoc ;
+
+ public: // TODO-FIXME: make dtor private
+ ~PlatformEvent() { guarantee (0, "invariant") ; }
+
+ public:
+ PlatformEvent() {
+ int status;
+ status = pthread_cond_init (_cond, NULL);
+ assert_status(status == 0, status, "cond_init");
+ status = pthread_mutex_init (_mutex, NULL);
+ assert_status(status == 0, status, "mutex_init");
+ _Event = 0 ;
+ _nParked = 0 ;
+ _Assoc = NULL ;
+ }
+
+ // Use caution with reset() and fired() -- they may require MEMBARs
+ void reset() { _Event = 0 ; }
+ int fired() { return _Event; }
+ void park () ;
+ void unpark () ;
+ int TryPark () ;
+ int park (jlong millis) ;
+ void SetAssociation (Thread * a) { _Assoc = a ; }
+} ;
+
+class PlatformParker : public CHeapObj {
+ protected:
+ pthread_mutex_t _mutex [1] ;
+ pthread_cond_t _cond [1] ;
+
+ public: // TODO-FIXME: make dtor private
+ ~PlatformParker() { guarantee (0, "invariant") ; }
+
+ public:
+ PlatformParker() {
+ int status;
+ status = pthread_cond_init (_cond, NULL);
+ assert_status(status == 0, status, "cond_init");
+ status = pthread_mutex_init (_mutex, NULL);
+ assert_status(status == 0, status, "mutex_init");
+ }
+} ;
+
+#endif // OS_BSD_VM_OS_BSD_HPP
diff --git a/hotspot/src/os/bsd/vm/os_bsd.inline.hpp b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
new file mode 100644
index 0000000..731a7e6
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/os_bsd.inline.hpp
@@ -0,0 +1,302 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+#ifndef OS_BSD_VM_OS_BSD_INLINE_HPP
+#define OS_BSD_VM_OS_BSD_INLINE_HPP
+
+#include "runtime/atomic.hpp"
+#include "runtime/os.hpp"
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "atomic_bsd_x86.inline.hpp"
+# include "orderAccess_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "atomic_bsd_zero.inline.hpp"
+# include "orderAccess_bsd_zero.inline.hpp"
+#endif
+
+// System includes
+
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/poll.h>
+#include <netdb.h>
+
+inline void* os::thread_local_storage_at(int index) {
+ return pthread_getspecific((pthread_key_t)index);
+}
+
+inline const char* os::file_separator() {
+ return "/";
+}
+
+inline const char* os::line_separator() {
+ return "\n";
+}
+
+inline const char* os::path_separator() {
+ return ":";
+}
+
+inline const char* os::jlong_format_specifier() {
+ return "%lld";
+}
+
+inline const char* os::julong_format_specifier() {
+ return "%llu";
+}
+
+// File names are case-sensitive on windows only
+inline int os::file_name_strcmp(const char* s1, const char* s2) {
+ return strcmp(s1, s2);
+}
+
+inline bool os::obsolete_option(const JavaVMOption *option) {
+ return false;
+}
+
+inline bool os::uses_stack_guard_pages() {
+ return true;
+}
+
+inline bool os::allocate_stack_guard_pages() {
+ assert(uses_stack_guard_pages(), "sanity check");
+#if !defined(__FreeBSD__) || __FreeBSD__ < 5
+ // Since FreeBSD 4 uses malloc() for allocating the thread stack
+ // there is no need to do anything extra to allocate the guard pages
+ return false;
+#else
+ // FreeBSD 5+ uses mmap MAP_STACK for allocating the thread stacks.
+ // Must 'allocate' them or guard pages are ignored.
+ return true;
+#endif
+}
+
+
+// On Bsd, reservations are made on a page by page basis, nothing to do.
+inline void os::split_reserved_memory(char *base, size_t size,
+ size_t split, bool realloc) {
+}
+
+
+// Bang the shadow pages if they need to be touched to be mapped.
+inline void os::bang_stack_shadow_pages() {
+}
+
+inline void os::dll_unload(void *lib) {
+ ::dlclose(lib);
+}
+
+inline const int os::default_file_open_flags() { return 0;}
+
+inline DIR* os::opendir(const char* dirname)
+{
+ assert(dirname != NULL, "just checking");
+ return ::opendir(dirname);
+}
+
+inline int os::readdir_buf_size(const char *path)
+{
+ return NAME_MAX + sizeof(dirent) + 1;
+}
+
+inline jlong os::lseek(int fd, jlong offset, int whence) {
+ return (jlong) ::lseek(fd, offset, whence);
+}
+
+inline int os::fsync(int fd) {
+ return ::fsync(fd);
+}
+
+inline char* os::native_path(char *path) {
+ return path;
+}
+
+inline int os::ftruncate(int fd, jlong length) {
+ return ::ftruncate(fd, length);
+}
+
+inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf)
+{
+ dirent* p;
+ int status;
+ assert(dirp != NULL, "just checking");
+
+ // NOTE: Bsd readdir_r (on RH 6.2 and 7.2 at least) is NOT like the POSIX
+ // version. Here is the doc for this function:
+ // http://www.gnu.org/manual/glibc-2.2.3/html_node/libc_262.html
+
+ if((status = ::readdir_r(dirp, dbuf, &p)) != 0) {
+ errno = status;
+ return NULL;
+ } else
+ return p;
+}
+
+inline int os::closedir(DIR *dirp) {
+ assert(dirp != NULL, "argument is NULL");
+ return ::closedir(dirp);
+}
+
+// macros for restartable system calls
+
+#define RESTARTABLE(_cmd, _result) do { \
+ _result = _cmd; \
+ } while(((int)_result == OS_ERR) && (errno == EINTR))
+
+#define RESTARTABLE_RETURN_INT(_cmd) do { \
+ int _result; \
+ RESTARTABLE(_cmd, _result); \
+ return _result; \
+} while(false)
+
+inline bool os::numa_has_static_binding() { return true; }
+inline bool os::numa_has_group_homing() { return false; }
+
+inline size_t os::restartable_read(int fd, void *buf, unsigned int nBytes) {
+ size_t res;
+ RESTARTABLE( (size_t) ::read(fd, buf, (size_t) nBytes), res);
+ return res;
+}
+
+inline size_t os::write(int fd, const void *buf, unsigned int nBytes) {
+ size_t res;
+ RESTARTABLE((size_t) ::write(fd, buf, (size_t) nBytes), res);
+ return res;
+}
+
+inline int os::close(int fd) {
+ RESTARTABLE_RETURN_INT(::close(fd));
+}
+
+inline int os::socket_close(int fd) {
+ RESTARTABLE_RETURN_INT(::close(fd));
+}
+
+inline int os::socket(int domain, int type, int protocol) {
+ return ::socket(domain, type, protocol);
+}
+
+inline int os::recv(int fd, char *buf, int nBytes, int flags) {
+ RESTARTABLE_RETURN_INT(::recv(fd, buf, nBytes, (unsigned int) flags));
+}
+
+inline int os::send(int fd, char *buf, int nBytes, int flags) {
+ RESTARTABLE_RETURN_INT(::send(fd, buf, nBytes, (unsigned int) flags));
+}
+
+inline int os::raw_send(int fd, char *buf, int nBytes, int flags) {
+ return os::send(fd, buf, nBytes, flags);
+}
+
+inline int os::timeout(int fd, long timeout) {
+ julong prevtime,newtime;
+ struct timeval t;
+
+ gettimeofday(&t, NULL);
+ prevtime = ((julong)t.tv_sec * 1000) + t.tv_usec / 1000;
+
+ for(;;) {
+ struct pollfd pfd;
+
+ pfd.fd = fd;
+ pfd.events = POLLIN | POLLERR;
+
+ int res = ::poll(&pfd, 1, timeout);
+
+ if (res == OS_ERR && errno == EINTR) {
+
+ // On Bsd any value < 0 means "forever"
+
+ if(timeout >= 0) {
+ gettimeofday(&t, NULL);
+ newtime = ((julong)t.tv_sec * 1000) + t.tv_usec / 1000;
+ timeout -= newtime - prevtime;
+ if(timeout <= 0)
+ return OS_OK;
+ prevtime = newtime;
+ }
+ } else
+ return res;
+ }
+}
+
+inline int os::listen(int fd, int count) {
+ return ::listen(fd, count);
+}
+
+inline int os::connect(int fd, struct sockaddr *him, int len) {
+ RESTARTABLE_RETURN_INT(::connect(fd, him, len));
+}
+
+inline int os::accept(int fd, struct sockaddr *him, int *len) {
+ // This cast is from int to unsigned int on bsd. Since we
+ // only pass the parameter "len" around the vm and don't try to
+ // fetch it's value, this cast is safe for now. The java.net group
+ // may need and want to change this interface someday if socklen_t goes
+ // to 64 bits on some platform that we support.
+
+ // At least OpenBSD and FreeBSD can return EINTR from accept.
+ RESTARTABLE_RETURN_INT(::accept(fd, him, (socklen_t *)len));
+}
+
+inline int os::recvfrom(int fd, char *buf, int nBytes, int flags,
+ sockaddr *from, int *fromlen) {
+ RESTARTABLE_RETURN_INT(::recvfrom(fd, buf, nBytes, (unsigned int) flags, from, (socklen_t *)fromlen));
+}
+
+inline int os::sendto(int fd, char *buf, int len, int flags,
+ struct sockaddr *to, int tolen) {
+ RESTARTABLE_RETURN_INT(::sendto(fd, buf, len, (unsigned int) flags, to, tolen));
+}
+
+inline int os::socket_shutdown(int fd, int howto){
+ return ::shutdown(fd, howto);
+}
+
+inline int os::bind(int fd, struct sockaddr *him, int len){
+ return ::bind(fd, him, len);
+}
+
+inline int os::get_sock_name(int fd, struct sockaddr *him, int *len){
+ return ::getsockname(fd, him, (socklen_t *)len);
+}
+
+inline int os::get_host_name(char* name, int namelen){
+ return ::gethostname(name, namelen);
+}
+
+inline struct hostent* os::get_host_by_name(char* name) {
+ return ::gethostbyname(name);
+}
+inline int os::get_sock_opt(int fd, int level, int optname,
+ char *optval, int* optlen){
+ return ::getsockopt(fd, level, optname, optval, (socklen_t *)optlen);
+}
+
+inline int os::set_sock_opt(int fd, int level, int optname,
+ const char *optval, int optlen){
+ return ::setsockopt(fd, level, optname, optval, optlen);
+}
+#endif // OS_BSD_VM_OS_BSD_INLINE_HPP
diff --git a/hotspot/src/os/bsd/vm/os_share_bsd.hpp b/hotspot/src/os/bsd/vm/os_share_bsd.hpp
new file mode 100644
index 0000000..5caa782
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/os_share_bsd.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999, 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 OS_BSD_VM_OS_SHARE_BSD_HPP
+#define OS_BSD_VM_OS_SHARE_BSD_HPP
+
+// misc
+void signalHandler(int, siginfo_t*, ucontext_t*);
+void handle_unexpected_exception(Thread* thread, int sig, siginfo_t* info, address pc, address adjusted_pc);
+#ifndef PRODUCT
+void continue_with_dump(void);
+#endif
+
+#define PROCFILE_LENGTH 128
+
+#endif // OS_BSD_VM_OS_SHARE_BSD_HPP
diff --git a/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp b/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
new file mode 100644
index 0000000..c93289e
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/perfMemory_bsd.cpp
@@ -0,0 +1,1041 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "memory/allocation.inline.hpp"
+#include "memory/resourceArea.hpp"
+#include "oops/oop.inline.hpp"
+#include "os_bsd.inline.hpp"
+#include "runtime/handles.inline.hpp"
+#include "runtime/perfMemory.hpp"
+#include "utilities/exceptions.hpp"
+
+// put OS-includes here
+# include <sys/types.h>
+# include <sys/mman.h>
+# include <errno.h>
+# include <stdio.h>
+# include <unistd.h>
+# include <sys/stat.h>
+# include <signal.h>
+# include <pwd.h>
+
+static char* backing_store_file_name = NULL; // name of the backing store
+ // file, if successfully created.
+
+// Standard Memory Implementation Details
+
+// create the PerfData memory region in standard memory.
+//
+static char* create_standard_memory(size_t size) {
+
+ // allocate an aligned chuck of memory
+ char* mapAddress = os::reserve_memory(size);
+
+ if (mapAddress == NULL) {
+ return NULL;
+ }
+
+ // commit memory
+ if (!os::commit_memory(mapAddress, size)) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("Could not commit PerfData memory\n");
+ }
+ os::release_memory(mapAddress, size);
+ return NULL;
+ }
+
+ return mapAddress;
+}
+
+// delete the PerfData memory region
+//
+static void delete_standard_memory(char* addr, size_t size) {
+
+ // there are no persistent external resources to cleanup for standard
+ // memory. since DestroyJavaVM does not support unloading of the JVM,
+ // cleanup of the memory resource is not performed. The memory will be
+ // reclaimed by the OS upon termination of the process.
+ //
+ return;
+}
+
+// save the specified memory region to the given file
+//
+// Note: this function might be called from signal handler (by os::abort()),
+// don't allocate heap memory.
+//
+static void save_memory_to_file(char* addr, size_t size) {
+
+ const char* destfile = PerfMemory::get_perfdata_file_path();
+ assert(destfile[0] != '\0', "invalid PerfData file path");
+
+ int result;
+
+ RESTARTABLE(::open(destfile, O_CREAT|O_WRONLY|O_TRUNC, S_IREAD|S_IWRITE),
+ result);;
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("Could not create Perfdata save file: %s: %s\n",
+ destfile, strerror(errno));
+ }
+ } else {
+ int fd = result;
+
+ for (size_t remaining = size; remaining > 0;) {
+
+ RESTARTABLE(::write(fd, addr, remaining), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("Could not write Perfdata save file: %s: %s\n",
+ destfile, strerror(errno));
+ }
+ break;
+ }
+
+ remaining -= (size_t)result;
+ addr += result;
+ }
+
+ RESTARTABLE(::close(fd), result);
+ if (PrintMiscellaneous && Verbose) {
+ if (result == OS_ERR) {
+ warning("Could not close %s: %s\n", destfile, strerror(errno));
+ }
+ }
+ }
+ FREE_C_HEAP_ARRAY(char, destfile);
+}
+
+
+// Shared Memory Implementation Details
+
+// Note: the solaris and bsd shared memory implementation uses the mmap
+// interface with a backing store file to implement named shared memory.
+// Using the file system as the name space for shared memory allows a
+// common name space to be supported across a variety of platforms. It
+// also provides a name space that Java applications can deal with through
+// simple file apis.
+//
+// The solaris and bsd implementations store the backing store file in
+// a user specific temporary directory located in the /tmp file system,
+// which is always a local file system and is sometimes a RAM based file
+// system.
+
+// return the user specific temporary directory name.
+//
+// the caller is expected to free the allocated memory.
+//
+static char* get_user_tmp_dir(const char* user) {
+
+ const char* tmpdir = os::get_temp_directory();
+ const char* perfdir = PERFDATA_NAME;
+ size_t nbytes = strlen(tmpdir) + strlen(perfdir) + strlen(user) + 3;
+ char* dirname = NEW_C_HEAP_ARRAY(char, nbytes);
+
+ // construct the path name to user specific tmp directory
+ snprintf(dirname, nbytes, "%s/%s_%s", tmpdir, perfdir, user);
+
+ return dirname;
+}
+
+// convert the given file name into a process id. if the file
+// does not meet the file naming constraints, return 0.
+//
+static pid_t filename_to_pid(const char* filename) {
+
+ // a filename that doesn't begin with a digit is not a
+ // candidate for conversion.
+ //
+ if (!isdigit(*filename)) {
+ return 0;
+ }
+
+ // check if file name can be converted to an integer without
+ // any leftover characters.
+ //
+ char* remainder = NULL;
+ errno = 0;
+ pid_t pid = (pid_t)strtol(filename, &remainder, 10);
+
+ if (errno != 0) {
+ return 0;
+ }
+
+ // check for left over characters. If any, then the filename is
+ // not a candidate for conversion.
+ //
+ if (remainder != NULL && *remainder != '\0') {
+ return 0;
+ }
+
+ // successful conversion, return the pid
+ return pid;
+}
+
+
+// check if the given path is considered a secure directory for
+// the backing store files. Returns true if the directory exists
+// and is considered a secure location. Returns false if the path
+// is a symbolic link or if an error occurred.
+//
+static bool is_directory_secure(const char* path) {
+ struct stat statbuf;
+ int result = 0;
+
+ RESTARTABLE(::lstat(path, &statbuf), result);
+ if (result == OS_ERR) {
+ return false;
+ }
+
+ // the path exists, now check it's mode
+ if (S_ISLNK(statbuf.st_mode) || !S_ISDIR(statbuf.st_mode)) {
+ // the path represents a link or some non-directory file type,
+ // which is not what we expected. declare it insecure.
+ //
+ return false;
+ }
+ else {
+ // we have an existing directory, check if the permissions are safe.
+ //
+ if ((statbuf.st_mode & (S_IWGRP|S_IWOTH)) != 0) {
+ // the directory is open for writing and could be subjected
+ // to a symlnk attack. declare it insecure.
+ //
+ return false;
+ }
+ }
+ return true;
+}
+
+
+// return the user name for the given user id
+//
+// the caller is expected to free the allocated memory.
+//
+static char* get_user_name(uid_t uid) {
+
+ struct passwd pwent;
+
+ // determine the max pwbuf size from sysconf, and hardcode
+ // a default if this not available through sysconf.
+ //
+ long bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
+ if (bufsize == -1)
+ bufsize = 1024;
+
+ char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize);
+
+ // POSIX interface to getpwuid_r is used on LINUX
+ struct passwd* p;
+ int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
+
+ if (result != 0 || p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') {
+ if (PrintMiscellaneous && Verbose) {
+ if (result != 0) {
+ warning("Could not retrieve passwd entry: %s\n",
+ strerror(result));
+ }
+ else if (p == NULL) {
+ // this check is added to protect against an observed problem
+ // with getpwuid_r() on RedHat 9 where getpwuid_r returns 0,
+ // indicating success, but has p == NULL. This was observed when
+ // inserting a file descriptor exhaustion fault prior to the call
+ // getpwuid_r() call. In this case, error is set to the appropriate
+ // error condition, but this is undocumented behavior. This check
+ // is safe under any condition, but the use of errno in the output
+ // message may result in an erroneous message.
+ // Bug Id 89052 was opened with RedHat.
+ //
+ warning("Could not retrieve passwd entry: %s\n",
+ strerror(errno));
+ }
+ else {
+ warning("Could not determine user name: %s\n",
+ p->pw_name == NULL ? "pw_name = NULL" :
+ "pw_name zero length");
+ }
+ }
+ FREE_C_HEAP_ARRAY(char, pwbuf);
+ return NULL;
+ }
+
+ char* user_name = NEW_C_HEAP_ARRAY(char, strlen(p->pw_name) + 1);
+ strcpy(user_name, p->pw_name);
+
+ FREE_C_HEAP_ARRAY(char, pwbuf);
+ return user_name;
+}
+
+// return the name of the user that owns the process identified by vmid.
+//
+// This method uses a slow directory search algorithm to find the backing
+// store file for the specified vmid and returns the user name, as determined
+// by the user name suffix of the hsperfdata_<username> directory name.
+//
+// the caller is expected to free the allocated memory.
+//
+static char* get_user_name_slow(int vmid, TRAPS) {
+
+ // short circuit the directory search if the process doesn't even exist.
+ if (kill(vmid, 0) == OS_ERR) {
+ if (errno == ESRCH) {
+ THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
+ "Process not found");
+ }
+ else /* EPERM */ {
+ THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
+ }
+ }
+
+ // directory search
+ char* oldest_user = NULL;
+ time_t oldest_ctime = 0;
+
+ const char* tmpdirname = os::get_temp_directory();
+
+ DIR* tmpdirp = os::opendir(tmpdirname);
+
+ if (tmpdirp == NULL) {
+ return NULL;
+ }
+
+ // for each entry in the directory that matches the pattern hsperfdata_*,
+ // open the directory and check if the file for the given vmid exists.
+ // The file with the expected name and the latest creation date is used
+ // to determine the user name for the process id.
+ //
+ struct dirent* dentry;
+ char* tdbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(tmpdirname));
+ errno = 0;
+ while ((dentry = os::readdir(tmpdirp, (struct dirent *)tdbuf)) != NULL) {
+
+ // check if the directory entry is a hsperfdata file
+ if (strncmp(dentry->d_name, PERFDATA_NAME, strlen(PERFDATA_NAME)) != 0) {
+ continue;
+ }
+
+ char* usrdir_name = NEW_C_HEAP_ARRAY(char,
+ strlen(tmpdirname) + strlen(dentry->d_name) + 2);
+ strcpy(usrdir_name, tmpdirname);
+ strcat(usrdir_name, "/");
+ strcat(usrdir_name, dentry->d_name);
+
+ DIR* subdirp = os::opendir(usrdir_name);
+
+ if (subdirp == NULL) {
+ FREE_C_HEAP_ARRAY(char, usrdir_name);
+ continue;
+ }
+
+ // Since we don't create the backing store files in directories
+ // pointed to by symbolic links, we also don't follow them when
+ // looking for the files. We check for a symbolic link after the
+ // call to opendir in order to eliminate a small window where the
+ // symlink can be exploited.
+ //
+ if (!is_directory_secure(usrdir_name)) {
+ FREE_C_HEAP_ARRAY(char, usrdir_name);
+ os::closedir(subdirp);
+ continue;
+ }
+
+ struct dirent* udentry;
+ char* udbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(usrdir_name));
+ errno = 0;
+ while ((udentry = os::readdir(subdirp, (struct dirent *)udbuf)) != NULL) {
+
+ if (filename_to_pid(udentry->d_name) == vmid) {
+ struct stat statbuf;
+ int result;
+
+ char* filename = NEW_C_HEAP_ARRAY(char,
+ strlen(usrdir_name) + strlen(udentry->d_name) + 2);
+
+ strcpy(filename, usrdir_name);
+ strcat(filename, "/");
+ strcat(filename, udentry->d_name);
+
+ // don't follow symbolic links for the file
+ RESTARTABLE(::lstat(filename, &statbuf), result);
+ if (result == OS_ERR) {
+ FREE_C_HEAP_ARRAY(char, filename);
+ continue;
+ }
+
+ // skip over files that are not regular files.
+ if (!S_ISREG(statbuf.st_mode)) {
+ FREE_C_HEAP_ARRAY(char, filename);
+ continue;
+ }
+
+ // compare and save filename with latest creation time
+ if (statbuf.st_size > 0 && statbuf.st_ctime > oldest_ctime) {
+
+ if (statbuf.st_ctime > oldest_ctime) {
+ char* user = strchr(dentry->d_name, '_') + 1;
+
+ if (oldest_user != NULL) FREE_C_HEAP_ARRAY(char, oldest_user);
+ oldest_user = NEW_C_HEAP_ARRAY(char, strlen(user)+1);
+
+ strcpy(oldest_user, user);
+ oldest_ctime = statbuf.st_ctime;
+ }
+ }
+
+ FREE_C_HEAP_ARRAY(char, filename);
+ }
+ }
+ os::closedir(subdirp);
+ FREE_C_HEAP_ARRAY(char, udbuf);
+ FREE_C_HEAP_ARRAY(char, usrdir_name);
+ }
+ os::closedir(tmpdirp);
+ FREE_C_HEAP_ARRAY(char, tdbuf);
+
+ return(oldest_user);
+}
+
+// return the name of the user that owns the JVM indicated by the given vmid.
+//
+static char* get_user_name(int vmid, TRAPS) {
+ return get_user_name_slow(vmid, CHECK_NULL);
+}
+
+// return the file name of the backing store file for the named
+// shared memory region for the given user name and vmid.
+//
+// the caller is expected to free the allocated memory.
+//
+static char* get_sharedmem_filename(const char* dirname, int vmid) {
+
+ // add 2 for the file separator and a null terminator.
+ size_t nbytes = strlen(dirname) + UINT_CHARS + 2;
+
+ char* name = NEW_C_HEAP_ARRAY(char, nbytes);
+ snprintf(name, nbytes, "%s/%d", dirname, vmid);
+
+ return name;
+}
+
+
+// remove file
+//
+// this method removes the file specified by the given path
+//
+static void remove_file(const char* path) {
+
+ int result;
+
+ // if the file is a directory, the following unlink will fail. since
+ // we don't expect to find directories in the user temp directory, we
+ // won't try to handle this situation. even if accidentially or
+ // maliciously planted, the directory's presence won't hurt anything.
+ //
+ RESTARTABLE(::unlink(path), result);
+ if (PrintMiscellaneous && Verbose && result == OS_ERR) {
+ if (errno != ENOENT) {
+ warning("Could not unlink shared memory backing"
+ " store file %s : %s\n", path, strerror(errno));
+ }
+ }
+}
+
+
+// remove file
+//
+// this method removes the file with the given file name in the
+// named directory.
+//
+static void remove_file(const char* dirname, const char* filename) {
+
+ size_t nbytes = strlen(dirname) + strlen(filename) + 2;
+ char* path = NEW_C_HEAP_ARRAY(char, nbytes);
+
+ strcpy(path, dirname);
+ strcat(path, "/");
+ strcat(path, filename);
+
+ remove_file(path);
+
+ FREE_C_HEAP_ARRAY(char, path);
+}
+
+
+// cleanup stale shared memory resources
+//
+// This method attempts to remove all stale shared memory files in
+// the named user temporary directory. It scans the named directory
+// for files matching the pattern ^$[0-9]*$. For each file found, the
+// process id is extracted from the file name and a test is run to
+// determine if the process is alive. If the process is not alive,
+// any stale file resources are removed.
+//
+static void cleanup_sharedmem_resources(const char* dirname) {
+
+ // open the user temp directory
+ DIR* dirp = os::opendir(dirname);
+
+ if (dirp == NULL) {
+ // directory doesn't exist, so there is nothing to cleanup
+ return;
+ }
+
+ if (!is_directory_secure(dirname)) {
+ // the directory is not a secure directory
+ return;
+ }
+
+ // for each entry in the directory that matches the expected file
+ // name pattern, determine if the file resources are stale and if
+ // so, remove the file resources. Note, instrumented HotSpot processes
+ // for this user may start and/or terminate during this search and
+ // remove or create new files in this directory. The behavior of this
+ // loop under these conditions is dependent upon the implementation of
+ // opendir/readdir.
+ //
+ struct dirent* entry;
+ char* dbuf = NEW_C_HEAP_ARRAY(char, os::readdir_buf_size(dirname));
+ errno = 0;
+ while ((entry = os::readdir(dirp, (struct dirent *)dbuf)) != NULL) {
+
+ pid_t pid = filename_to_pid(entry->d_name);
+
+ if (pid == 0) {
+
+ if (strcmp(entry->d_name, ".") != 0 && strcmp(entry->d_name, "..") != 0) {
+
+ // attempt to remove all unexpected files, except "." and ".."
+ remove_file(dirname, entry->d_name);
+ }
+
+ errno = 0;
+ continue;
+ }
+
+ // we now have a file name that converts to a valid integer
+ // that could represent a process id . if this process id
+ // matches the current process id or the process is not running,
+ // then remove the stale file resources.
+ //
+ // process liveness is detected by sending signal number 0 to
+ // the process id (see kill(2)). if kill determines that the
+ // process does not exist, then the file resources are removed.
+ // if kill determines that that we don't have permission to
+ // signal the process, then the file resources are assumed to
+ // be stale and are removed because the resources for such a
+ // process should be in a different user specific directory.
+ //
+ if ((pid == os::current_process_id()) ||
+ (kill(pid, 0) == OS_ERR && (errno == ESRCH || errno == EPERM))) {
+
+ remove_file(dirname, entry->d_name);
+ }
+ errno = 0;
+ }
+ os::closedir(dirp);
+ FREE_C_HEAP_ARRAY(char, dbuf);
+}
+
+// make the user specific temporary directory. Returns true if
+// the directory exists and is secure upon return. Returns false
+// if the directory exists but is either a symlink, is otherwise
+// insecure, or if an error occurred.
+//
+static bool make_user_tmp_dir(const char* dirname) {
+
+ // create the directory with 0755 permissions. note that the directory
+ // will be owned by euid::egid, which may not be the same as uid::gid.
+ //
+ if (mkdir(dirname, S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) == OS_ERR) {
+ if (errno == EEXIST) {
+ // The directory already exists and was probably created by another
+ // JVM instance. However, this could also be the result of a
+ // deliberate symlink. Verify that the existing directory is safe.
+ //
+ if (!is_directory_secure(dirname)) {
+ // directory is not secure
+ if (PrintMiscellaneous && Verbose) {
+ warning("%s directory is insecure\n", dirname);
+ }
+ return false;
+ }
+ }
+ else {
+ // we encountered some other failure while attempting
+ // to create the directory
+ //
+ if (PrintMiscellaneous && Verbose) {
+ warning("could not create directory %s: %s\n",
+ dirname, strerror(errno));
+ }
+ return false;
+ }
+ }
+ return true;
+}
+
+// create the shared memory file resources
+//
+// This method creates the shared memory file with the given size
+// This method also creates the user specific temporary directory, if
+// it does not yet exist.
+//
+static int create_sharedmem_resources(const char* dirname, const char* filename, size_t size) {
+
+ // make the user temporary directory
+ if (!make_user_tmp_dir(dirname)) {
+ // could not make/find the directory or the found directory
+ // was not secure
+ return -1;
+ }
+
+ int result;
+
+ RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_TRUNC, S_IREAD|S_IWRITE), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("could not create file %s: %s\n", filename, strerror(errno));
+ }
+ return -1;
+ }
+
+ // save the file descriptor
+ int fd = result;
+
+ // set the file size
+ RESTARTABLE(::ftruncate(fd, (off_t)size), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("could not set shared memory file size: %s\n", strerror(errno));
+ }
+ RESTARTABLE(::close(fd), result);
+ return -1;
+ }
+
+ // Verify that we have enough disk space for this file.
+ // We'll get random SIGBUS crashes on memory accesses if
+ // we don't.
+
+ for (size_t seekpos = 0; seekpos < size; seekpos += os::vm_page_size()) {
+ int zero_int = 0;
+ result = (int)os::seek_to_file_offset(fd, (jlong)(seekpos));
+ if (result == -1 ) break;
+ RESTARTABLE(::write(fd, &zero_int, 1), result);
+ if (result != 1) {
+ if (errno == ENOSPC) {
+ warning("Insufficient space for shared memory file:\n %s\nTry using the -Djava.io.tmpdir= option to select an alternate temp location.\n", filename);
+ }
+ break;
+ }
+ }
+
+ if (result != -1) {
+ return fd;
+ } else {
+ RESTARTABLE(::close(fd), result);
+ return -1;
+ }
+}
+
+// open the shared memory file for the given user and vmid. returns
+// the file descriptor for the open file or -1 if the file could not
+// be opened.
+//
+static int open_sharedmem_file(const char* filename, int oflags, TRAPS) {
+
+ // open the file
+ int result;
+ RESTARTABLE(::open(filename, oflags), result);
+ if (result == OS_ERR) {
+ if (errno == ENOENT) {
+ THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
+ "Process not found");
+ }
+ else if (errno == EACCES) {
+ THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(),
+ "Permission denied");
+ }
+ else {
+ THROW_MSG_0(vmSymbols::java_io_IOException(), strerror(errno));
+ }
+ }
+
+ return result;
+}
+
+// create a named shared memory region. returns the address of the
+// memory region on success or NULL on failure. A return value of
+// NULL will ultimately disable the shared memory feature.
+//
+// On Solaris and Bsd, the name space for shared memory objects
+// is the file system name space.
+//
+// A monitoring application attaching to a JVM does not need to know
+// the file system name of the shared memory object. However, it may
+// be convenient for applications to discover the existence of newly
+// created and terminating JVMs by watching the file system name space
+// for files being created or removed.
+//
+static char* mmap_create_shared(size_t size) {
+
+ int result;
+ int fd;
+ char* mapAddress;
+
+ int vmid = os::current_process_id();
+
+ char* user_name = get_user_name(geteuid());
+
+ if (user_name == NULL)
+ return NULL;
+
+ char* dirname = get_user_tmp_dir(user_name);
+ char* filename = get_sharedmem_filename(dirname, vmid);
+
+ // cleanup any stale shared memory files
+ cleanup_sharedmem_resources(dirname);
+
+ assert(((size > 0) && (size % os::vm_page_size() == 0)),
+ "unexpected PerfMemory region size");
+
+ fd = create_sharedmem_resources(dirname, filename, size);
+
+ FREE_C_HEAP_ARRAY(char, user_name);
+ FREE_C_HEAP_ARRAY(char, dirname);
+
+ if (fd == -1) {
+ FREE_C_HEAP_ARRAY(char, filename);
+ return NULL;
+ }
+
+ mapAddress = (char*)::mmap((char*)0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+
+ // attempt to close the file - restart it if it was interrupted,
+ // but ignore other failures
+ RESTARTABLE(::close(fd), result);
+ assert(result != OS_ERR, "could not close file");
+
+ if (mapAddress == MAP_FAILED) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("mmap failed - %s\n", strerror(errno));
+ }
+ remove_file(filename);
+ FREE_C_HEAP_ARRAY(char, filename);
+ return NULL;
+ }
+
+ // save the file name for use in delete_shared_memory()
+ backing_store_file_name = filename;
+
+ // clear the shared memory region
+ (void)::memset((void*) mapAddress, 0, size);
+
+ return mapAddress;
+}
+
+// release a named shared memory region
+//
+static void unmap_shared(char* addr, size_t bytes) {
+ os::release_memory(addr, bytes);
+}
+
+// create the PerfData memory region in shared memory.
+//
+static char* create_shared_memory(size_t size) {
+
+ // create the shared memory region.
+ return mmap_create_shared(size);
+}
+
+// delete the shared PerfData memory region
+//
+static void delete_shared_memory(char* addr, size_t size) {
+
+ // cleanup the persistent shared memory resources. since DestroyJavaVM does
+ // not support unloading of the JVM, unmapping of the memory resource is
+ // not performed. The memory will be reclaimed by the OS upon termination of
+ // the process. The backing store file is deleted from the file system.
+
+ assert(!PerfDisableSharedMem, "shouldn't be here");
+
+ if (backing_store_file_name != NULL) {
+ remove_file(backing_store_file_name);
+ // Don't.. Free heap memory could deadlock os::abort() if it is called
+ // from signal handler. OS will reclaim the heap memory.
+ // FREE_C_HEAP_ARRAY(char, backing_store_file_name);
+ backing_store_file_name = NULL;
+ }
+}
+
+// return the size of the file for the given file descriptor
+// or 0 if it is not a valid size for a shared memory file
+//
+static size_t sharedmem_filesize(int fd, TRAPS) {
+
+ struct stat statbuf;
+ int result;
+
+ RESTARTABLE(::fstat(fd, &statbuf), result);
+ if (result == OS_ERR) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("fstat failed: %s\n", strerror(errno));
+ }
+ THROW_MSG_0(vmSymbols::java_io_IOException(),
+ "Could not determine PerfMemory size");
+ }
+
+ if ((statbuf.st_size == 0) ||
+ ((size_t)statbuf.st_size % os::vm_page_size() != 0)) {
+ THROW_MSG_0(vmSymbols::java_lang_Exception(),
+ "Invalid PerfMemory size");
+ }
+
+ return (size_t)statbuf.st_size;
+}
+
+// attach to a named shared memory region.
+//
+static void mmap_attach_shared(const char* user, int vmid, PerfMemory::PerfMemoryMode mode, char** addr, size_t* sizep, TRAPS) {
+
+ char* mapAddress;
+ int result;
+ int fd;
+ size_t size;
+ const char* luser = NULL;
+
+ int mmap_prot;
+ int file_flags;
+
+ ResourceMark rm;
+
+ // map the high level access mode to the appropriate permission
+ // constructs for the file and the shared memory mapping.
+ if (mode == PerfMemory::PERF_MODE_RO) {
+ mmap_prot = PROT_READ;
+ file_flags = O_RDONLY;
+ }
+ else if (mode == PerfMemory::PERF_MODE_RW) {
+#ifdef LATER
+ mmap_prot = PROT_READ | PROT_WRITE;
+ file_flags = O_RDWR;
+#else
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Unsupported access mode");
+#endif
+ }
+ else {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Illegal access mode");
+ }
+
+ if (user == NULL || strlen(user) == 0) {
+ luser = get_user_name(vmid, CHECK);
+ }
+ else {
+ luser = user;
+ }
+
+ if (luser == NULL) {
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Could not map vmid to user Name");
+ }
+
+ char* dirname = get_user_tmp_dir(luser);
+
+ // since we don't follow symbolic links when creating the backing
+ // store file, we don't follow them when attaching either.
+ //
+ if (!is_directory_secure(dirname)) {
+ FREE_C_HEAP_ARRAY(char, dirname);
+ THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
+ "Process not found");
+ }
+
+ char* filename = get_sharedmem_filename(dirname, vmid);
+
+ // copy heap memory to resource memory. the open_sharedmem_file
+ // method below need to use the filename, but could throw an
+ // exception. using a resource array prevents the leak that
+ // would otherwise occur.
+ char* rfilename = NEW_RESOURCE_ARRAY(char, strlen(filename) + 1);
+ strcpy(rfilename, filename);
+
+ // free the c heap resources that are no longer needed
+ if (luser != user) FREE_C_HEAP_ARRAY(char, luser);
+ FREE_C_HEAP_ARRAY(char, dirname);
+ FREE_C_HEAP_ARRAY(char, filename);
+
+ // open the shared memory file for the give vmid
+ fd = open_sharedmem_file(rfilename, file_flags, CHECK);
+ assert(fd != OS_ERR, "unexpected value");
+
+ if (*sizep == 0) {
+ size = sharedmem_filesize(fd, CHECK);
+ assert(size != 0, "unexpected size");
+ }
+
+ mapAddress = (char*)::mmap((char*)0, size, mmap_prot, MAP_SHARED, fd, 0);
+
+ // attempt to close the file - restart if it gets interrupted,
+ // but ignore other failures
+ RESTARTABLE(::close(fd), result);
+ assert(result != OS_ERR, "could not close file");
+
+ if (mapAddress == MAP_FAILED) {
+ if (PrintMiscellaneous && Verbose) {
+ warning("mmap failed: %s\n", strerror(errno));
+ }
+ THROW_MSG(vmSymbols::java_lang_OutOfMemoryError(),
+ "Could not map PerfMemory");
+ }
+
+ *addr = mapAddress;
+ *sizep = size;
+
+ if (PerfTraceMemOps) {
+ tty->print("mapped " SIZE_FORMAT " bytes for vmid %d at "
+ INTPTR_FORMAT "\n", size, vmid, (void*)mapAddress);
+ }
+}
+
+
+
+
+// create the PerfData memory region
+//
+// This method creates the memory region used to store performance
+// data for the JVM. The memory may be created in standard or
+// shared memory.
+//
+void PerfMemory::create_memory_region(size_t size) {
+
+ if (PerfDisableSharedMem) {
+ // do not share the memory for the performance data.
+ _start = create_standard_memory(size);
+ }
+ else {
+ _start = create_shared_memory(size);
+ if (_start == NULL) {
+
+ // creation of the shared memory region failed, attempt
+ // to create a contiguous, non-shared memory region instead.
+ //
+ if (PrintMiscellaneous && Verbose) {
+ warning("Reverting to non-shared PerfMemory region.\n");
+ }
+ PerfDisableSharedMem = true;
+ _start = create_standard_memory(size);
+ }
+ }
+
+ if (_start != NULL) _capacity = size;
+
+}
+
+// delete the PerfData memory region
+//
+// This method deletes the memory region used to store performance
+// data for the JVM. The memory region indicated by the <address, size>
+// tuple will be inaccessible after a call to this method.
+//
+void PerfMemory::delete_memory_region() {
+
+ assert((start() != NULL && capacity() > 0), "verify proper state");
+
+ // If user specifies PerfDataSaveFile, it will save the performance data
+ // to the specified file name no matter whether PerfDataSaveToFile is specified
+ // or not. In other word, -XX:PerfDataSaveFile=.. overrides flag
+ // -XX:+PerfDataSaveToFile.
+ if (PerfDataSaveToFile || PerfDataSaveFile != NULL) {
+ save_memory_to_file(start(), capacity());
+ }
+
+ if (PerfDisableSharedMem) {
+ delete_standard_memory(start(), capacity());
+ }
+ else {
+ delete_shared_memory(start(), capacity());
+ }
+}
+
+// attach to the PerfData memory region for another JVM
+//
+// This method returns an <address, size> tuple that points to
+// a memory buffer that is kept reasonably synchronized with
+// the PerfData memory region for the indicated JVM. This
+// buffer may be kept in synchronization via shared memory
+// or some other mechanism that keeps the buffer updated.
+//
+// If the JVM chooses not to support the attachability feature,
+// this method should throw an UnsupportedOperation exception.
+//
+// This implementation utilizes named shared memory to map
+// the indicated process's PerfData memory region into this JVMs
+// address space.
+//
+void PerfMemory::attach(const char* user, int vmid, PerfMemoryMode mode, char** addrp, size_t* sizep, TRAPS) {
+
+ if (vmid == 0 || vmid == os::current_process_id()) {
+ *addrp = start();
+ *sizep = capacity();
+ return;
+ }
+
+ mmap_attach_shared(user, vmid, mode, addrp, sizep, CHECK);
+}
+
+// detach from the PerfData memory region of another JVM
+//
+// This method detaches the PerfData memory region of another
+// JVM, specified as an <address, size> tuple of a buffer
+// in this process's address space. This method may perform
+// arbitrary actions to accomplish the detachment. The memory
+// region specified by <address, size> will be inaccessible after
+// a call to this method.
+//
+// If the JVM chooses not to support the attachability feature,
+// this method should throw an UnsupportedOperation exception.
+//
+// This implementation utilizes named shared memory to detach
+// the indicated process's PerfData memory region from this
+// process's address space.
+//
+void PerfMemory::detach(char* addr, size_t bytes, TRAPS) {
+
+ assert(addr != 0, "address sanity check");
+ assert(bytes > 0, "capacity sanity check");
+
+ if (PerfMemory::contains(addr) || PerfMemory::contains(addr + bytes - 1)) {
+ // prevent accidental detachment of this process's PerfMemory region
+ return;
+ }
+
+ unmap_shared(addr, bytes);
+}
+
+char* PerfMemory::backing_store_filename() {
+ return backing_store_file_name;
+}
diff --git a/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp b/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp
new file mode 100644
index 0000000..1fa7d3a
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/stubRoutines_bsd.cpp
@@ -0,0 +1,27 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/os.hpp"
+#include "runtime/stubRoutines.hpp"
diff --git a/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp b/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp
new file mode 100644
index 0000000..e337a5b
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/threadCritical_bsd.cpp
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/threadCritical.hpp"
+#include "thread_bsd.inline.hpp"
+
+// put OS-includes here
+# include <pthread.h>
+
+//
+// See threadCritical.hpp for details of this class.
+//
+
+static pthread_t tc_owner = 0;
+static pthread_mutex_t tc_mutex = PTHREAD_MUTEX_INITIALIZER;
+static int tc_count = 0;
+
+void ThreadCritical::initialize() {
+}
+
+void ThreadCritical::release() {
+}
+
+ThreadCritical::ThreadCritical() {
+ pthread_t self = pthread_self();
+ if (self != tc_owner) {
+ int ret = pthread_mutex_lock(&tc_mutex);
+ guarantee(ret == 0, "fatal error with pthread_mutex_lock()");
+ assert(tc_count == 0, "Lock acquired with illegal reentry count.");
+ tc_owner = self;
+ }
+ tc_count++;
+}
+
+ThreadCritical::~ThreadCritical() {
+ assert(tc_owner == pthread_self(), "must have correct owner");
+ assert(tc_count > 0, "must have correct count");
+
+ tc_count--;
+ if (tc_count == 0) {
+ tc_owner = 0;
+ int ret = pthread_mutex_unlock(&tc_mutex);
+ guarantee(ret == 0, "fatal error with pthread_mutex_unlock()");
+ }
+}
diff --git a/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp b/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp
new file mode 100644
index 0000000..290f477
--- /dev/null
+++ b/hotspot/src/os/bsd/vm/thread_bsd.inline.hpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2002, 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.
+ *
+ */
+
+#ifndef OS_BSD_VM_THREAD_BSD_INLINE_HPP
+#define OS_BSD_VM_THREAD_BSD_INLINE_HPP
+
+#include "runtime/atomic.hpp"
+#include "runtime/prefetch.hpp"
+#include "runtime/thread.hpp"
+#include "runtime/threadLocalStorage.hpp"
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "atomic_bsd_x86.inline.hpp"
+# include "orderAccess_bsd_x86.inline.hpp"
+# include "prefetch_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "atomic_bsd_zero.inline.hpp"
+# include "orderAccess_bsd_zero.inline.hpp"
+# include "prefetch_bsd_zero.inline.hpp"
+#endif
+
+// Contains inlined functions for class Thread and ThreadLocalStorage
+
+inline void ThreadLocalStorage::pd_invalidate_all() {} // nothing to do
+
+#endif // OS_BSD_VM_THREAD_BSD_INLINE_HPP
diff --git a/hotspot/src/os/linux/vm/vmError_linux.cpp b/hotspot/src/os/bsd/vm/vmError_bsd.cpp
similarity index 100%
copy from hotspot/src/os/linux/vm/vmError_linux.cpp
copy to hotspot/src/os/bsd/vm/vmError_bsd.cpp
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 09285a3..5a50873 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -22,8 +22,6 @@
*
*/
-# define __STDC_FORMAT_MACROS
-
// no precompiled headers
#include "classfile/classLoader.hpp"
#include "classfile/systemDictionary.hpp"
@@ -2498,7 +2496,13 @@ bool os::commit_memory(char* addr, size_t size, bool exec) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
uintptr_t res = (uintptr_t) ::mmap(addr, size, prot,
MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0);
- return res != (uintptr_t) MAP_FAILED;
+ if (res != (uintptr_t) MAP_FAILED) {
+ if (UseNUMAInterleaving) {
+ numa_make_global(addr, size);
+ }
+ return true;
+ }
+ return false;
}
// Define MAP_HUGETLB here so we can build HotSpot on old systems.
@@ -2519,10 +2523,20 @@ bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
(uintptr_t) ::mmap(addr, size, prot,
MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS|MAP_HUGETLB,
-1, 0);
- return res != (uintptr_t) MAP_FAILED;
+ if (res != (uintptr_t) MAP_FAILED) {
+ if (UseNUMAInterleaving) {
+ numa_make_global(addr, size);
+ }
+ return true;
+ }
+ // Fall through and try to use small pages
}
- return commit_memory(addr, size, exec);
+ if (commit_memory(addr, size, exec)) {
+ realign_memory(addr, size, alignment_hint);
+ return true;
+ }
+ return false;
}
void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
@@ -2534,7 +2548,7 @@ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
}
void os::free_memory(char *addr, size_t bytes) {
- ::madvise(addr, bytes, MADV_DONTNEED);
+ commit_memory(addr, bytes, false);
}
void os::numa_make_global(char *addr, size_t bytes) {
@@ -2578,6 +2592,31 @@ char *os::scan_pages(char *start, char* end, page_info* page_expected, page_info
return end;
}
+
+int os::Linux::sched_getcpu_syscall(void) {
+ unsigned int cpu;
+ int retval = -1;
+
+#if defined(IA32)
+# ifndef SYS_getcpu
+# define SYS_getcpu 318
+# endif
+ retval = syscall(SYS_getcpu, &cpu, NULL, NULL);
+#elif defined(AMD64)
+// Unfortunately we have to bring all these macros here from vsyscall.h
+// to be able to compile on old linuxes.
+# define __NR_vgetcpu 2
+# define VSYSCALL_START (-10UL << 20)
+# define VSYSCALL_SIZE 1024
+# define VSYSCALL_ADDR(vsyscall_nr) (VSYSCALL_START+VSYSCALL_SIZE*(vsyscall_nr))
+ typedef long (*vgetcpu_t)(unsigned int *cpu, unsigned int *node, unsigned long *tcache);
+ vgetcpu_t vgetcpu = (vgetcpu_t)VSYSCALL_ADDR(__NR_vgetcpu);
+ retval = vgetcpu(&cpu, NULL, NULL);
+#endif
+
+ return (retval == -1) ? retval : cpu;
+}
+
// Something to do with the numa-aware allocator needs these symbols
extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
extern "C" JNIEXPORT void numa_error(char *where) { }
@@ -2601,6 +2640,10 @@ bool os::Linux::libnuma_init() {
set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t,
dlsym(RTLD_DEFAULT, "sched_getcpu")));
+ // If it's not, try a direct syscall.
+ if (sched_getcpu() == -1)
+ set_sched_getcpu(CAST_TO_FN_PTR(sched_getcpu_func_t, (void*)&sched_getcpu_syscall));
+
if (sched_getcpu() != -1) { // Does it work?
void *handle = dlopen("libnuma.so.1", RTLD_LAZY);
if (handle != NULL) {
@@ -3091,6 +3134,10 @@ char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
return NULL;
}
+ if ((addr != NULL) && UseNUMAInterleaving) {
+ numa_make_global(addr, bytes);
+ }
+
return addr;
}
@@ -3846,14 +3893,19 @@ void os::Linux::install_signal_handlers() {
}
// We don't activate signal checker if libjsig is in place, we trust ourselves
- // and if UserSignalHandler is installed all bets are off
+ // and if UserSignalHandler is installed all bets are off.
+ // Log that signal checking is off only if -verbose:jni is specified.
if (CheckJNICalls) {
if (libjsig_is_loaded) {
- tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ if (PrintJNIResolving) {
+ tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ }
check_signals = false;
}
if (AllowUserSignalHandlers) {
- tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ if (PrintJNIResolving) {
+ tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ }
check_signals = false;
}
}
diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/hotspot/src/os/linux/vm/os_linux.hpp
index c0a63fe..ec32232 100644
--- a/hotspot/src/os/linux/vm/os_linux.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.hpp
@@ -263,6 +263,7 @@ private:
static void set_numa_tonode_memory(numa_tonode_memory_func_t func) { _numa_tonode_memory = func; }
static void set_numa_interleave_memory(numa_interleave_memory_func_t func) { _numa_interleave_memory = func; }
static void set_numa_all_nodes(unsigned long* ptr) { _numa_all_nodes = ptr; }
+ static int sched_getcpu_syscall(void);
public:
static int sched_getcpu() { return _sched_getcpu != NULL ? _sched_getcpu() : -1; }
static int numa_node_to_cpus(int node, unsigned long *buffer, int bufferlen) {
diff --git a/hotspot/src/os/posix/launcher/java_md.c b/hotspot/src/os/posix/launcher/java_md.c
index 3ee0f20..63cee98 100644
--- a/hotspot/src/os/posix/launcher/java_md.c
+++ b/hotspot/src/os/posix/launcher/java_md.c
@@ -41,14 +41,21 @@
#include "version_comp.h"
#endif
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
#include <pthread.h>
#else
#include <thread.h>
#endif
+#ifdef __APPLE__
+#define JVM_DLL "libjvm.dylib"
+#define JAVA_DLL "libjava.dylib"
+#define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
+#else
#define JVM_DLL "libjvm.so"
#define JAVA_DLL "libjava.so"
+#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
+#endif
#ifndef GAMMA /* launcher.make defines ARCH */
/*
@@ -423,10 +430,10 @@ CreateExecutionEnvironment(int *_argcp,
* If not on Solaris, assume only a single LD_LIBRARY_PATH
* variable.
*/
- runpath = getenv("LD_LIBRARY_PATH");
+ runpath = getenv(LD_LIBRARY_PATH);
#endif /* __sun */
-#ifdef __linux
+#if defined(__linux__)
/*
* On linux, if a binary is running as sgid or suid, glibc sets
* LD_LIBRARY_PATH to the empty string for security purposes. (In
@@ -442,6 +449,22 @@ CreateExecutionEnvironment(int *_argcp,
if((getgid() != getegid()) || (getuid() != geteuid()) ) {
return;
}
+#elif defined(_ALLBSD_SOURCE)
+ /*
+ * On BSD, if a binary is running as sgid or suid, libc sets
+ * LD_LIBRARY_PATH to the empty string for security purposes. (In
+ * contrast, on Solaris the LD_LIBRARY_PATH variable for a
+ * privileged binary does not lose its settings; but the dynamic
+ * linker does apply more scrutiny to the path.) The launcher uses
+ * the value of LD_LIBRARY_PATH to prevent an exec loop.
+ * Therefore, if we are running sgid or suid, this function's
+ * setting of LD_LIBRARY_PATH will be ineffective and we should
+ * return from the function now. Getting the right libraries to
+ * be found must be handled through other mechanisms.
+ */
+ if(issetugid()) {
+ return;
+ }
#endif
/* runpath contains current effective LD_LIBRARY_PATH setting */
@@ -450,7 +473,7 @@ CreateExecutionEnvironment(int *_argcp,
new_runpath = JLI_MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
2*strlen(jrepath) + 2*strlen(arch) +
strlen(jvmpath) + 52);
- newpath = new_runpath + strlen("LD_LIBRARY_PATH=");
+ newpath = new_runpath + strlen(LD_LIBRARY_PATH "=");
/*
@@ -465,7 +488,7 @@ CreateExecutionEnvironment(int *_argcp,
/* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */
- sprintf(new_runpath, "LD_LIBRARY_PATH="
+ sprintf(new_runpath, LD_LIBRARY_PATH "="
"%s:"
"%s/lib/%s:"
"%s/../lib/%s",
@@ -792,7 +815,7 @@ error:
jboolean
GetApplicationHome(char *buf, jint bufsize)
{
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
char *execname = GetExecname();
if (execname) {
strncpy(buf, execname, bufsize-1);
@@ -1175,7 +1198,7 @@ get_cpuid(uint32_t arg,
#endif /* __sun && i586 */
-#if defined(__linux__) && defined(i586)
+#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(i586)
/*
* A utility method for asking the CPU about itself.
@@ -1452,6 +1475,39 @@ linux_i586_ServerClassMachine(void) {
#endif /* __linux__ && i586 */
+#if defined(_ALLBSD_SOURCE) && defined(i586)
+
+/* The definition of a server-class machine for bsd-i586 */
+jboolean
+bsd_i586_ServerClassMachine(void) {
+ jboolean result = JNI_FALSE;
+ /* How big is a server class machine? */
+ const unsigned long server_processors = 2UL;
+ const uint64_t server_memory = 2UL * GB;
+ /*
+ * We seem not to get our full complement of memory.
+ * We allow some part (1/8?) of the memory to be "missing",
+ * based on the sizes of DIMMs, and maybe graphics cards.
+ */
+ const uint64_t missing_memory = 256UL * MB;
+ const uint64_t actual_memory = physical_memory();
+
+ /* Is this a server class machine? */
+ if (actual_memory >= (server_memory - missing_memory)) {
+ const unsigned long actual_processors = physical_processors();
+ if (actual_processors >= server_processors) {
+ result = JNI_TRUE;
+ }
+ }
+ if (_launcher_debug) {
+ printf("linux_" LIBARCHNAME "_ServerClassMachine: %s\n",
+ (result == JNI_TRUE ? "true" : "false"));
+ }
+ return result;
+}
+
+#endif /* _ALLBSD_SOURCE && i586 */
+
/* Dispatch to the platform-specific definition of "server-class" */
jboolean
ServerClassMachine(void) {
@@ -1466,6 +1522,8 @@ ServerClassMachine(void) {
result = solaris_i586_ServerClassMachine();
#elif defined(__linux__) && defined(i586)
result = linux_i586_ServerClassMachine();
+#elif defined(_ALLBSD_SOURCE) && defined(i586)
+ result = bsd_i586_ServerClassMachine();
#else
if (_launcher_debug) {
printf("ServerClassMachine: returns default value of %s\n",
@@ -1821,7 +1879,7 @@ jlong_format_specifier() {
int
ContinueInNewThread(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
int rslt;
-#ifdef __linux__
+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
diff --git a/hotspot/src/os/posix/launcher/launcher.script b/hotspot/src/os/posix/launcher/launcher.script
index 22ed66b..21bf44e 100644
--- a/hotspot/src/os/posix/launcher/launcher.script
+++ b/hotspot/src/os/posix/launcher/launcher.script
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/hotspot/src/os/solaris/vm/os_solaris.cpp b/hotspot/src/os/solaris/vm/os_solaris.cpp
index 3280040..fb03515 100644
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp
@@ -2777,8 +2777,14 @@ int os::vm_allocation_granularity() {
bool os::commit_memory(char* addr, size_t bytes, bool exec) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
size_t size = bytes;
- return
- NULL != Solaris::mmap_chunk(addr, size, MAP_PRIVATE|MAP_FIXED, prot);
+ char *res = Solaris::mmap_chunk(addr, size, MAP_PRIVATE|MAP_FIXED, prot);
+ if (res != NULL) {
+ if (UseNUMAInterleaving) {
+ numa_make_global(addr, bytes);
+ }
+ return true;
+ }
+ return false;
}
bool os::commit_memory(char* addr, size_t bytes, size_t alignment_hint,
@@ -3252,7 +3258,6 @@ bool os::unguard_memory(char* addr, size_t bytes) {
// supported Solaris versions, this combination
// is equivalent to +UseISM -UseMPSS.
-typedef int (*getpagesizes_func_type) (size_t[], int);
static size_t _large_page_size = 0;
bool os::Solaris::ism_sanity_check(bool warn, size_t * page_size) {
@@ -3284,23 +3289,29 @@ static void insertion_sort_descending(size_t* array, int len) {
}
bool os::Solaris::mpss_sanity_check(bool warn, size_t * page_size) {
- getpagesizes_func_type getpagesizes_func =
- CAST_TO_FN_PTR(getpagesizes_func_type, dlsym(RTLD_DEFAULT, "getpagesizes"));
- if (getpagesizes_func == NULL) {
- if (warn) {
- warning("MPSS is not supported by the operating system.");
- }
- return false;
- }
-
const unsigned int usable_count = VM_Version::page_size_count();
if (usable_count == 1) {
return false;
}
+ // Find the right getpagesizes interface. When solaris 11 is the minimum
+ // build platform, getpagesizes() (without the '2') can be called directly.
+ typedef int (*gps_t)(size_t[], int);
+ gps_t gps_func = CAST_TO_FN_PTR(gps_t, dlsym(RTLD_DEFAULT, "getpagesizes2"));
+ if (gps_func == NULL) {
+ gps_func = CAST_TO_FN_PTR(gps_t, dlsym(RTLD_DEFAULT, "getpagesizes"));
+ if (gps_func == NULL) {
+ if (warn) {
+ warning("MPSS is not supported by the operating system.");
+ }
+ return false;
+ }
+ }
+
// Fill the array of page sizes.
- int n = getpagesizes_func(_page_sizes, page_sizes_max);
+ int n = (*gps_func)(_page_sizes, page_sizes_max);
assert(n > 0, "Solaris bug?");
+
if (n == page_sizes_max) {
// Add a sentinel value (necessary only if the array was completely filled
// since it is static (zeroed at initialization)).
@@ -3308,6 +3319,7 @@ bool os::Solaris::mpss_sanity_check(bool warn, size_t * page_size) {
DEBUG_ONLY(warning("increase the size of the os::_page_sizes array.");)
}
assert(_page_sizes[n] == 0, "missing sentinel");
+ trace_page_sizes("available page sizes", _page_sizes, n);
if (n == 1) return false; // Only one page size available.
@@ -3337,6 +3349,7 @@ bool os::Solaris::mpss_sanity_check(bool warn, size_t * page_size) {
}
*page_size = _page_sizes[0];
+ trace_page_sizes("usable page sizes", _page_sizes, end + 1);
return true;
}
@@ -3382,12 +3395,11 @@ bool os::Solaris::set_mpss_range(caddr_t start, size_t bytes, size_t align) {
return true;
}
-char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
+char* os::reserve_memory_special(size_t size, char* addr, bool exec) {
// "exec" is passed in but not used. Creating the shared image for
// the code cache doesn't have an SHM_X executable permission to check.
assert(UseLargePages && UseISM, "only for ISM large pages");
- size_t size = bytes;
char* retAddr = NULL;
int shmid;
key_t ismKey;
@@ -3429,7 +3441,9 @@ char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
}
return NULL;
}
-
+ if ((retAddr != NULL) && UseNUMAInterleaving) {
+ numa_make_global(retAddr, size);
+ }
return retAddr;
}
@@ -4578,14 +4592,19 @@ void os::Solaris::install_signal_handlers() {
}
// We don't activate signal checker if libjsig is in place, we trust ourselves
- // and if UserSignalHandler is installed all bets are off
+ // and if UserSignalHandler is installed all bets are off.
+ // Log that signal checking is off only if -verbose:jni is specified.
if (CheckJNICalls) {
if (libjsig_is_loaded) {
- tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ if (PrintJNIResolving) {
+ tty->print_cr("Info: libjsig is activated, all active signal checking is disabled");
+ }
check_signals = false;
}
if (AllowUserSignalHandlers) {
- tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ if (PrintJNIResolving) {
+ tty->print_cr("Info: AllowUserSignalHandlers is activated, all active signal checking is disabled");
+ }
check_signals = false;
}
}
diff --git a/hotspot/src/os/windows/vm/decoder_windows.cpp b/hotspot/src/os/windows/vm/decoder_windows.cpp
index c4eaf35..942f3ec 100644
--- a/hotspot/src/os/windows/vm/decoder_windows.cpp
+++ b/hotspot/src/os/windows/vm/decoder_windows.cpp
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "prims/jvm.h"
+#include "runtime/os.hpp"
#include "utilities/decoder.hpp"
HMODULE Decoder::_dbghelp_handle = NULL;
@@ -35,7 +36,7 @@ void Decoder::initialize() {
if (!_initialized) {
_initialized = true;
- HMODULE handle = ::LoadLibrary("dbghelp.dll");
+ HINSTANCE handle = os::win32::load_Windows_dll("dbghelp.dll", NULL, 0);
if (!handle) {
_decoder_status = helper_not_found;
return;
diff --git a/hotspot/src/os/windows/vm/jvm_windows.h b/hotspot/src/os/windows/vm/jvm_windows.h
index 6cb292b..dda8f8b 100644
--- a/hotspot/src/os/windows/vm/jvm_windows.h
+++ b/hotspot/src/os/windows/vm/jvm_windows.h
@@ -30,10 +30,33 @@
* JNI conversion, which should be sorted out later.
*/
+// JDK7 requires VS2010
+#if _MSC_VER >= 1600
+// JDK7 minimum platform requirement: Windows XP
+#if _WIN32_WINNT < 0x0501
+#undef _WIN32_WINNT
+#define _WIN32_WINNT 0x0501
+#endif
+#endif
+
#include <windows.h>
-// #include <windef.h>
-// #include <winbase.h>
+#if _MSC_VER <= 1200
+// Psapi.h doesn't come with Visual Studio 6; it can be downloaded as Platform
+// SDK from Microsoft. Here are the definitions copied from Psapi.h
+typedef struct _MODULEINFO {
+ LPVOID lpBaseOfDll;
+ DWORD SizeOfImage;
+ LPVOID EntryPoint;
+} MODULEINFO, *LPMODULEINFO;
+
+#else
+#include <Psapi.h>
+#endif
+
+
+
+#include <Tlhelp32.h>
// #include "jni.h"
diff --git a/hotspot/src/os/windows/vm/os_windows.cpp b/hotspot/src/os/windows/vm/os_windows.cpp
index cfa48b1..9de05fa 100644
--- a/hotspot/src/os/windows/vm/os_windows.cpp
+++ b/hotspot/src/os/windows/vm/os_windows.cpp
@@ -98,7 +98,6 @@
#include <imagehlp.h> // For os::dll_address_to_function_name
/* for enumerating dll libraries */
-#include <tlhelp32.h>
#include <vdmdbg.h>
// for timer info max values which include all bits
@@ -241,11 +240,11 @@ void os::init_system_properties_values() {
/* Win32 library search order (See the documentation for LoadLibrary):
*
* 1. The directory from which application is loaded.
- * 2. The current directory
- * 3. The system wide Java Extensions directory (Java only)
- * 4. System directory (GetSystemDirectory)
- * 5. Windows directory (GetWindowsDirectory)
- * 6. The PATH environment variable
+ * 2. The system wide Java Extensions directory (Java only)
+ * 3. System directory (GetSystemDirectory)
+ * 4. Windows directory (GetWindowsDirectory)
+ * 5. The PATH environment variable
+ * 6. The current directory
*/
char *library_path;
@@ -261,8 +260,6 @@ void os::init_system_properties_values() {
*(strrchr(tmp, '\\')) = '\0';
strcat(library_path, tmp);
- strcat(library_path, ";.");
-
GetWindowsDirectory(tmp, sizeof(tmp));
strcat(library_path, ";");
strcat(library_path, tmp);
@@ -281,6 +278,8 @@ void os::init_system_properties_values() {
strcat(library_path, path_str);
}
+ strcat(library_path, ";.");
+
Arguments::set_library_path(library_path);
FREE_C_HEAP_ARRAY(char, library_path);
}
@@ -939,7 +938,7 @@ void os::check_or_create_dump(void* exceptionRecord, void* contextRecord, char*
return;
}
- dbghelp = LoadLibrary("DBGHELP.DLL");
+ dbghelp = os::win32::load_Windows_dll("DBGHELP.DLL", NULL, 0);
if (dbghelp == NULL) {
VMError::report_coredump_status("Failed to load dbghelp.dll", false);
@@ -1204,70 +1203,6 @@ const char* os::get_current_directory(char *buf, int buflen) {
//-----------------------------------------------------------
// Helper functions for fatal error handler
-
-// The following library functions are resolved dynamically at runtime:
-
-// PSAPI functions, for Windows NT, 2000, XP
-
-// psapi.h doesn't come with Visual Studio 6; it can be downloaded as Platform
-// SDK from Microsoft. Here are the definitions copied from psapi.h
-typedef struct _MODULEINFO {
- LPVOID lpBaseOfDll;
- DWORD SizeOfImage;
- LPVOID EntryPoint;
-} MODULEINFO, *LPMODULEINFO;
-
-static BOOL (WINAPI *_EnumProcessModules) ( HANDLE, HMODULE *, DWORD, LPDWORD );
-static DWORD (WINAPI *_GetModuleFileNameEx) ( HANDLE, HMODULE, LPTSTR, DWORD );
-static BOOL (WINAPI *_GetModuleInformation)( HANDLE, HMODULE, LPMODULEINFO, DWORD );
-
-// ToolHelp Functions, for Windows 95, 98 and ME
-
-static HANDLE(WINAPI *_CreateToolhelp32Snapshot)(DWORD,DWORD) ;
-static BOOL (WINAPI *_Module32First) (HANDLE,LPMODULEENTRY32) ;
-static BOOL (WINAPI *_Module32Next) (HANDLE,LPMODULEENTRY32) ;
-
-bool _has_psapi;
-bool _psapi_init = false;
-bool _has_toolhelp;
-
-static bool _init_psapi() {
- HINSTANCE psapi = LoadLibrary( "PSAPI.DLL" ) ;
- if( psapi == NULL ) return false ;
-
- _EnumProcessModules = CAST_TO_FN_PTR(
- BOOL(WINAPI *)(HANDLE, HMODULE *, DWORD, LPDWORD),
- GetProcAddress(psapi, "EnumProcessModules")) ;
- _GetModuleFileNameEx = CAST_TO_FN_PTR(
- DWORD (WINAPI *)(HANDLE, HMODULE, LPTSTR, DWORD),
- GetProcAddress(psapi, "GetModuleFileNameExA"));
- _GetModuleInformation = CAST_TO_FN_PTR(
- BOOL (WINAPI *)(HANDLE, HMODULE, LPMODULEINFO, DWORD),
- GetProcAddress(psapi, "GetModuleInformation"));
-
- _has_psapi = (_EnumProcessModules && _GetModuleFileNameEx && _GetModuleInformation);
- _psapi_init = true;
- return _has_psapi;
-}
-
-static bool _init_toolhelp() {
- HINSTANCE kernel32 = LoadLibrary("Kernel32.DLL") ;
- if (kernel32 == NULL) return false ;
-
- _CreateToolhelp32Snapshot = CAST_TO_FN_PTR(
- HANDLE(WINAPI *)(DWORD,DWORD),
- GetProcAddress(kernel32, "CreateToolhelp32Snapshot"));
- _Module32First = CAST_TO_FN_PTR(
- BOOL(WINAPI *)(HANDLE,LPMODULEENTRY32),
- GetProcAddress(kernel32, "Module32First" ));
- _Module32Next = CAST_TO_FN_PTR(
- BOOL(WINAPI *)(HANDLE,LPMODULEENTRY32),
- GetProcAddress(kernel32, "Module32Next" ));
-
- _has_toolhelp = (_CreateToolhelp32Snapshot && _Module32First && _Module32Next);
- return _has_toolhelp;
-}
-
#ifdef _WIN64
// Helper routine which returns true if address in
// within the NTDLL address space.
@@ -1279,7 +1214,7 @@ static bool _addr_in_ntdll( address addr )
hmod = GetModuleHandle("NTDLL.DLL");
if ( hmod == NULL ) return false;
- if ( !_GetModuleInformation( GetCurrentProcess(), hmod,
+ if ( !os::PSApiDll::GetModuleInformation( GetCurrentProcess(), hmod,
&minfo, sizeof(MODULEINFO)) )
return false;
@@ -1318,14 +1253,16 @@ static int _enumerate_modules_winnt( int pid, EnumModulesCallbackFunc func, void
static char filename[ MAX_PATH ];
int result = 0;
- if (!_has_psapi && (_psapi_init || !_init_psapi())) return 0;
+ if (!os::PSApiDll::PSApiAvailable()) {
+ return 0;
+ }
hProcess = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ,
FALSE, pid ) ;
if (hProcess == NULL) return 0;
DWORD size_needed;
- if (!_EnumProcessModules(hProcess, modules,
+ if (!os::PSApiDll::EnumProcessModules(hProcess, modules,
sizeof(modules), &size_needed)) {
CloseHandle( hProcess );
return 0;
@@ -1336,13 +1273,13 @@ static int _enumerate_modules_winnt( int pid, EnumModulesCallbackFunc func, void
for (int i = 0; i < MIN2(num_modules, MAX_NUM_MODULES); i++) {
// Get Full pathname:
- if(!_GetModuleFileNameEx(hProcess, modules[i],
+ if(!os::PSApiDll::GetModuleFileNameEx(hProcess, modules[i],
filename, sizeof(filename))) {
filename[0] = '\0';
}
MODULEINFO modinfo;
- if (!_GetModuleInformation(hProcess, modules[i],
+ if (!os::PSApiDll::GetModuleInformation(hProcess, modules[i],
&modinfo, sizeof(modinfo))) {
modinfo.lpBaseOfDll = NULL;
modinfo.SizeOfImage = 0;
@@ -1366,17 +1303,19 @@ static int _enumerate_modules_windows( int pid, EnumModulesCallbackFunc func, vo
static MODULEENTRY32 modentry ;
int result = 0;
- if (!_has_toolhelp) return 0;
+ if (!os::Kernel32Dll::HelpToolsAvailable()) {
+ return 0;
+ }
// Get a handle to a Toolhelp snapshot of the system
- hSnapShot = _CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pid ) ;
+ hSnapShot = os::Kernel32Dll::CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, pid ) ;
if( hSnapShot == INVALID_HANDLE_VALUE ) {
return FALSE ;
}
// iterate through all modules
modentry.dwSize = sizeof(MODULEENTRY32) ;
- bool not_done = _Module32First( hSnapShot, &modentry ) != 0;
+ bool not_done = os::Kernel32Dll::Module32First( hSnapShot, &modentry ) != 0;
while( not_done ) {
// invoke the callback
@@ -1385,7 +1324,7 @@ static int _enumerate_modules_windows( int pid, EnumModulesCallbackFunc func, vo
if (result) break;
modentry.dwSize = sizeof(MODULEENTRY32) ;
- not_done = _Module32Next( hSnapShot, &modentry ) != 0;
+ not_done = os::Kernel32Dll::Module32Next( hSnapShot, &modentry ) != 0;
}
CloseHandle(hSnapShot);
@@ -1631,10 +1570,6 @@ void os::print_dll_info(outputStream *st) {
enumerate_modules(pid, _print_module, (void *)st);
}
-// function pointer to Windows API "GetNativeSystemInfo".
-typedef void (WINAPI *GetNativeSystemInfo_func_type)(LPSYSTEM_INFO);
-static GetNativeSystemInfo_func_type _GetNativeSystemInfo;
-
void os::print_os_info(outputStream* st) {
st->print("OS:");
@@ -1661,17 +1596,10 @@ void os::print_os_info(outputStream* st) {
// find out whether we are running on 64 bit processor or not.
SYSTEM_INFO si;
ZeroMemory(&si, sizeof(SYSTEM_INFO));
- // Check to see if _GetNativeSystemInfo has been initialized.
- if (_GetNativeSystemInfo == NULL) {
- HMODULE hKernel32 = GetModuleHandle(TEXT("kernel32.dll"));
- _GetNativeSystemInfo =
- CAST_TO_FN_PTR(GetNativeSystemInfo_func_type,
- GetProcAddress(hKernel32,
- "GetNativeSystemInfo"));
- if (_GetNativeSystemInfo == NULL)
+ if (!os::Kernel32Dll::GetNativeSystemInfoAvailable()){
GetSystemInfo(&si);
} else {
- _GetNativeSystemInfo(&si);
+ os::Kernel32Dll::GetNativeSystemInfo(&si);
}
if (os_vers == 5002) {
if (osvi.wProductType == VER_NT_WORKSTATION &&
@@ -2683,47 +2611,65 @@ int os::vm_allocation_granularity() {
#define MEM_LARGE_PAGES 0x20000000
#endif
-// GetLargePageMinimum is only available on Windows 2003. The other functions
-// are available on NT but not on Windows 98/Me. We have to resolve them at
-// runtime.
-typedef SIZE_T (WINAPI *GetLargePageMinimum_func_type) (void);
-typedef BOOL (WINAPI *AdjustTokenPrivileges_func_type)
- (HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
-typedef BOOL (WINAPI *OpenProcessToken_func_type) (HANDLE, DWORD, PHANDLE);
-typedef BOOL (WINAPI *LookupPrivilegeValue_func_type) (LPCTSTR, LPCTSTR, PLUID);
-
-static GetLargePageMinimum_func_type _GetLargePageMinimum;
-static AdjustTokenPrivileges_func_type _AdjustTokenPrivileges;
-static OpenProcessToken_func_type _OpenProcessToken;
-static LookupPrivilegeValue_func_type _LookupPrivilegeValue;
-
-static HINSTANCE _kernel32;
-static HINSTANCE _advapi32;
static HANDLE _hProcess;
static HANDLE _hToken;
+// Container for NUMA node list info
+class NUMANodeListHolder {
+private:
+ int *_numa_used_node_list; // allocated below
+ int _numa_used_node_count;
+
+ void free_node_list() {
+ if (_numa_used_node_list != NULL) {
+ FREE_C_HEAP_ARRAY(int, _numa_used_node_list);
+ }
+ }
+
+public:
+ NUMANodeListHolder() {
+ _numa_used_node_count = 0;
+ _numa_used_node_list = NULL;
+ // do rest of initialization in build routine (after function pointers are set up)
+ }
+
+ ~NUMANodeListHolder() {
+ free_node_list();
+ }
+
+ bool build() {
+ DWORD_PTR proc_aff_mask;
+ DWORD_PTR sys_aff_mask;
+ if (!GetProcessAffinityMask(GetCurrentProcess(), &proc_aff_mask, &sys_aff_mask)) return false;
+ ULONG highest_node_number;
+ if (!os::Kernel32Dll::GetNumaHighestNodeNumber(&highest_node_number)) return false;
+ free_node_list();
+ _numa_used_node_list = NEW_C_HEAP_ARRAY(int, highest_node_number + 1);
+ for (unsigned int i = 0; i <= highest_node_number; i++) {
+ ULONGLONG proc_mask_numa_node;
+ if (!os::Kernel32Dll::GetNumaNodeProcessorMask(i, &proc_mask_numa_node)) return false;
+ if ((proc_aff_mask & proc_mask_numa_node)!=0) {
+ _numa_used_node_list[_numa_used_node_count++] = i;
+ }
+ }
+ return (_numa_used_node_count > 1);
+ }
+
+ int get_count() {return _numa_used_node_count;}
+ int get_node_list_entry(int n) {
+ // for indexes out of range, returns -1
+ return (n < _numa_used_node_count ? _numa_used_node_list[n] : -1);
+ }
+
+} numa_node_list_holder;
+
+
+
static size_t _large_page_size = 0;
static bool resolve_functions_for_large_page_init() {
- _kernel32 = LoadLibrary("kernel32.dll");
- if (_kernel32 == NULL) return false;
-
- _GetLargePageMinimum = CAST_TO_FN_PTR(GetLargePageMinimum_func_type,
- GetProcAddress(_kernel32, "GetLargePageMinimum"));
- if (_GetLargePageMinimum == NULL) return false;
-
- _advapi32 = LoadLibrary("advapi32.dll");
- if (_advapi32 == NULL) return false;
-
- _AdjustTokenPrivileges = CAST_TO_FN_PTR(AdjustTokenPrivileges_func_type,
- GetProcAddress(_advapi32, "AdjustTokenPrivileges"));
- _OpenProcessToken = CAST_TO_FN_PTR(OpenProcessToken_func_type,
- GetProcAddress(_advapi32, "OpenProcessToken"));
- _LookupPrivilegeValue = CAST_TO_FN_PTR(LookupPrivilegeValue_func_type,
- GetProcAddress(_advapi32, "LookupPrivilegeValueA"));
- return _AdjustTokenPrivileges != NULL &&
- _OpenProcessToken != NULL &&
- _LookupPrivilegeValue != NULL;
+ return os::Kernel32Dll::GetLargePageMinimumAvailable() &&
+ os::Advapi32Dll::AdvapiAvailable();
}
static bool request_lock_memory_privilege() {
@@ -2732,8 +2678,8 @@ static bool request_lock_memory_privilege() {
LUID luid;
if (_hProcess != NULL &&
- _OpenProcessToken(_hProcess, TOKEN_ADJUST_PRIVILEGES, &_hToken) &&
- _LookupPrivilegeValue(NULL, "SeLockMemoryPrivilege", &luid)) {
+ os::Advapi32Dll::OpenProcessToken(_hProcess, TOKEN_ADJUST_PRIVILEGES, &_hToken) &&
+ os::Advapi32Dll::LookupPrivilegeValue(NULL, "SeLockMemoryPrivilege", &luid)) {
TOKEN_PRIVILEGES tp;
tp.PrivilegeCount = 1;
@@ -2742,7 +2688,7 @@ static bool request_lock_memory_privilege() {
// AdjustTokenPrivileges() may return TRUE even when it couldn't change the
// privilege. Check GetLastError() too. See MSDN document.
- if (_AdjustTokenPrivileges(_hToken, false, &tp, sizeof(tp), NULL, NULL) &&
+ if (os::Advapi32Dll::AdjustTokenPrivileges(_hToken, false, &tp, sizeof(tp), NULL, NULL) &&
(GetLastError() == ERROR_SUCCESS)) {
return true;
}
@@ -2752,20 +2698,159 @@ static bool request_lock_memory_privilege() {
}
static void cleanup_after_large_page_init() {
- _GetLargePageMinimum = NULL;
- _AdjustTokenPrivileges = NULL;
- _OpenProcessToken = NULL;
- _LookupPrivilegeValue = NULL;
- if (_kernel32) FreeLibrary(_kernel32);
- _kernel32 = NULL;
- if (_advapi32) FreeLibrary(_advapi32);
- _advapi32 = NULL;
if (_hProcess) CloseHandle(_hProcess);
_hProcess = NULL;
if (_hToken) CloseHandle(_hToken);
_hToken = NULL;
}
+static bool numa_interleaving_init() {
+ bool success = false;
+ bool use_numa_interleaving_specified = !FLAG_IS_DEFAULT(UseNUMAInterleaving);
+
+ // print a warning if UseNUMAInterleaving flag is specified on command line
+ bool warn_on_failure = use_numa_interleaving_specified;
+# define WARN(msg) if (warn_on_failure) { warning(msg); }
+
+ // NUMAInterleaveGranularity cannot be less than vm_allocation_granularity (or _large_page_size if using large pages)
+ size_t min_interleave_granularity = UseLargePages ? _large_page_size : os::vm_allocation_granularity();
+ NUMAInterleaveGranularity = align_size_up(NUMAInterleaveGranularity, min_interleave_granularity);
+
+ if (os::Kernel32Dll::NumaCallsAvailable()) {
+ if (numa_node_list_holder.build()) {
+ if (PrintMiscellaneous && Verbose) {
+ tty->print("NUMA UsedNodeCount=%d, namely ", numa_node_list_holder.get_count());
+ for (int i = 0; i < numa_node_list_holder.get_count(); i++) {
+ tty->print("%d ", numa_node_list_holder.get_node_list_entry(i));
+ }
+ tty->print("\n");
+ }
+ success = true;
+ } else {
+ WARN("Process does not cover multiple NUMA nodes.");
+ }
+ } else {
+ WARN("NUMA Interleaving is not supported by the operating system.");
+ }
+ if (!success) {
+ if (use_numa_interleaving_specified) WARN("...Ignoring UseNUMAInterleaving flag.");
+ }
+ return success;
+#undef WARN
+}
+
+// this routine is used whenever we need to reserve a contiguous VA range
+// but we need to make separate VirtualAlloc calls for each piece of the range
+// Reasons for doing this:
+// * UseLargePagesIndividualAllocation was set (normally only needed on WS2003 but possible to be set otherwise)
+// * UseNUMAInterleaving requires a separate node for each piece
+static char* allocate_pages_individually(size_t bytes, char* addr, DWORD flags, DWORD prot,
+ bool should_inject_error=false) {
+ char * p_buf;
+ // note: at setup time we guaranteed that NUMAInterleaveGranularity was aligned up to a page size
+ size_t page_size = UseLargePages ? _large_page_size : os::vm_allocation_granularity();
+ size_t chunk_size = UseNUMAInterleaving ? NUMAInterleaveGranularity : page_size;
+
+ // first reserve enough address space in advance since we want to be
+ // able to break a single contiguous virtual address range into multiple
+ // large page commits but WS2003 does not allow reserving large page space
+ // so we just use 4K pages for reserve, this gives us a legal contiguous
+ // address space. then we will deallocate that reservation, and re alloc
+ // using large pages
+ const size_t size_of_reserve = bytes + chunk_size;
+ if (bytes > size_of_reserve) {
+ // Overflowed.
+ return NULL;
+ }
+ p_buf = (char *) VirtualAlloc(addr,
+ size_of_reserve, // size of Reserve
+ MEM_RESERVE,
+ PAGE_READWRITE);
+ // If reservation failed, return NULL
+ if (p_buf == NULL) return NULL;
+
+ os::release_memory(p_buf, bytes + chunk_size);
+
+ // we still need to round up to a page boundary (in case we are using large pages)
+ // but not to a chunk boundary (in case InterleavingGranularity doesn't align with page size)
+ // instead we handle this in the bytes_to_rq computation below
+ p_buf = (char *) align_size_up((size_t)p_buf, page_size);
+
+ // now go through and allocate one chunk at a time until all bytes are
+ // allocated
+ size_t bytes_remaining = bytes;
+ // An overflow of align_size_up() would have been caught above
+ // in the calculation of size_of_reserve.
+ char * next_alloc_addr = p_buf;
+ HANDLE hProc = GetCurrentProcess();
+
+#ifdef ASSERT
+ // Variable for the failure injection
+ long ran_num = os::random();
+ size_t fail_after = ran_num % bytes;
+#endif
+
+ int count=0;
+ while (bytes_remaining) {
+ // select bytes_to_rq to get to the next chunk_size boundary
+
+ size_t bytes_to_rq = MIN2(bytes_remaining, chunk_size - ((size_t)next_alloc_addr % chunk_size));
+ // Note allocate and commit
+ char * p_new;
+
+#ifdef ASSERT
+ bool inject_error_now = should_inject_error && (bytes_remaining <= fail_after);
+#else
+ const bool inject_error_now = false;
+#endif
+
+ if (inject_error_now) {
+ p_new = NULL;
+ } else {
+ if (!UseNUMAInterleaving) {
+ p_new = (char *) VirtualAlloc(next_alloc_addr,
+ bytes_to_rq,
+ flags,
+ prot);
+ } else {
+ // get the next node to use from the used_node_list
+ assert(numa_node_list_holder.get_count() > 0, "Multiple NUMA nodes expected");
+ DWORD node = numa_node_list_holder.get_node_list_entry(count % numa_node_list_holder.get_count());
+ p_new = (char *)os::Kernel32Dll::VirtualAllocExNuma(hProc,
+ next_alloc_addr,
+ bytes_to_rq,
+ flags,
+ prot,
+ node);
+ }
+ }
+
+ if (p_new == NULL) {
+ // Free any allocated pages
+ if (next_alloc_addr > p_buf) {
+ // Some memory was committed so release it.
+ size_t bytes_to_release = bytes - bytes_remaining;
+ os::release_memory(p_buf, bytes_to_release);
+ }
+#ifdef ASSERT
+ if (should_inject_error) {
+ if (TracePageSizes && Verbose) {
+ tty->print_cr("Reserving pages individually failed.");
+ }
+ }
+#endif
+ return NULL;
+ }
+ bytes_remaining -= bytes_to_rq;
+ next_alloc_addr += bytes_to_rq;
+ count++;
+ }
+ // made it this far, success
+ return p_buf;
+}
+
+
+
void os::large_page_init() {
if (!UseLargePages) return;
@@ -2777,7 +2862,7 @@ void os::large_page_init() {
# define WARN(msg) if (warn_on_failure) { warning(msg); }
if (resolve_functions_for_large_page_init()) {
if (request_lock_memory_privilege()) {
- size_t s = _GetLargePageMinimum();
+ size_t s = os::Kernel32Dll::GetLargePageMinimum();
if (s) {
#if defined(IA32) || defined(AMD64)
if (s > 4*M || LargePageSizeInBytes > 4*M) {
@@ -2835,9 +2920,30 @@ char* os::reserve_memory(size_t bytes, char* addr, size_t alignment_hint) {
assert((size_t)addr % os::vm_allocation_granularity() == 0,
"reserve alignment");
assert(bytes % os::vm_allocation_granularity() == 0, "reserve block size");
- char* res = (char*)VirtualAlloc(addr, bytes, MEM_RESERVE, PAGE_READWRITE);
+ char* res;
+ // note that if UseLargePages is on, all the areas that require interleaving
+ // will go thru reserve_memory_special rather than thru here.
+ bool use_individual = (UseNUMAInterleaving && !UseLargePages);
+ if (!use_individual) {
+ res = (char*)VirtualAlloc(addr, bytes, MEM_RESERVE, PAGE_READWRITE);
+ } else {
+ elapsedTimer reserveTimer;
+ if( Verbose && PrintMiscellaneous ) reserveTimer.start();
+ // in numa interleaving, we have to allocate pages individually
+ // (well really chunks of NUMAInterleaveGranularity size)
+ res = allocate_pages_individually(bytes, addr, MEM_RESERVE, PAGE_READWRITE);
+ if (res == NULL) {
+ warning("NUMA page allocation failed");
+ }
+ if( Verbose && PrintMiscellaneous ) {
+ reserveTimer.stop();
+ tty->print_cr("reserve_memory of %Ix bytes took %ld ms (%ld ticks)", bytes,
+ reserveTimer.milliseconds(), reserveTimer.ticks());
+ }
+ }
assert(res == NULL || addr == NULL || addr == res,
"Unexpected address from reserve.");
+
return res;
}
@@ -2867,91 +2973,26 @@ bool os::can_execute_large_page_memory() {
char* os::reserve_memory_special(size_t bytes, char* addr, bool exec) {
const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE;
+ const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES;
- if (UseLargePagesIndividualAllocation) {
+ // with large pages, there are two cases where we need to use Individual Allocation
+ // 1) the UseLargePagesIndividualAllocation flag is set (set by default on WS2003)
+ // 2) NUMA Interleaving is enabled, in which case we use a different node for each page
+ if (UseLargePagesIndividualAllocation || UseNUMAInterleaving) {
if (TracePageSizes && Verbose) {
tty->print_cr("Reserving large pages individually.");
}
- char * p_buf;
- // first reserve enough address space in advance since we want to be
- // able to break a single contiguous virtual address range into multiple
- // large page commits but WS2003 does not allow reserving large page space
- // so we just use 4K pages for reserve, this gives us a legal contiguous
- // address space. then we will deallocate that reservation, and re alloc
- // using large pages
- const size_t size_of_reserve = bytes + _large_page_size;
- if (bytes > size_of_reserve) {
- // Overflowed.
- warning("Individually allocated large pages failed, "
- "use -XX:-UseLargePagesIndividualAllocation to turn off");
- return NULL;
- }
- p_buf = (char *) VirtualAlloc(addr,
- size_of_reserve, // size of Reserve
- MEM_RESERVE,
- PAGE_READWRITE);
- // If reservation failed, return NULL
- if (p_buf == NULL) return NULL;
-
- release_memory(p_buf, bytes + _large_page_size);
- // round up to page boundary. If the size_of_reserve did not
- // overflow and the reservation did not fail, this align up
- // should not overflow.
- p_buf = (char *) align_size_up((size_t)p_buf, _large_page_size);
-
- // now go through and allocate one page at a time until all bytes are
- // allocated
- size_t bytes_remaining = align_size_up(bytes, _large_page_size);
- // An overflow of align_size_up() would have been caught above
- // in the calculation of size_of_reserve.
- char * next_alloc_addr = p_buf;
-
-#ifdef ASSERT
- // Variable for the failure injection
- long ran_num = os::random();
- size_t fail_after = ran_num % bytes;
-#endif
-
- while (bytes_remaining) {
- size_t bytes_to_rq = MIN2(bytes_remaining, _large_page_size);
- // Note allocate and commit
- char * p_new;
-
-#ifdef ASSERT
- bool inject_error = LargePagesIndividualAllocationInjectError &&
- (bytes_remaining <= fail_after);
-#else
- const bool inject_error = false;
-#endif
-
- if (inject_error) {
- p_new = NULL;
- } else {
- p_new = (char *) VirtualAlloc(next_alloc_addr,
- bytes_to_rq,
- MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES,
- prot);
+ char * p_buf = allocate_pages_individually(bytes, addr, flags, prot, LargePagesIndividualAllocationInjectError);
+ if (p_buf == NULL) {
+ // give an appropriate warning message
+ if (UseNUMAInterleaving) {
+ warning("NUMA large page allocation failed, UseLargePages flag ignored");
}
-
- if (p_new == NULL) {
- // Free any allocated pages
- if (next_alloc_addr > p_buf) {
- // Some memory was committed so release it.
- size_t bytes_to_release = bytes - bytes_remaining;
- release_memory(p_buf, bytes_to_release);
- }
-#ifdef ASSERT
- if (UseLargePagesIndividualAllocation &&
- LargePagesIndividualAllocationInjectError) {
- if (TracePageSizes && Verbose) {
- tty->print_cr("Reserving large pages individually failed.");
- }
- }
-#endif
- return NULL;
+ if (UseLargePagesIndividualAllocation) {
+ warning("Individually allocated large pages failed, "
+ "use -XX:-UseLargePagesIndividualAllocation to turn off");
}
- bytes_remaining -= bytes_to_rq;
- next_alloc_addr += bytes_to_rq;
+ return NULL;
}
return p_buf;
@@ -2980,14 +3021,43 @@ bool os::commit_memory(char* addr, size_t bytes, bool exec) {
assert(bytes % os::vm_page_size() == 0, "commit in page-sized chunks");
// Don't attempt to print anything if the OS call fails. We're
// probably low on resources, so the print itself may cause crashes.
- bool result = VirtualAlloc(addr, bytes, MEM_COMMIT, PAGE_READWRITE) != 0;
- if (result != NULL && exec) {
- DWORD oldprot;
- // Windows doc says to use VirtualProtect to get execute permissions
- return VirtualProtect(addr, bytes, PAGE_EXECUTE_READWRITE, &oldprot) != 0;
+
+ // unless we have NUMAInterleaving enabled, the range of a commit
+ // is always within a reserve covered by a single VirtualAlloc
+ // in that case we can just do a single commit for the requested size
+ if (!UseNUMAInterleaving) {
+ if (VirtualAlloc(addr, bytes, MEM_COMMIT, PAGE_READWRITE) == NULL) return false;
+ if (exec) {
+ DWORD oldprot;
+ // Windows doc says to use VirtualProtect to get execute permissions
+ if (!VirtualProtect(addr, bytes, PAGE_EXECUTE_READWRITE, &oldprot)) return false;
+ }
+ return true;
} else {
- return result;
+
+ // when NUMAInterleaving is enabled, the commit might cover a range that
+ // came from multiple VirtualAlloc reserves (using allocate_pages_individually).
+ // VirtualQuery can help us determine that. The RegionSize that VirtualQuery
+ // returns represents the number of bytes that can be committed in one step.
+ size_t bytes_remaining = bytes;
+ char * next_alloc_addr = addr;
+ while (bytes_remaining > 0) {
+ MEMORY_BASIC_INFORMATION alloc_info;
+ VirtualQuery(next_alloc_addr, &alloc_info, sizeof(alloc_info));
+ size_t bytes_to_rq = MIN2(bytes_remaining, (size_t)alloc_info.RegionSize);
+ if (VirtualAlloc(next_alloc_addr, bytes_to_rq, MEM_COMMIT, PAGE_READWRITE) == NULL)
+ return false;
+ if (exec) {
+ DWORD oldprot;
+ if (!VirtualProtect(next_alloc_addr, bytes_to_rq, PAGE_EXECUTE_READWRITE, &oldprot))
+ return false;
+ }
+ bytes_remaining -= bytes_to_rq;
+ next_alloc_addr += bytes_to_rq;
+ }
}
+ // if we made it this far, return true
+ return true;
}
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
@@ -3061,14 +3131,21 @@ void os::free_memory(char *addr, size_t bytes) { }
void os::numa_make_global(char *addr, size_t bytes) { }
void os::numa_make_local(char *addr, size_t bytes, int lgrp_hint) { }
bool os::numa_topology_changed() { return false; }
-size_t os::numa_get_groups_num() { return 1; }
+size_t os::numa_get_groups_num() { return MAX2(numa_node_list_holder.get_count(), 1); }
int os::numa_get_group_id() { return 0; }
size_t os::numa_get_leaf_groups(int *ids, size_t size) {
- if (size > 0) {
+ if (numa_node_list_holder.get_count() == 0 && size > 0) {
+ // Provide an answer for UMA systems
ids[0] = 0;
return 1;
+ } else {
+ // check for size bigger than actual groups_num
+ size = MIN2(size, numa_get_groups_num());
+ for (int i = 0; i < (int)size; i++) {
+ ids[i] = numa_node_list_holder.get_node_list_entry(i);
+ }
+ return size;
}
- return 0;
}
bool os::get_page_info(char *start, page_info* info) {
@@ -3190,18 +3267,10 @@ typedef BOOL (WINAPI * STTSignature)(void) ;
os::YieldResult os::NakedYield() {
// Use either SwitchToThread() or Sleep(0)
// Consider passing back the return value from SwitchToThread().
- // We use GetProcAddress() as ancient Win9X versions of windows doen't support SwitchToThread.
- // In that case we revert to Sleep(0).
- static volatile STTSignature stt = (STTSignature) 1 ;
-
- if (stt == ((STTSignature) 1)) {
- stt = (STTSignature) ::GetProcAddress (LoadLibrary ("Kernel32.dll"), "SwitchToThread") ;
- // It's OK if threads race during initialization as the operation above is idempotent.
- }
- if (stt != NULL) {
- return (*stt)() ? os::YIELD_SWITCHED : os::YIELD_NONEREADY ;
+ if (os::Kernel32Dll::SwitchToThreadAvailable()) {
+ return SwitchToThread() ? os::YIELD_SWITCHED : os::YIELD_NONEREADY ;
} else {
- Sleep (0) ;
+ Sleep(0);
}
return os::YIELD_UNKNOWN ;
}
@@ -3425,6 +3494,44 @@ void os::win32::initialize_system_info() {
}
+HINSTANCE os::win32::load_Windows_dll(const char* name, char *ebuf, int ebuflen) {
+ char path[MAX_PATH];
+ DWORD size;
+ DWORD pathLen = (DWORD)sizeof(path);
+ HINSTANCE result = NULL;
+
+ // only allow library name without path component
+ assert(strchr(name, '\\') == NULL, "path not allowed");
+ assert(strchr(name, ':') == NULL, "path not allowed");
+ if (strchr(name, '\\') != NULL || strchr(name, ':') != NULL) {
+ jio_snprintf(ebuf, ebuflen,
+ "Invalid parameter while calling os::win32::load_windows_dll(): cannot take path: %s", name);
+ return NULL;
+ }
+
+ // search system directory
+ if ((size = GetSystemDirectory(path, pathLen)) > 0) {
+ strcat(path, "\\");
+ strcat(path, name);
+ if ((result = (HINSTANCE)os::dll_load(path, ebuf, ebuflen)) != NULL) {
+ return result;
+ }
+ }
+
+ // try Windows directory
+ if ((size = GetWindowsDirectory(path, pathLen)) > 0) {
+ strcat(path, "\\");
+ strcat(path, name);
+ if ((result = (HINSTANCE)os::dll_load(path, ebuf, ebuflen)) != NULL) {
+ return result;
+ }
+ }
+
+ jio_snprintf(ebuf, ebuflen,
+ "os::win32::load_windows_dll() cannot load %s from system directories.", name);
+ return NULL;
+}
+
void os::win32::setmode_streams() {
_setmode(_fileno(stdin), _O_BINARY);
_setmode(_fileno(stdout), _O_BINARY);
@@ -3563,7 +3670,7 @@ jint os::init_2(void) {
if(Verbose && PrintMiscellaneous)
tty->print("[Memory Serialize Page address: " INTPTR_FORMAT "]\n", (intptr_t)mem_serialize_page);
#endif
-}
+ }
os::large_page_init();
@@ -3658,10 +3765,6 @@ jint os::init_2(void) {
}
}
- // initialize PSAPI or ToolHelp for fatal error handler
- if (win32::is_nt()) _init_psapi();
- else _init_toolhelp();
-
#ifndef _WIN64
// Print something if NX is enabled (win32 on AMD64)
NOT_PRODUCT(if (PrintMiscellaneous && Verbose) nx_check_protection());
@@ -3671,7 +3774,13 @@ jint os::init_2(void) {
prio_init();
if (UseNUMA && !ForceNUMA) {
- UseNUMA = false; // Currently unsupported.
+ UseNUMA = false; // We don't fully support this yet
+ }
+
+ if (UseNUMAInterleaving) {
+ // first check whether this Windows OS supports VirtualAllocExNuma, if not ignore this flag
+ bool success = numa_interleaving_init();
+ if (!success) UseNUMAInterleaving = false;
}
return JNI_OK;
@@ -4708,12 +4817,6 @@ static int getLastErrorString(char *buf, size_t len)
// We don't build a headless jre for Windows
bool os::is_headless_jre() { return false; }
-// OS_SocketInterface
-// Not used on Windows
-
-// OS_SocketInterface
-typedef struct hostent * (PASCAL FAR *ws2_ifn_ptr_t)(...);
-ws2_ifn_ptr_t *get_host_by_name_fn = NULL;
typedef CRITICAL_SECTION mutex_t;
#define mutexInit(m) InitializeCriticalSection(m)
@@ -4721,58 +4824,36 @@ typedef CRITICAL_SECTION mutex_t;
#define mutexLock(m) EnterCriticalSection(m)
#define mutexUnlock(m) LeaveCriticalSection(m)
-static bool sockfnptrs_initialized = FALSE;
+static bool sock_initialized = FALSE;
static mutex_t sockFnTableMutex;
-/* is Winsock2 loaded? better to be explicit than to rely on sockfnptrs */
-static bool winsock2Available = FALSE;
-
-
-static void initSockFnTable() {
- int (PASCAL FAR* WSAStartupPtr)(WORD, LPWSADATA);
+static void initSock() {
WSADATA wsadata;
- ::mutexInit(&sockFnTableMutex);
- ::mutexLock(&sockFnTableMutex);
-
- if (sockfnptrs_initialized == FALSE) {
- HMODULE hWinsock;
-
- /* try to load Winsock2, and if that fails, load Winsock */
- hWinsock = ::LoadLibrary("ws2_32.dll");
-
- if (hWinsock == NULL) {
- jio_fprintf(stderr, "Could not load Winsock 2 (error: %d)\n",
+ if (!os::WinSock2Dll::WinSock2Available()) {
+ jio_fprintf(stderr, "Could not load Winsock 2 (error: %d)\n",
::GetLastError());
- return;
- }
-
- /* If we loaded a DLL, then we might as well initialize it. */
- WSAStartupPtr = (int (PASCAL FAR *)(WORD, LPWSADATA))
- ::GetProcAddress(hWinsock, "WSAStartup");
-
- if (WSAStartupPtr(MAKEWORD(1,1), &wsadata) != 0) {
- jio_fprintf(stderr, "Could not initialize Winsock\n");
- }
-
- get_host_by_name_fn
- = (ws2_ifn_ptr_t*) GetProcAddress(hWinsock, "gethostbyname");
+ return;
}
+ if (sock_initialized == TRUE) return;
- assert(get_host_by_name_fn != NULL,
- "gethostbyname function not found");
- sockfnptrs_initialized = TRUE;
+ ::mutexInit(&sockFnTableMutex);
+ ::mutexLock(&sockFnTableMutex);
+ if (os::WinSock2Dll::WSAStartup(MAKEWORD(1,1), &wsadata) != 0) {
+ jio_fprintf(stderr, "Could not initialize Winsock\n");
+ }
+ sock_initialized = TRUE;
::mutexUnlock(&sockFnTableMutex);
}
struct hostent* os::get_host_by_name(char* name) {
- if (!sockfnptrs_initialized) {
- initSockFnTable();
+ if (!sock_initialized) {
+ initSock();
}
-
- assert(sockfnptrs_initialized == TRUE && get_host_by_name_fn != NULL,
- "sockfnptrs is not initialized or pointer to gethostbyname function is NULL");
- return (*get_host_by_name_fn)(name);
+ if (!os::WinSock2Dll::WinSock2Available()) {
+ return NULL;
+ }
+ return (struct hostent*)os::WinSock2Dll::gethostbyname(name);
}
@@ -4869,3 +4950,414 @@ int os::set_sock_opt(int fd, int level, int optname,
ShouldNotReachHere();
return 0;
}
+
+
+// Kernel32 API
+typedef SIZE_T (WINAPI* GetLargePageMinimum_Fn)(void);
+typedef LPVOID (WINAPI *VirtualAllocExNuma_Fn) (HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD);
+typedef BOOL (WINAPI *GetNumaHighestNodeNumber_Fn) (PULONG);
+typedef BOOL (WINAPI *GetNumaNodeProcessorMask_Fn) (UCHAR, PULONGLONG);
+
+GetLargePageMinimum_Fn os::Kernel32Dll::_GetLargePageMinimum = NULL;
+VirtualAllocExNuma_Fn os::Kernel32Dll::_VirtualAllocExNuma = NULL;
+GetNumaHighestNodeNumber_Fn os::Kernel32Dll::_GetNumaHighestNodeNumber = NULL;
+GetNumaNodeProcessorMask_Fn os::Kernel32Dll::_GetNumaNodeProcessorMask = NULL;
+BOOL os::Kernel32Dll::initialized = FALSE;
+SIZE_T os::Kernel32Dll::GetLargePageMinimum() {
+ assert(initialized && _GetLargePageMinimum != NULL,
+ "GetLargePageMinimumAvailable() not yet called");
+ return _GetLargePageMinimum();
+}
+
+BOOL os::Kernel32Dll::GetLargePageMinimumAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _GetLargePageMinimum != NULL;
+}
+
+BOOL os::Kernel32Dll::NumaCallsAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _VirtualAllocExNuma != NULL;
+}
+
+LPVOID os::Kernel32Dll::VirtualAllocExNuma(HANDLE hProc, LPVOID addr, SIZE_T bytes, DWORD flags, DWORD prot, DWORD node) {
+ assert(initialized && _VirtualAllocExNuma != NULL,
+ "NUMACallsAvailable() not yet called");
+
+ return _VirtualAllocExNuma(hProc, addr, bytes, flags, prot, node);
+}
+
+BOOL os::Kernel32Dll::GetNumaHighestNodeNumber(PULONG ptr_highest_node_number) {
+ assert(initialized && _GetNumaHighestNodeNumber != NULL,
+ "NUMACallsAvailable() not yet called");
+
+ return _GetNumaHighestNodeNumber(ptr_highest_node_number);
+}
+
+BOOL os::Kernel32Dll::GetNumaNodeProcessorMask(UCHAR node, PULONGLONG proc_mask) {
+ assert(initialized && _GetNumaNodeProcessorMask != NULL,
+ "NUMACallsAvailable() not yet called");
+
+ return _GetNumaNodeProcessorMask(node, proc_mask);
+}
+
+
+void os::Kernel32Dll::initializeCommon() {
+ if (!initialized) {
+ HMODULE handle = ::GetModuleHandle("Kernel32.dll");
+ assert(handle != NULL, "Just check");
+ _GetLargePageMinimum = (GetLargePageMinimum_Fn)::GetProcAddress(handle, "GetLargePageMinimum");
+ _VirtualAllocExNuma = (VirtualAllocExNuma_Fn)::GetProcAddress(handle, "VirtualAllocExNuma");
+ _GetNumaHighestNodeNumber = (GetNumaHighestNodeNumber_Fn)::GetProcAddress(handle, "GetNumaHighestNodeNumber");
+ _GetNumaNodeProcessorMask = (GetNumaNodeProcessorMask_Fn)::GetProcAddress(handle, "GetNumaNodeProcessorMask");
+ initialized = TRUE;
+ }
+}
+
+
+
+#ifndef JDK6_OR_EARLIER
+
+void os::Kernel32Dll::initialize() {
+ initializeCommon();
+}
+
+
+// Kernel32 API
+inline BOOL os::Kernel32Dll::SwitchToThread() {
+ return ::SwitchToThread();
+}
+
+inline BOOL os::Kernel32Dll::SwitchToThreadAvailable() {
+ return true;
+}
+
+ // Help tools
+inline BOOL os::Kernel32Dll::HelpToolsAvailable() {
+ return true;
+}
+
+inline HANDLE os::Kernel32Dll::CreateToolhelp32Snapshot(DWORD dwFlags,DWORD th32ProcessId) {
+ return ::CreateToolhelp32Snapshot(dwFlags, th32ProcessId);
+}
+
+inline BOOL os::Kernel32Dll::Module32First(HANDLE hSnapshot,LPMODULEENTRY32 lpme) {
+ return ::Module32First(hSnapshot, lpme);
+}
+
+inline BOOL os::Kernel32Dll::Module32Next(HANDLE hSnapshot,LPMODULEENTRY32 lpme) {
+ return ::Module32Next(hSnapshot, lpme);
+}
+
+
+inline BOOL os::Kernel32Dll::GetNativeSystemInfoAvailable() {
+ return true;
+}
+
+inline void os::Kernel32Dll::GetNativeSystemInfo(LPSYSTEM_INFO lpSystemInfo) {
+ ::GetNativeSystemInfo(lpSystemInfo);
+}
+
+// PSAPI API
+inline BOOL os::PSApiDll::EnumProcessModules(HANDLE hProcess, HMODULE *lpModule, DWORD cb, LPDWORD lpcbNeeded) {
+ return ::EnumProcessModules(hProcess, lpModule, cb, lpcbNeeded);
+}
+
+inline DWORD os::PSApiDll::GetModuleFileNameEx(HANDLE hProcess, HMODULE hModule, LPTSTR lpFilename, DWORD nSize) {
+ return ::GetModuleFileNameEx(hProcess, hModule, lpFilename, nSize);
+}
+
+inline BOOL os::PSApiDll::GetModuleInformation(HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb) {
+ return ::GetModuleInformation(hProcess, hModule, lpmodinfo, cb);
+}
+
+inline BOOL os::PSApiDll::PSApiAvailable() {
+ return true;
+}
+
+
+// WinSock2 API
+inline BOOL os::WinSock2Dll::WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) {
+ return ::WSAStartup(wVersionRequested, lpWSAData);
+}
+
+inline struct hostent* os::WinSock2Dll::gethostbyname(const char *name) {
+ return ::gethostbyname(name);
+}
+
+inline BOOL os::WinSock2Dll::WinSock2Available() {
+ return true;
+}
+
+// Advapi API
+inline BOOL os::Advapi32Dll::AdjustTokenPrivileges(HANDLE TokenHandle,
+ BOOL DisableAllPrivileges, PTOKEN_PRIVILEGES NewState, DWORD BufferLength,
+ PTOKEN_PRIVILEGES PreviousState, PDWORD ReturnLength) {
+ return ::AdjustTokenPrivileges(TokenHandle, DisableAllPrivileges, NewState,
+ BufferLength, PreviousState, ReturnLength);
+}
+
+inline BOOL os::Advapi32Dll::OpenProcessToken(HANDLE ProcessHandle, DWORD DesiredAccess,
+ PHANDLE TokenHandle) {
+ return ::OpenProcessToken(ProcessHandle, DesiredAccess, TokenHandle);
+}
+
+inline BOOL os::Advapi32Dll::LookupPrivilegeValue(LPCTSTR lpSystemName, LPCTSTR lpName, PLUID lpLuid) {
+ return ::LookupPrivilegeValue(lpSystemName, lpName, lpLuid);
+}
+
+inline BOOL os::Advapi32Dll::AdvapiAvailable() {
+ return true;
+}
+
+#else
+// Kernel32 API
+typedef BOOL (WINAPI* SwitchToThread_Fn)(void);
+typedef HANDLE (WINAPI* CreateToolhelp32Snapshot_Fn)(DWORD,DWORD);
+typedef BOOL (WINAPI* Module32First_Fn)(HANDLE,LPMODULEENTRY32);
+typedef BOOL (WINAPI* Module32Next_Fn)(HANDLE,LPMODULEENTRY32);
+typedef void (WINAPI* GetNativeSystemInfo_Fn)(LPSYSTEM_INFO);
+
+SwitchToThread_Fn os::Kernel32Dll::_SwitchToThread = NULL;
+CreateToolhelp32Snapshot_Fn os::Kernel32Dll::_CreateToolhelp32Snapshot = NULL;
+Module32First_Fn os::Kernel32Dll::_Module32First = NULL;
+Module32Next_Fn os::Kernel32Dll::_Module32Next = NULL;
+GetNativeSystemInfo_Fn os::Kernel32Dll::_GetNativeSystemInfo = NULL;
+
+
+void os::Kernel32Dll::initialize() {
+ if (!initialized) {
+ HMODULE handle = ::GetModuleHandle("Kernel32.dll");
+ assert(handle != NULL, "Just check");
+
+ _SwitchToThread = (SwitchToThread_Fn)::GetProcAddress(handle, "SwitchToThread");
+ _CreateToolhelp32Snapshot = (CreateToolhelp32Snapshot_Fn)
+ ::GetProcAddress(handle, "CreateToolhelp32Snapshot");
+ _Module32First = (Module32First_Fn)::GetProcAddress(handle, "Module32First");
+ _Module32Next = (Module32Next_Fn)::GetProcAddress(handle, "Module32Next");
+ _GetNativeSystemInfo = (GetNativeSystemInfo_Fn)::GetProcAddress(handle, "GetNativeSystemInfo");
+ initializeCommon(); // resolve the functions that always need resolving
+
+ initialized = TRUE;
+ }
+}
+
+BOOL os::Kernel32Dll::SwitchToThread() {
+ assert(initialized && _SwitchToThread != NULL,
+ "SwitchToThreadAvailable() not yet called");
+ return _SwitchToThread();
+}
+
+
+BOOL os::Kernel32Dll::SwitchToThreadAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _SwitchToThread != NULL;
+}
+
+// Help tools
+BOOL os::Kernel32Dll::HelpToolsAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _CreateToolhelp32Snapshot != NULL &&
+ _Module32First != NULL &&
+ _Module32Next != NULL;
+}
+
+HANDLE os::Kernel32Dll::CreateToolhelp32Snapshot(DWORD dwFlags,DWORD th32ProcessId) {
+ assert(initialized && _CreateToolhelp32Snapshot != NULL,
+ "HelpToolsAvailable() not yet called");
+
+ return _CreateToolhelp32Snapshot(dwFlags, th32ProcessId);
+}
+
+BOOL os::Kernel32Dll::Module32First(HANDLE hSnapshot,LPMODULEENTRY32 lpme) {
+ assert(initialized && _Module32First != NULL,
+ "HelpToolsAvailable() not yet called");
+
+ return _Module32First(hSnapshot, lpme);
+}
+
+inline BOOL os::Kernel32Dll::Module32Next(HANDLE hSnapshot,LPMODULEENTRY32 lpme) {
+ assert(initialized && _Module32Next != NULL,
+ "HelpToolsAvailable() not yet called");
+
+ return _Module32Next(hSnapshot, lpme);
+}
+
+
+BOOL os::Kernel32Dll::GetNativeSystemInfoAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _GetNativeSystemInfo != NULL;
+}
+
+void os::Kernel32Dll::GetNativeSystemInfo(LPSYSTEM_INFO lpSystemInfo) {
+ assert(initialized && _GetNativeSystemInfo != NULL,
+ "GetNativeSystemInfoAvailable() not yet called");
+
+ _GetNativeSystemInfo(lpSystemInfo);
+}
+
+
+
+// PSAPI API
+
+
+typedef BOOL (WINAPI *EnumProcessModules_Fn)(HANDLE, HMODULE *, DWORD, LPDWORD);
+typedef BOOL (WINAPI *GetModuleFileNameEx_Fn)(HANDLE, HMODULE, LPTSTR, DWORD);;
+typedef BOOL (WINAPI *GetModuleInformation_Fn)(HANDLE, HMODULE, LPMODULEINFO, DWORD);
+
+EnumProcessModules_Fn os::PSApiDll::_EnumProcessModules = NULL;
+GetModuleFileNameEx_Fn os::PSApiDll::_GetModuleFileNameEx = NULL;
+GetModuleInformation_Fn os::PSApiDll::_GetModuleInformation = NULL;
+BOOL os::PSApiDll::initialized = FALSE;
+
+void os::PSApiDll::initialize() {
+ if (!initialized) {
+ HMODULE handle = os::win32::load_Windows_dll("PSAPI.DLL", NULL, 0);
+ if (handle != NULL) {
+ _EnumProcessModules = (EnumProcessModules_Fn)::GetProcAddress(handle,
+ "EnumProcessModules");
+ _GetModuleFileNameEx = (GetModuleFileNameEx_Fn)::GetProcAddress(handle,
+ "GetModuleFileNameExA");
+ _GetModuleInformation = (GetModuleInformation_Fn)::GetProcAddress(handle,
+ "GetModuleInformation");
+ }
+ initialized = TRUE;
+ }
+}
+
+
+
+BOOL os::PSApiDll::EnumProcessModules(HANDLE hProcess, HMODULE *lpModule, DWORD cb, LPDWORD lpcbNeeded) {
+ assert(initialized && _EnumProcessModules != NULL,
+ "PSApiAvailable() not yet called");
+ return _EnumProcessModules(hProcess, lpModule, cb, lpcbNeeded);
+}
+
+DWORD os::PSApiDll::GetModuleFileNameEx(HANDLE hProcess, HMODULE hModule, LPTSTR lpFilename, DWORD nSize) {
+ assert(initialized && _GetModuleFileNameEx != NULL,
+ "PSApiAvailable() not yet called");
+ return _GetModuleFileNameEx(hProcess, hModule, lpFilename, nSize);
+}
+
+BOOL os::PSApiDll::GetModuleInformation(HANDLE hProcess, HMODULE hModule, LPMODULEINFO lpmodinfo, DWORD cb) {
+ assert(initialized && _GetModuleInformation != NULL,
+ "PSApiAvailable() not yet called");
+ return _GetModuleInformation(hProcess, hModule, lpmodinfo, cb);
+}
+
+BOOL os::PSApiDll::PSApiAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _EnumProcessModules != NULL &&
+ _GetModuleFileNameEx != NULL &&
+ _GetModuleInformation != NULL;
+}
+
+
+// WinSock2 API
+typedef int (PASCAL FAR* WSAStartup_Fn)(WORD, LPWSADATA);
+typedef struct hostent *(PASCAL FAR *gethostbyname_Fn)(...);
+
+WSAStartup_Fn os::WinSock2Dll::_WSAStartup = NULL;
+gethostbyname_Fn os::WinSock2Dll::_gethostbyname = NULL;
+BOOL os::WinSock2Dll::initialized = FALSE;
+
+void os::WinSock2Dll::initialize() {
+ if (!initialized) {
+ HMODULE handle = os::win32::load_Windows_dll("ws2_32.dll", NULL, 0);
+ if (handle != NULL) {
+ _WSAStartup = (WSAStartup_Fn)::GetProcAddress(handle, "WSAStartup");
+ _gethostbyname = (gethostbyname_Fn)::GetProcAddress(handle, "gethostbyname");
+ }
+ initialized = TRUE;
+ }
+}
+
+
+BOOL os::WinSock2Dll::WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) {
+ assert(initialized && _WSAStartup != NULL,
+ "WinSock2Available() not yet called");
+ return _WSAStartup(wVersionRequested, lpWSAData);
+}
+
+struct hostent* os::WinSock2Dll::gethostbyname(const char *name) {
+ assert(initialized && _gethostbyname != NULL,
+ "WinSock2Available() not yet called");
+ return _gethostbyname(name);
+}
+
+BOOL os::WinSock2Dll::WinSock2Available() {
+ if (!initialized) {
+ initialize();
+ }
+ return _WSAStartup != NULL &&
+ _gethostbyname != NULL;
+}
+
+typedef BOOL (WINAPI *AdjustTokenPrivileges_Fn)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
+typedef BOOL (WINAPI *OpenProcessToken_Fn)(HANDLE, DWORD, PHANDLE);
+typedef BOOL (WINAPI *LookupPrivilegeValue_Fn)(LPCTSTR, LPCTSTR, PLUID);
+
+AdjustTokenPrivileges_Fn os::Advapi32Dll::_AdjustTokenPrivileges = NULL;
+OpenProcessToken_Fn os::Advapi32Dll::_OpenProcessToken = NULL;
+LookupPrivilegeValue_Fn os::Advapi32Dll::_LookupPrivilegeValue = NULL;
+BOOL os::Advapi32Dll::initialized = FALSE;
+
+void os::Advapi32Dll::initialize() {
+ if (!initialized) {
+ HMODULE handle = os::win32::load_Windows_dll("advapi32.dll", NULL, 0);
+ if (handle != NULL) {
+ _AdjustTokenPrivileges = (AdjustTokenPrivileges_Fn)::GetProcAddress(handle,
+ "AdjustTokenPrivileges");
+ _OpenProcessToken = (OpenProcessToken_Fn)::GetProcAddress(handle,
+ "OpenProcessToken");
+ _LookupPrivilegeValue = (LookupPrivilegeValue_Fn)::GetProcAddress(handle,
+ "LookupPrivilegeValueA");
+ }
+ initialized = TRUE;
+ }
+}
+
+BOOL os::Advapi32Dll::AdjustTokenPrivileges(HANDLE TokenHandle,
+ BOOL DisableAllPrivileges, PTOKEN_PRIVILEGES NewState, DWORD BufferLength,
+ PTOKEN_PRIVILEGES PreviousState, PDWORD ReturnLength) {
+ assert(initialized && _AdjustTokenPrivileges != NULL,
+ "AdvapiAvailable() not yet called");
+ return _AdjustTokenPrivileges(TokenHandle, DisableAllPrivileges, NewState,
+ BufferLength, PreviousState, ReturnLength);
+}
+
+BOOL os::Advapi32Dll::OpenProcessToken(HANDLE ProcessHandle, DWORD DesiredAccess,
+ PHANDLE TokenHandle) {
+ assert(initialized && _OpenProcessToken != NULL,
+ "AdvapiAvailable() not yet called");
+ return _OpenProcessToken(ProcessHandle, DesiredAccess, TokenHandle);
+}
+
+BOOL os::Advapi32Dll::LookupPrivilegeValue(LPCTSTR lpSystemName, LPCTSTR lpName, PLUID lpLuid) {
+ assert(initialized && _LookupPrivilegeValue != NULL,
+ "AdvapiAvailable() not yet called");
+ return _LookupPrivilegeValue(lpSystemName, lpName, lpLuid);
+}
+
+BOOL os::Advapi32Dll::AdvapiAvailable() {
+ if (!initialized) {
+ initialize();
+ }
+ return _AdjustTokenPrivileges != NULL &&
+ _OpenProcessToken != NULL &&
+ _LookupPrivilegeValue != NULL;
+}
+
+#endif
+
diff --git a/hotspot/src/os/windows/vm/os_windows.hpp b/hotspot/src/os/windows/vm/os_windows.hpp
index 5576f0b..353d595 100644
--- a/hotspot/src/os/windows/vm/os_windows.hpp
+++ b/hotspot/src/os/windows/vm/os_windows.hpp
@@ -24,7 +24,6 @@
#ifndef OS_WINDOWS_VM_OS_WINDOWS_HPP
#define OS_WINDOWS_VM_OS_WINDOWS_HPP
-
// Win32_OS defines the interface to windows operating systems
class win32 {
@@ -55,6 +54,9 @@ class win32 {
static julong available_memory();
static julong physical_memory() { return _physical_memory; }
+ // load dll from Windows system directory or Windows directory
+ static HINSTANCE load_Windows_dll(const char* name, char *ebuf, int ebuflen);
+
public:
// Generic interface:
@@ -132,4 +134,112 @@ class PlatformParker : public CHeapObj {
} ;
+// JDK7 requires VS2010
+#if _MSC_VER < 1600
+#define JDK6_OR_EARLIER 1
+#endif
+
+
+
+class WinSock2Dll: AllStatic {
+public:
+ static BOOL WSAStartup(WORD, LPWSADATA);
+ static struct hostent* gethostbyname(const char *name);
+ static BOOL WinSock2Available();
+#ifdef JDK6_OR_EARLIER
+private:
+ static int (PASCAL FAR* _WSAStartup)(WORD, LPWSADATA);
+ static struct hostent *(PASCAL FAR *_gethostbyname)(...);
+ static BOOL initialized;
+
+ static void initialize();
+#endif
+};
+
+class Kernel32Dll: AllStatic {
+public:
+ static BOOL SwitchToThread();
+ static SIZE_T GetLargePageMinimum();
+
+ static BOOL SwitchToThreadAvailable();
+ static BOOL GetLargePageMinimumAvailable();
+
+ // Help tools
+ static BOOL HelpToolsAvailable();
+ static HANDLE CreateToolhelp32Snapshot(DWORD,DWORD);
+ static BOOL Module32First(HANDLE,LPMODULEENTRY32);
+ static BOOL Module32Next(HANDLE,LPMODULEENTRY32);
+
+ static BOOL GetNativeSystemInfoAvailable();
+ static void GetNativeSystemInfo(LPSYSTEM_INFO);
+
+ // NUMA calls
+ static BOOL NumaCallsAvailable();
+ static LPVOID VirtualAllocExNuma(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD);
+ static BOOL GetNumaHighestNodeNumber(PULONG);
+ static BOOL GetNumaNodeProcessorMask(UCHAR, PULONGLONG);
+
+private:
+ // GetLargePageMinimum available on Windows Vista/Windows Server 2003
+ // and later
+ // NUMA calls available Windows Vista/WS2008 and later
+
+ static SIZE_T (WINAPI *_GetLargePageMinimum)(void);
+ static LPVOID (WINAPI *_VirtualAllocExNuma) (HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD);
+ static BOOL (WINAPI *_GetNumaHighestNodeNumber) (PULONG);
+ static BOOL (WINAPI *_GetNumaNodeProcessorMask) (UCHAR, PULONGLONG);
+ static BOOL initialized;
+
+ static void initialize();
+ static void initializeCommon();
+
+#ifdef JDK6_OR_EARLIER
+private:
+ static BOOL (WINAPI *_SwitchToThread)(void);
+ static HANDLE (WINAPI* _CreateToolhelp32Snapshot)(DWORD,DWORD);
+ static BOOL (WINAPI* _Module32First)(HANDLE,LPMODULEENTRY32);
+ static BOOL (WINAPI* _Module32Next)(HANDLE,LPMODULEENTRY32);
+ static void (WINAPI *_GetNativeSystemInfo)(LPSYSTEM_INFO);
+#endif
+
+};
+
+class Advapi32Dll: AllStatic {
+public:
+ static BOOL AdjustTokenPrivileges(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
+ static BOOL OpenProcessToken(HANDLE, DWORD, PHANDLE);
+ static BOOL LookupPrivilegeValue(LPCTSTR, LPCTSTR, PLUID);
+
+ static BOOL AdvapiAvailable();
+
+#ifdef JDK6_OR_EARLIER
+private:
+ static BOOL (WINAPI *_AdjustTokenPrivileges)(HANDLE, BOOL, PTOKEN_PRIVILEGES, DWORD, PTOKEN_PRIVILEGES, PDWORD);
+ static BOOL (WINAPI *_OpenProcessToken)(HANDLE, DWORD, PHANDLE);
+ static BOOL (WINAPI *_LookupPrivilegeValue)(LPCTSTR, LPCTSTR, PLUID);
+ static BOOL initialized;
+
+ static void initialize();
+#endif
+};
+
+class PSApiDll: AllStatic {
+public:
+ static BOOL EnumProcessModules(HANDLE, HMODULE *, DWORD, LPDWORD);
+ static DWORD GetModuleFileNameEx(HANDLE, HMODULE, LPTSTR, DWORD);
+ static BOOL GetModuleInformation(HANDLE, HMODULE, LPMODULEINFO, DWORD);
+
+ static BOOL PSApiAvailable();
+
+#ifdef JDK6_OR_EARLIER
+private:
+ static BOOL (WINAPI *_EnumProcessModules)(HANDLE, HMODULE *, DWORD, LPDWORD);
+ static BOOL (WINAPI *_GetModuleFileNameEx)(HANDLE, HMODULE, LPTSTR, DWORD);;
+ static BOOL (WINAPI *_GetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD);
+ static BOOL initialized;
+
+ static void initialize();
+#endif
+};
+
#endif // OS_WINDOWS_VM_OS_WINDOWS_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp
new file mode 100644
index 0000000..5cd9410
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/assembler_bsd_x86.cpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "asm/assembler.hpp"
+#include "assembler_x86.inline.hpp"
+#include "runtime/os.hpp"
+#include "runtime/threadLocalStorage.hpp"
+
+#ifndef _LP64
+void MacroAssembler::int3() {
+ call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
+}
+
+void MacroAssembler::get_thread(Register thread) {
+ movl(thread, rsp);
+ shrl(thread, PAGE_SHIFT);
+
+ ExternalAddress tls_base((address)ThreadLocalStorage::sp_map_addr());
+ Address index(noreg, thread, Address::times_4);
+ ArrayAddress tls(tls_base, index);
+
+ movptr(thread, tls);
+}
+#else
+void MacroAssembler::int3() {
+ call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
+}
+
+void MacroAssembler::get_thread(Register thread) {
+ // call pthread_getspecific
+ // void * pthread_getspecific(pthread_key_t key);
+ if (thread != rax) {
+ push(rax);
+ }
+ push(rdi);
+ push(rsi);
+ push(rdx);
+ push(rcx);
+ push(r8);
+ push(r9);
+ push(r10);
+ // XXX
+ mov(r10, rsp);
+ andq(rsp, -16);
+ push(r10);
+ push(r11);
+
+ movl(rdi, ThreadLocalStorage::thread_index());
+ call(RuntimeAddress(CAST_FROM_FN_PTR(address, pthread_getspecific)));
+
+ pop(r11);
+ pop(rsp);
+ pop(r10);
+ pop(r9);
+ pop(r8);
+ pop(rcx);
+ pop(rdx);
+ pop(rsi);
+ pop(rdi);
+ if (thread != rax) {
+ mov(thread, rax);
+ pop(rax);
+ }
+}
+#endif
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp b/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp
new file mode 100644
index 0000000..aa47196
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+#ifndef OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
+
+#include "orderAccess_bsd_x86.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/os.hpp"
+#include "vm_version_x86.hpp"
+
+// Implementation of class atomic
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+
+// Adding a lock prefix to an instruction on MP machine
+#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ jint addend = add_value;
+ int mp = os::is_MP();
+ __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+}
+
+inline void Atomic::inc (volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%1) "addl $1,(%0)" :
+ : "r" (dest), "r" (mp) : "cc", "memory");
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ inc_ptr((volatile intptr_t*)dest);
+}
+
+inline void Atomic::dec (volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%1) "subl $1,(%0)" :
+ : "r" (dest), "r" (mp) : "cc", "memory");
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ dec_ptr((volatile intptr_t*)dest);
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ __asm__ volatile ( "xchgl (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+#ifdef AMD64
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ intptr_t addend = add_value;
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%1) "addq $1,(%0)"
+ :
+ : "r" (dest), "r" (mp)
+ : "cc", "memory");
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%1) "subq $1,(%0)"
+ :
+ : "r" (dest), "r" (mp)
+ : "cc", "memory");
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ __asm__ __volatile__ ("xchgq (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+ return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
+ return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+}
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#else // !AMD64
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)Atomic::add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)Atomic::add((jint)add_value, (volatile jint*)dest);
+}
+
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ inc((volatile jint*)dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ dec((volatile jint*)dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+extern "C" {
+ // defined in bsd_x86.s
+ jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
+ void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value) {
+ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value) {
+ return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
+ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ _Atomic_move_long(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, dest);
+}
+
+#endif // AMD64
+
+#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad
new file mode 100644
index 0000000..192a78f
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.ad
@@ -0,0 +1,160 @@
+//
+// Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+// DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+//
+// This code is free software; you can redistribute 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.
+//
+//
+
+// X86 Bsd Architecture Description File
+
+//----------OS-DEPENDENT ENCODING BLOCK-----------------------------------------------------
+// This block specifies the encoding classes used by the compiler to output
+// byte streams. Encoding classes generate functions which are called by
+// Machine Instruction Nodes in order to generate the bit encoding of the
+// instruction. Operands specify their base encoding interface with the
+// interface keyword. There are currently supported four interfaces,
+// REG_INTER, CONST_INTER, MEMORY_INTER, & COND_INTER. REG_INTER causes an
+// operand to generate a function which returns its register number when
+// queried. CONST_INTER causes an operand to generate a function which
+// returns the value of the constant when queried. MEMORY_INTER causes an
+// operand to generate four functions which return the Base Register, the
+// Index Register, the Scale Value, and the Offset Value of the operand when
+// queried. COND_INTER causes an operand to generate six functions which
+// return the encoding code (ie - encoding bits for the instruction)
+// associated with each basic boolean condition for a conditional instruction.
+// Instructions specify two basic values for encoding. They use the
+// ins_encode keyword to specify their encoding class (which must be one of
+// the class names specified in the encoding block), and they use the
+// opcode keyword to specify, in order, their primary, secondary, and
+// tertiary opcode. Only the opcode sections which a particular instruction
+// needs for encoding need to be specified.
+encode %{
+ // Build emit functions for each basic byte or larger field in the intel
+ // encoding scheme (opcode, rm, sib, immediate), and call them from C++
+ // code in the enc_class source block. Emit functions will live in the
+ // main source block for now. In future, we can generalize this by
+ // adding a syntax that specifies the sizes of fields in an order,
+ // so that the adlc can build the emit functions automagically
+
+ enc_class bsd_tlsencode (eRegP dst) %{
+ Register dstReg = as_Register($dst$$reg);
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ masm->get_thread(dstReg);
+ %}
+
+ enc_class bsd_breakpoint %{
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
+ %}
+
+ enc_class call_epilog %{
+ if( VerifyStackAtCalls ) {
+ // Check that stack depth is unchanged: find majik cookie on stack
+ int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP,-3*VMRegImpl::slots_per_word));
+ if(framesize >= 128) {
+ emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
+ emit_d8(cbuf,0xBC);
+ emit_d8(cbuf,0x24);
+ emit_d32(cbuf,framesize); // Find majik cookie from ESP
+ emit_d32(cbuf, 0xbadb100d);
+ }
+ else {
+ emit_opcode(cbuf, 0x81); // cmp [esp+0],0xbadb1ood
+ emit_d8(cbuf,0x7C);
+ emit_d8(cbuf,0x24);
+ emit_d8(cbuf,framesize); // Find majik cookie from ESP
+ emit_d32(cbuf, 0xbadb100d);
+ }
+ // jmp EQ around INT3
+ // QQQ TODO
+ const int jump_around = 5; // size of call to breakpoint, 1 for CC
+ emit_opcode(cbuf,0x74);
+ emit_d8(cbuf, jump_around);
+ // QQQ temporary
+ emit_break(cbuf);
+ // Die if stack mismatch
+ // emit_opcode(cbuf,0xCC);
+ }
+ %}
+
+%}
+
+// INSTRUCTIONS -- Platform dependent
+
+//----------OS and Locking Instructions----------------------------------------
+
+// This name is KNOWN by the ADLC and cannot be changed.
+// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
+// for this guy.
+instruct tlsLoadP(eRegP dst, eFlagsReg cr) %{
+ match(Set dst (ThreadLocal));
+ effect(DEF dst, KILL cr);
+
+ format %{ "MOV $dst, Thread::current()" %}
+ ins_encode( bsd_tlsencode(dst) );
+ ins_pipe( ialu_reg_fat );
+%}
+
+instruct TLS(eRegP dst) %{
+ match(Set dst (ThreadLocal));
+
+ expand %{
+ tlsLoadP(dst);
+ %}
+%}
+
+// Die now
+instruct ShouldNotReachHere( )
+%{
+ match(Halt);
+
+ // Use the following format syntax
+ format %{ "INT3 ; ShouldNotReachHere" %}
+ // QQQ TODO for now call breakpoint
+ // opcode(0xCC);
+ // ins_encode(Opc);
+ ins_encode(bsd_breakpoint);
+ ins_pipe( pipe_slow );
+%}
+
+
+
+// Platform dependent source
+
+source %{
+
+// emit an interrupt that is caught by the debugger
+void emit_break(CodeBuffer &cbuf) {
+
+ // Debugger doesn't really catch this but best we can do so far QQQ
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
+}
+
+void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
+ emit_break(cbuf);
+}
+
+
+uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
+ return 5;
+}
+
+%}
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
new file mode 100644
index 0000000..d35b4a6
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s
@@ -0,0 +1,689 @@
+#
+# 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.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+
+#ifdef __APPLE__
+# Darwin uses _ prefixed global symbols
+#define SYMBOL(s) _ ## s
+#define ELF_TYPE(name, description)
+#else
+#define SYMBOL(s) s
+#define ELF_TYPE(name, description) .type name,description
+#endif
+
+ .globl SYMBOL(fixcw)
+
+ # NOTE WELL! The _Copy functions are called directly
+ # from server-compiler-generated code via CallLeafNoFP,
+ # which means that they *must* either not use floating
+ # point or use it in the same manner as does the server
+ # compiler.
+
+ .globl SYMBOL(_Copy_conjoint_bytes)
+ .globl SYMBOL(_Copy_arrayof_conjoint_bytes)
+ .globl SYMBOL(_Copy_conjoint_jshorts_atomic)
+ .globl SYMBOL(_Copy_arrayof_conjoint_jshorts)
+ .globl SYMBOL(_Copy_conjoint_jints_atomic)
+ .globl SYMBOL(_Copy_arrayof_conjoint_jints)
+ .globl SYMBOL(_Copy_conjoint_jlongs_atomic)
+ .globl SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts)
+
+ .globl SYMBOL(_Atomic_cmpxchg_long)
+ .globl SYMBOL(_Atomic_move_long)
+
+ .text
+
+# Support for void os::Solaris::init_thread_fpu_state() in os_solaris_i486.cpp
+# Set fpu to 53 bit precision. This happens too early to use a stub.
+# ported from solaris_x86_32.s
+ .p2align 4,,15
+SYMBOL(fixcw):
+ pushl $0x27f
+ fldcw 0(%esp)
+ popl %eax
+ ret
+
+ .globl SYMBOL(SafeFetch32), SYMBOL(Fetch32PFI), SYMBOL(Fetch32Resume)
+ .globl SYMBOL(SafeFetchN)
+ ## TODO: avoid exposing Fetch32PFI and Fetch32Resume.
+ ## Instead, the signal handler would call a new SafeFetchTriage(FaultingEIP)
+ ## routine to vet the address. If the address is the faulting LD then
+ ## SafeFetchTriage() would return the resume-at EIP, otherwise null.
+ ELF_TYPE(SafeFetch32, at function)
+ .p2align 4,,15
+SYMBOL(SafeFetch32):
+SYMBOL(SafeFetchN):
+ movl 0x8(%esp), %eax
+ movl 0x4(%esp), %ecx
+SYMBOL(Fetch32PFI):
+ movl (%ecx), %eax
+SYMBOL(Fetch32Resume):
+ ret
+
+
+ .globl SYMBOL(SpinPause)
+ ELF_TYPE(SpinPause, at function)
+ .p2align 4,,15
+SYMBOL(SpinPause):
+ rep
+ nop
+ movl $1, %eax
+ ret
+
+ # Support for void Copy::conjoint_bytes(void* from,
+ # void* to,
+ # size_t count)
+ .p2align 4,,15
+ ELF_TYPE(_Copy_conjoint_bytes, at function)
+SYMBOL(_Copy_conjoint_bytes):
+ pushl %esi
+ movl 4+12(%esp),%ecx # count
+ pushl %edi
+ movl 8+ 4(%esp),%esi # from
+ movl 8+ 8(%esp),%edi # to
+ cmpl %esi,%edi
+ leal -1(%esi,%ecx),%eax # from + count - 1
+ jbe cb_CopyRight
+ cmpl %eax,%edi
+ jbe cb_CopyLeft
+ # copy from low to high
+cb_CopyRight:
+ cmpl $3,%ecx
+ jbe 5f # <= 3 bytes
+ # align source address at dword address boundary
+ movl %ecx,%eax # original count
+ movl $4,%ecx
+ subl %esi,%ecx
+ andl $3,%ecx # prefix byte count
+ jz 1f # no prefix
+ subl %ecx,%eax # byte count less prefix
+ # copy prefix
+ subl %esi,%edi
+0: movb (%esi),%dl
+ movb %dl,(%edi,%esi,1)
+ addl $1,%esi
+ subl $1,%ecx
+ jnz 0b
+ addl %esi,%edi
+1: movl %eax,%ecx # byte count less prefix
+ shrl $2,%ecx # dword count
+ jz 4f # no dwords to move
+ cmpl $32,%ecx
+ jbe 2f # <= 32 dwords
+ # copy aligned dwords
+ rep; smovl
+ jmp 4f
+ # copy aligned dwords
+2: subl %esi,%edi
+ .p2align 4,,15
+3: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ addl $4,%esi
+ subl $1,%ecx
+ jnz 3b
+ addl %esi,%edi
+4: movl %eax,%ecx # byte count less prefix
+5: andl $3,%ecx # suffix byte count
+ jz 7f # no suffix
+ # copy suffix
+ xorl %eax,%eax
+6: movb (%esi,%eax,1),%dl
+ movb %dl,(%edi,%eax,1)
+ addl $1,%eax
+ subl $1,%ecx
+ jnz 6b
+7: popl %edi
+ popl %esi
+ ret
+ # copy from high to low
+cb_CopyLeft:
+ std
+ leal -4(%edi,%ecx),%edi # to + count - 4
+ movl %eax,%esi # from + count - 1
+ movl %ecx,%eax
+ subl $3,%esi # from + count - 4
+ cmpl $3,%ecx
+ jbe 5f # <= 3 bytes
+1: shrl $2,%ecx # dword count
+ jz 4f # no dwords to move
+ cmpl $32,%ecx
+ ja 3f # > 32 dwords
+ # copy dwords, aligned or not
+ subl %esi,%edi
+ .p2align 4,,15
+2: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ subl $4,%esi
+ subl $1,%ecx
+ jnz 2b
+ addl %esi,%edi
+ jmp 4f
+ # copy dwords, aligned or not
+3: rep; smovl
+4: movl %eax,%ecx # byte count
+5: andl $3,%ecx # suffix byte count
+ jz 7f # no suffix
+ # copy suffix
+ subl %esi,%edi
+ addl $3,%esi
+6: movb (%esi),%dl
+ movb %dl,(%edi,%esi,1)
+ subl $1,%esi
+ subl $1,%ecx
+ jnz 6b
+7: cld
+ popl %edi
+ popl %esi
+ ret
+
+ # Support for void Copy::arrayof_conjoint_bytes(void* from,
+ # void* to,
+ # size_t count)
+ #
+ # Same as _Copy_conjoint_bytes, except no source alignment check.
+ .p2align 4,,15
+ ELF_TYPE(_Copy_arrayof_conjoint_bytes, at function)
+SYMBOL(_Copy_arrayof_conjoint_bytes):
+ pushl %esi
+ movl 4+12(%esp),%ecx # count
+ pushl %edi
+ movl 8+ 4(%esp),%esi # from
+ movl 8+ 8(%esp),%edi # to
+ cmpl %esi,%edi
+ leal -1(%esi,%ecx),%eax # from + count - 1
+ jbe acb_CopyRight
+ cmpl %eax,%edi
+ jbe acb_CopyLeft
+ # copy from low to high
+acb_CopyRight:
+ cmpl $3,%ecx
+ jbe 5f
+1: movl %ecx,%eax
+ shrl $2,%ecx
+ jz 4f
+ cmpl $32,%ecx
+ ja 3f
+ # copy aligned dwords
+ subl %esi,%edi
+ .p2align 4,,15
+2: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ addl $4,%esi
+ subl $1,%ecx
+ jnz 2b
+ addl %esi,%edi
+ jmp 4f
+ # copy aligned dwords
+3: rep; smovl
+4: movl %eax,%ecx
+5: andl $3,%ecx
+ jz 7f
+ # copy suffix
+ xorl %eax,%eax
+6: movb (%esi,%eax,1),%dl
+ movb %dl,(%edi,%eax,1)
+ addl $1,%eax
+ subl $1,%ecx
+ jnz 6b
+7: popl %edi
+ popl %esi
+ ret
+acb_CopyLeft:
+ std
+ leal -4(%edi,%ecx),%edi # to + count - 4
+ movl %eax,%esi # from + count - 1
+ movl %ecx,%eax
+ subl $3,%esi # from + count - 4
+ cmpl $3,%ecx
+ jbe 5f
+1: shrl $2,%ecx
+ jz 4f
+ cmpl $32,%ecx
+ jbe 2f # <= 32 dwords
+ rep; smovl
+ jmp 4f
+ .=.+8
+2: subl %esi,%edi
+ .p2align 4,,15
+3: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ subl $4,%esi
+ subl $1,%ecx
+ jnz 3b
+ addl %esi,%edi
+4: movl %eax,%ecx
+5: andl $3,%ecx
+ jz 7f
+ subl %esi,%edi
+ addl $3,%esi
+6: movb (%esi),%dl
+ movb %dl,(%edi,%esi,1)
+ subl $1,%esi
+ subl $1,%ecx
+ jnz 6b
+7: cld
+ popl %edi
+ popl %esi
+ ret
+
+ # Support for void Copy::conjoint_jshorts_atomic(void* from,
+ # void* to,
+ # size_t count)
+ .p2align 4,,15
+ ELF_TYPE(_Copy_conjoint_jshorts_atomic, at function)
+SYMBOL(_Copy_conjoint_jshorts_atomic):
+ pushl %esi
+ movl 4+12(%esp),%ecx # count
+ pushl %edi
+ movl 8+ 4(%esp),%esi # from
+ movl 8+ 8(%esp),%edi # to
+ cmpl %esi,%edi
+ leal -2(%esi,%ecx,2),%eax # from + count*2 - 2
+ jbe cs_CopyRight
+ cmpl %eax,%edi
+ jbe cs_CopyLeft
+ # copy from low to high
+cs_CopyRight:
+ # align source address at dword address boundary
+ movl %esi,%eax # original from
+ andl $3,%eax # either 0 or 2
+ jz 1f # no prefix
+ # copy prefix
+ subl $1,%ecx
+ jl 5f # zero count
+ movw (%esi),%dx
+ movw %dx,(%edi)
+ addl %eax,%esi # %eax == 2
+ addl %eax,%edi
+1: movl %ecx,%eax # word count less prefix
+ sarl %ecx # dword count
+ jz 4f # no dwords to move
+ cmpl $32,%ecx
+ jbe 2f # <= 32 dwords
+ # copy aligned dwords
+ rep; smovl
+ jmp 4f
+ # copy aligned dwords
+2: subl %esi,%edi
+ .p2align 4,,15
+3: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ addl $4,%esi
+ subl $1,%ecx
+ jnz 3b
+ addl %esi,%edi
+4: andl $1,%eax # suffix count
+ jz 5f # no suffix
+ # copy suffix
+ movw (%esi),%dx
+ movw %dx,(%edi)
+5: popl %edi
+ popl %esi
+ ret
+ # copy from high to low
+cs_CopyLeft:
+ std
+ leal -4(%edi,%ecx,2),%edi # to + count*2 - 4
+ movl %eax,%esi # from + count*2 - 2
+ movl %ecx,%eax
+ subl $2,%esi # from + count*2 - 4
+1: sarl %ecx # dword count
+ jz 4f # no dwords to move
+ cmpl $32,%ecx
+ ja 3f # > 32 dwords
+ subl %esi,%edi
+ .p2align 4,,15
+2: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ subl $4,%esi
+ subl $1,%ecx
+ jnz 2b
+ addl %esi,%edi
+ jmp 4f
+3: rep; smovl
+4: andl $1,%eax # suffix count
+ jz 5f # no suffix
+ # copy suffix
+ addl $2,%esi
+ addl $2,%edi
+ movw (%esi),%dx
+ movw %dx,(%edi)
+5: cld
+ popl %edi
+ popl %esi
+ ret
+
+ # Support for void Copy::arrayof_conjoint_jshorts(void* from,
+ # void* to,
+ # size_t count)
+ .p2align 4,,15
+ ELF_TYPE(_Copy_arrayof_conjoint_jshorts, at function)
+SYMBOL(_Copy_arrayof_conjoint_jshorts):
+ pushl %esi
+ movl 4+12(%esp),%ecx # count
+ pushl %edi
+ movl 8+ 4(%esp),%esi # from
+ movl 8+ 8(%esp),%edi # to
+ cmpl %esi,%edi
+ leal -2(%esi,%ecx,2),%eax # from + count*2 - 2
+ jbe acs_CopyRight
+ cmpl %eax,%edi
+ jbe acs_CopyLeft
+acs_CopyRight:
+ movl %ecx,%eax # word count
+ sarl %ecx # dword count
+ jz 4f # no dwords to move
+ cmpl $32,%ecx
+ jbe 2f # <= 32 dwords
+ # copy aligned dwords
+ rep; smovl
+ jmp 4f
+ # copy aligned dwords
+ .=.+5
+2: subl %esi,%edi
+ .p2align 4,,15
+3: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ addl $4,%esi
+ subl $1,%ecx
+ jnz 3b
+ addl %esi,%edi
+4: andl $1,%eax # suffix count
+ jz 5f # no suffix
+ # copy suffix
+ movw (%esi),%dx
+ movw %dx,(%edi)
+5: popl %edi
+ popl %esi
+ ret
+acs_CopyLeft:
+ std
+ leal -4(%edi,%ecx,2),%edi # to + count*2 - 4
+ movl %eax,%esi # from + count*2 - 2
+ movl %ecx,%eax
+ subl $2,%esi # from + count*2 - 4
+ sarl %ecx # dword count
+ jz 4f # no dwords to move
+ cmpl $32,%ecx
+ ja 3f # > 32 dwords
+ subl %esi,%edi
+ .p2align 4,,15
+2: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ subl $4,%esi
+ subl $1,%ecx
+ jnz 2b
+ addl %esi,%edi
+ jmp 4f
+3: rep; smovl
+4: andl $1,%eax # suffix count
+ jz 5f # no suffix
+ # copy suffix
+ addl $2,%esi
+ addl $2,%edi
+ movw (%esi),%dx
+ movw %dx,(%edi)
+5: cld
+ popl %edi
+ popl %esi
+ ret
+
+ # Support for void Copy::conjoint_jints_atomic(void* from,
+ # void* to,
+ # size_t count)
+ # Equivalent to
+ # arrayof_conjoint_jints
+ .p2align 4,,15
+ ELF_TYPE(_Copy_conjoint_jints_atomic, at function)
+ ELF_TYPE(_Copy_arrayof_conjoint_jints, at function)
+SYMBOL(_Copy_conjoint_jints_atomic):
+SYMBOL(_Copy_arrayof_conjoint_jints):
+ pushl %esi
+ movl 4+12(%esp),%ecx # count
+ pushl %edi
+ movl 8+ 4(%esp),%esi # from
+ movl 8+ 8(%esp),%edi # to
+ cmpl %esi,%edi
+ leal -4(%esi,%ecx,4),%eax # from + count*4 - 4
+ jbe ci_CopyRight
+ cmpl %eax,%edi
+ jbe ci_CopyLeft
+ci_CopyRight:
+ cmpl $32,%ecx
+ jbe 2f # <= 32 dwords
+ rep; smovl
+ popl %edi
+ popl %esi
+ ret
+ .=.+10
+2: subl %esi,%edi
+ jmp 4f
+ .p2align 4,,15
+3: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ addl $4,%esi
+4: subl $1,%ecx
+ jge 3b
+ popl %edi
+ popl %esi
+ ret
+ci_CopyLeft:
+ std
+ leal -4(%edi,%ecx,4),%edi # to + count*4 - 4
+ cmpl $32,%ecx
+ ja 4f # > 32 dwords
+ subl %eax,%edi # eax == from + count*4 - 4
+ jmp 3f
+ .p2align 4,,15
+2: movl (%eax),%edx
+ movl %edx,(%edi,%eax,1)
+ subl $4,%eax
+3: subl $1,%ecx
+ jge 2b
+ cld
+ popl %edi
+ popl %esi
+ ret
+4: movl %eax,%esi # from + count*4 - 4
+ rep; smovl
+ cld
+ popl %edi
+ popl %esi
+ ret
+
+ # Support for void Copy::conjoint_jlongs_atomic(jlong* from,
+ # jlong* to,
+ # size_t count)
+ #
+ # 32-bit
+ #
+ # count treated as signed
+ #
+ # // if (from > to) {
+ # while (--count >= 0) {
+ # *to++ = *from++;
+ # }
+ # } else {
+ # while (--count >= 0) {
+ # to[count] = from[count];
+ # }
+ # }
+ .p2align 4,,15
+ ELF_TYPE(_Copy_conjoint_jlongs_atomic, at function)
+SYMBOL(_Copy_conjoint_jlongs_atomic):
+ movl 4+8(%esp),%ecx # count
+ movl 4+0(%esp),%eax # from
+ movl 4+4(%esp),%edx # to
+ cmpl %eax,%edx
+ jae cla_CopyLeft
+cla_CopyRight:
+ subl %eax,%edx
+ jmp 2f
+ .p2align 4,,15
+1: fildll (%eax)
+ fistpll (%edx,%eax,1)
+ addl $8,%eax
+2: subl $1,%ecx
+ jge 1b
+ ret
+ .p2align 4,,15
+3: fildll (%eax,%ecx,8)
+ fistpll (%edx,%ecx,8)
+cla_CopyLeft:
+ subl $1,%ecx
+ jge 3b
+ ret
+
+ # Support for void Copy::arrayof_conjoint_jshorts(void* from,
+ # void* to,
+ # size_t count)
+ .p2align 4,,15
+ ELF_TYPE(_mmx_Copy_arrayof_conjoint_jshorts, at function)
+SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts):
+ pushl %esi
+ movl 4+12(%esp),%ecx
+ pushl %edi
+ movl 8+ 4(%esp),%esi
+ movl 8+ 8(%esp),%edi
+ cmpl %esi,%edi
+ leal -2(%esi,%ecx,2),%eax
+ jbe mmx_acs_CopyRight
+ cmpl %eax,%edi
+ jbe mmx_acs_CopyLeft
+mmx_acs_CopyRight:
+ movl %ecx,%eax
+ sarl %ecx
+ je 5f
+ cmpl $33,%ecx
+ jae 3f
+1: subl %esi,%edi
+ .p2align 4,,15
+2: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ addl $4,%esi
+ subl $1,%ecx
+ jnz 2b
+ addl %esi,%edi
+ jmp 5f
+3: smovl # align to 8 bytes, we know we are 4 byte aligned to start
+ subl $1,%ecx
+4: .p2align 4,,15
+ movq 0(%esi),%mm0
+ addl $64,%edi
+ movq 8(%esi),%mm1
+ subl $16,%ecx
+ movq 16(%esi),%mm2
+ movq %mm0,-64(%edi)
+ movq 24(%esi),%mm0
+ movq %mm1,-56(%edi)
+ movq 32(%esi),%mm1
+ movq %mm2,-48(%edi)
+ movq 40(%esi),%mm2
+ movq %mm0,-40(%edi)
+ movq 48(%esi),%mm0
+ movq %mm1,-32(%edi)
+ movq 56(%esi),%mm1
+ movq %mm2,-24(%edi)
+ movq %mm0,-16(%edi)
+ addl $64,%esi
+ movq %mm1,-8(%edi)
+ cmpl $16,%ecx
+ jge 4b
+ emms
+ testl %ecx,%ecx
+ ja 1b
+5: andl $1,%eax
+ je 7f
+6: movw (%esi),%dx
+ movw %dx,(%edi)
+7: popl %edi
+ popl %esi
+ ret
+mmx_acs_CopyLeft:
+ std
+ leal -4(%edi,%ecx,2),%edi
+ movl %eax,%esi
+ movl %ecx,%eax
+ subl $2,%esi
+ sarl %ecx
+ je 4f
+ cmpl $32,%ecx
+ ja 3f
+ subl %esi,%edi
+ .p2align 4,,15
+2: movl (%esi),%edx
+ movl %edx,(%edi,%esi,1)
+ subl $4,%esi
+ subl $1,%ecx
+ jnz 2b
+ addl %esi,%edi
+ jmp 4f
+3: rep; smovl
+4: andl $1,%eax
+ je 6f
+ addl $2,%esi
+ addl $2,%edi
+5: movw (%esi),%dx
+ movw %dx,(%edi)
+6: cld
+ popl %edi
+ popl %esi
+ ret
+
+
+ # Support for jlong Atomic::cmpxchg(jlong exchange_value,
+ # volatile jlong* dest,
+ # jlong compare_value,
+ # bool is_MP)
+ #
+ .p2align 4,,15
+ ELF_TYPE(_Atomic_cmpxchg_long, at function)
+SYMBOL(_Atomic_cmpxchg_long):
+ # 8(%esp) : return PC
+ pushl %ebx # 4(%esp) : old %ebx
+ pushl %edi # 0(%esp) : old %edi
+ movl 12(%esp), %ebx # 12(%esp) : exchange_value (low)
+ movl 16(%esp), %ecx # 16(%esp) : exchange_value (high)
+ movl 24(%esp), %eax # 24(%esp) : compare_value (low)
+ movl 28(%esp), %edx # 28(%esp) : compare_value (high)
+ movl 20(%esp), %edi # 20(%esp) : dest
+ cmpl $0, 32(%esp) # 32(%esp) : is_MP
+ je 1f
+ lock
+1: cmpxchg8b (%edi)
+ popl %edi
+ popl %ebx
+ ret
+
+
+ # Support for jlong Atomic::load and Atomic::store.
+ # void _Atomic_move_long(volatile jlong* src, volatile jlong* dst)
+ .p2align 4,,15
+ ELF_TYPE(_Atomic_move_long, at function)
+SYMBOL(_Atomic_move_long):
+ movl 4(%esp), %eax # src
+ fildll (%eax)
+ movl 8(%esp), %eax # dest
+ fistpll (%eax)
+ ret
+
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad
new file mode 100644
index 0000000..233a1fe
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.ad
@@ -0,0 +1,173 @@
+//
+// Copyright (c) 2003, 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.
+//
+// This code is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+// version 2 for more details (a copy is included in the LICENSE file that
+// accompanied this code).
+//
+// You should have received a copy of the GNU General Public License version
+// 2 along with this work; if not, write to the Free Software Foundation,
+// Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+// Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+// or visit www.oracle.com if you need additional information or have any
+// questions.
+//
+//
+
+// AMD64 Bsd Architecture Description File
+
+//----------OS-DEPENDENT ENCODING BLOCK----------------------------------------
+// This block specifies the encoding classes used by the compiler to
+// output byte streams. Encoding classes generate functions which are
+// called by Machine Instruction Nodes in order to generate the bit
+// encoding of the instruction. Operands specify their base encoding
+// interface with the interface keyword. There are currently
+// supported four interfaces, REG_INTER, CONST_INTER, MEMORY_INTER, &
+// COND_INTER. REG_INTER causes an operand to generate a function
+// which returns its register number when queried. CONST_INTER causes
+// an operand to generate a function which returns the value of the
+// constant when queried. MEMORY_INTER causes an operand to generate
+// four functions which return the Base Register, the Index Register,
+// the Scale Value, and the Offset Value of the operand when queried.
+// COND_INTER causes an operand to generate six functions which return
+// the encoding code (ie - encoding bits for the instruction)
+// associated with each basic boolean condition for a conditional
+// instruction. Instructions specify two basic values for encoding.
+// They use the ins_encode keyword to specify their encoding class
+// (which must be one of the class names specified in the encoding
+// block), and they use the opcode keyword to specify, in order, their
+// primary, secondary, and tertiary opcode. Only the opcode sections
+// which a particular instruction needs for encoding need to be
+// specified.
+encode %{
+ // Build emit functions for each basic byte or larger field in the intel
+ // encoding scheme (opcode, rm, sib, immediate), and call them from C++
+ // code in the enc_class source block. Emit functions will live in the
+ // main source block for now. In future, we can generalize this by
+ // adding a syntax that specifies the sizes of fields in an order,
+ // so that the adlc can build the emit functions automagically
+
+ enc_class Java_To_Runtime(method meth)
+ %{
+ // No relocation needed
+
+ // movq r10, <meth>
+ emit_opcode(cbuf, Assembler::REX_WB);
+ emit_opcode(cbuf, 0xB8 | (R10_enc - 8));
+ emit_d64(cbuf, (int64_t) $meth$$method);
+
+ // call (r10)
+ emit_opcode(cbuf, Assembler::REX_B);
+ emit_opcode(cbuf, 0xFF);
+ emit_opcode(cbuf, 0xD0 | (R10_enc - 8));
+ %}
+
+ enc_class bsd_breakpoint
+ %{
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
+ %}
+
+ enc_class call_epilog
+ %{
+ if (VerifyStackAtCalls) {
+ // Check that stack depth is unchanged: find majik cookie on stack
+ int framesize =
+ ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3*VMRegImpl::slots_per_word));
+ if (framesize) {
+ if (framesize < 0x80) {
+ emit_opcode(cbuf, Assembler::REX_W);
+ emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
+ emit_d8(cbuf, 0x7C);
+ emit_d8(cbuf, 0x24);
+ emit_d8(cbuf, framesize); // Find majik cookie from ESP
+ emit_d32(cbuf, 0xbadb100d);
+ } else {
+ emit_opcode(cbuf, Assembler::REX_W);
+ emit_opcode(cbuf, 0x81); // cmpq [rsp+0],0xbadb1ood
+ emit_d8(cbuf, 0xBC);
+ emit_d8(cbuf, 0x24);
+ emit_d32(cbuf, framesize); // Find majik cookie from ESP
+ emit_d32(cbuf, 0xbadb100d);
+ }
+ }
+ // jmp EQ around INT3
+ // QQQ TODO
+ const int jump_around = 5; // size of call to breakpoint, 1 for CC
+ emit_opcode(cbuf, 0x74);
+ emit_d8(cbuf, jump_around);
+ // QQQ temporary
+ emit_break(cbuf);
+ // Die if stack mismatch
+ // emit_opcode(cbuf,0xCC);
+ }
+ %}
+
+%}
+
+// INSTRUCTIONS -- Platform dependent
+
+//----------OS and Locking Instructions----------------------------------------
+
+// This name is KNOWN by the ADLC and cannot be changed.
+// The ADLC forces a 'TypeRawPtr::BOTTOM' output type
+// for this guy.
+instruct tlsLoadP(r15_RegP dst)
+%{
+ match(Set dst (ThreadLocal));
+ effect(DEF dst);
+
+ size(0);
+ format %{ "# TLS is in R15" %}
+ ins_encode( /*empty encoding*/ );
+ ins_pipe(ialu_reg_reg);
+%}
+
+// Die now
+instruct ShouldNotReachHere()
+%{
+ match(Halt);
+
+ // Use the following format syntax
+ format %{ "int3\t# ShouldNotReachHere" %}
+ // QQQ TODO for now call breakpoint
+ // opcode(0xCC);
+ // ins_encode(Opc);
+ ins_encode(bsd_breakpoint);
+ ins_pipe(pipe_slow);
+%}
+
+
+// Platform dependent source
+
+source
+%{
+
+int MachCallRuntimeNode::ret_addr_offset() {
+ return 13; // movq r10,#addr; callq (r10)
+}
+
+// emit an interrupt that is caught by the debugger
+void emit_break(CodeBuffer& cbuf) {
+ // Debugger doesn't really catch this but best we can do so far QQQ
+ MacroAssembler* masm = new MacroAssembler(&cbuf);
+ masm->call(RuntimeAddress(CAST_FROM_FN_PTR(address, os::breakpoint)));
+}
+
+void MachBreakpointNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
+ emit_break(cbuf);
+}
+
+uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const {
+ return 5;
+}
+
+%}
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s
new file mode 100644
index 0000000..65d2db4
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s
@@ -0,0 +1,410 @@
+#
+# Copyright (c) 2004, 2007, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+#ifdef __APPLE__
+# Darwin uses _ prefixed global symbols
+#define SYMBOL(s) _ ## s
+#define ELF_TYPE(name, description)
+#else
+#define SYMBOL(s) s
+#define ELF_TYPE(name, description) .type name,description
+#endif
+
+ # NOTE WELL! The _Copy functions are called directly
+ # from server-compiler-generated code via CallLeafNoFP,
+ # which means that they *must* either not use floating
+ # point or use it in the same manner as does the server
+ # compiler.
+
+ .globl SYMBOL(_Copy_arrayof_conjoint_bytes)
+ .globl SYMBOL(_Copy_arrayof_conjoint_jshorts)
+ .globl SYMBOL(_Copy_conjoint_jshorts_atomic)
+ .globl SYMBOL(_Copy_arrayof_conjoint_jints)
+ .globl SYMBOL(_Copy_conjoint_jints_atomic)
+ .globl SYMBOL(_Copy_arrayof_conjoint_jlongs)
+ .globl SYMBOL(_Copy_conjoint_jlongs_atomic)
+
+ .text
+
+ .globl SYMBOL(SafeFetch32), SYMBOL(Fetch32PFI), SYMBOL(Fetch32Resume)
+ .p2align 4,,15
+ ELF_TYPE(SafeFetch32, at function)
+ // Prototype: int SafeFetch32 (int * Adr, int ErrValue)
+SYMBOL(SafeFetch32):
+ movl %esi, %eax
+SYMBOL(Fetch32PFI):
+ movl (%rdi), %eax
+SYMBOL(Fetch32Resume):
+ ret
+
+ .globl SYMBOL(SafeFetchN), SYMBOL(FetchNPFI), SYMBOL(FetchNResume)
+ .p2align 4,,15
+ ELF_TYPE(SafeFetchN, at function)
+ // Prototype: intptr_t SafeFetchN (intptr_t * Adr, intptr_t ErrValue)
+SYMBOL(SafeFetchN):
+ movq %rsi, %rax
+SYMBOL(FetchNPFI):
+ movq (%rdi), %rax
+SYMBOL(FetchNResume):
+ ret
+
+ .globl SYMBOL(SpinPause)
+ .p2align 4,,15
+ ELF_TYPE(SpinPause, at function)
+SYMBOL(SpinPause):
+ rep
+ nop
+ movq $1, %rax
+ ret
+
+ # Support for void Copy::arrayof_conjoint_bytes(void* from,
+ # void* to,
+ # size_t count)
+ # rdi - from
+ # rsi - to
+ # rdx - count, treated as ssize_t
+ #
+ .p2align 4,,15
+ ELF_TYPE(_Copy_arrayof_conjoint_bytes, at function)
+SYMBOL(_Copy_arrayof_conjoint_bytes):
+ movq %rdx,%r8 # byte count
+ shrq $3,%rdx # qword count
+ cmpq %rdi,%rsi
+ leaq -1(%rdi,%r8,1),%rax # from + bcount*1 - 1
+ jbe acb_CopyRight
+ cmpq %rax,%rsi
+ jbe acb_CopyLeft
+acb_CopyRight:
+ leaq -8(%rdi,%rdx,8),%rax # from + qcount*8 - 8
+ leaq -8(%rsi,%rdx,8),%rcx # to + qcount*8 - 8
+ negq %rdx
+ jmp 7f
+ .p2align 4,,15
+1: movq 8(%rax,%rdx,8),%rsi
+ movq %rsi,8(%rcx,%rdx,8)
+ addq $1,%rdx
+ jnz 1b
+2: testq $4,%r8 # check for trailing dword
+ jz 3f
+ movl 8(%rax),%esi # copy trailing dword
+ movl %esi,8(%rcx)
+ addq $4,%rax
+ addq $4,%rcx # original %rsi is trashed, so we
+ # can't use it as a base register
+3: testq $2,%r8 # check for trailing word
+ jz 4f
+ movw 8(%rax),%si # copy trailing word
+ movw %si,8(%rcx)
+ addq $2,%rcx
+4: testq $1,%r8 # check for trailing byte
+ jz 5f
+ movb -1(%rdi,%r8,1),%al # copy trailing byte
+ movb %al,8(%rcx)
+5: ret
+ .p2align 4,,15
+6: movq -24(%rax,%rdx,8),%rsi
+ movq %rsi,-24(%rcx,%rdx,8)
+ movq -16(%rax,%rdx,8),%rsi
+ movq %rsi,-16(%rcx,%rdx,8)
+ movq -8(%rax,%rdx,8),%rsi
+ movq %rsi,-8(%rcx,%rdx,8)
+ movq (%rax,%rdx,8),%rsi
+ movq %rsi,(%rcx,%rdx,8)
+7: addq $4,%rdx
+ jle 6b
+ subq $4,%rdx
+ jl 1b
+ jmp 2b
+acb_CopyLeft:
+ testq $1,%r8 # check for trailing byte
+ jz 1f
+ movb -1(%rdi,%r8,1),%cl # copy trailing byte
+ movb %cl,-1(%rsi,%r8,1)
+ subq $1,%r8 # adjust for possible trailing word
+1: testq $2,%r8 # check for trailing word
+ jz 2f
+ movw -2(%rdi,%r8,1),%cx # copy trailing word
+ movw %cx,-2(%rsi,%r8,1)
+2: testq $4,%r8 # check for trailing dword
+ jz 5f
+ movl (%rdi,%rdx,8),%ecx # copy trailing dword
+ movl %ecx,(%rsi,%rdx,8)
+ jmp 5f
+ .p2align 4,,15
+3: movq -8(%rdi,%rdx,8),%rcx
+ movq %rcx,-8(%rsi,%rdx,8)
+ subq $1,%rdx
+ jnz 3b
+ ret
+ .p2align 4,,15
+4: movq 24(%rdi,%rdx,8),%rcx
+ movq %rcx,24(%rsi,%rdx,8)
+ movq 16(%rdi,%rdx,8),%rcx
+ movq %rcx,16(%rsi,%rdx,8)
+ movq 8(%rdi,%rdx,8),%rcx
+ movq %rcx,8(%rsi,%rdx,8)
+ movq (%rdi,%rdx,8),%rcx
+ movq %rcx,(%rsi,%rdx,8)
+5: subq $4,%rdx
+ jge 4b
+ addq $4,%rdx
+ jg 3b
+ ret
+
+ # Support for void Copy::arrayof_conjoint_jshorts(void* from,
+ # void* to,
+ # size_t count)
+ # Equivalent to
+ # conjoint_jshorts_atomic
+ #
+ # If 'from' and/or 'to' are aligned on 4- or 2-byte boundaries, we
+ # let the hardware handle it. The tow or four words within dwords
+ # or qwords that span cache line boundaries will still be loaded
+ # and stored atomically.
+ #
+ # rdi - from
+ # rsi - to
+ # rdx - count, treated as ssize_t
+ #
+ .p2align 4,,15
+ ELF_TYPE(_Copy_arrayof_conjoint_jshorts, at function)
+ ELF_TYPE(_Copy_conjoint_jshorts_atomic, at function)
+SYMBOL(_Copy_arrayof_conjoint_jshorts):
+SYMBOL(_Copy_conjoint_jshorts_atomic):
+ movq %rdx,%r8 # word count
+ shrq $2,%rdx # qword count
+ cmpq %rdi,%rsi
+ leaq -2(%rdi,%r8,2),%rax # from + wcount*2 - 2
+ jbe acs_CopyRight
+ cmpq %rax,%rsi
+ jbe acs_CopyLeft
+acs_CopyRight:
+ leaq -8(%rdi,%rdx,8),%rax # from + qcount*8 - 8
+ leaq -8(%rsi,%rdx,8),%rcx # to + qcount*8 - 8
+ negq %rdx
+ jmp 6f
+1: movq 8(%rax,%rdx,8),%rsi
+ movq %rsi,8(%rcx,%rdx,8)
+ addq $1,%rdx
+ jnz 1b
+2: testq $2,%r8 # check for trailing dword
+ jz 3f
+ movl 8(%rax),%esi # copy trailing dword
+ movl %esi,8(%rcx)
+ addq $4,%rcx # original %rsi is trashed, so we
+ # can't use it as a base register
+3: testq $1,%r8 # check for trailing word
+ jz 4f
+ movw -2(%rdi,%r8,2),%si # copy trailing word
+ movw %si,8(%rcx)
+4: ret
+ .p2align 4,,15
+5: movq -24(%rax,%rdx,8),%rsi
+ movq %rsi,-24(%rcx,%rdx,8)
+ movq -16(%rax,%rdx,8),%rsi
+ movq %rsi,-16(%rcx,%rdx,8)
+ movq -8(%rax,%rdx,8),%rsi
+ movq %rsi,-8(%rcx,%rdx,8)
+ movq (%rax,%rdx,8),%rsi
+ movq %rsi,(%rcx,%rdx,8)
+6: addq $4,%rdx
+ jle 5b
+ subq $4,%rdx
+ jl 1b
+ jmp 2b
+acs_CopyLeft:
+ testq $1,%r8 # check for trailing word
+ jz 1f
+ movw -2(%rdi,%r8,2),%cx # copy trailing word
+ movw %cx,-2(%rsi,%r8,2)
+1: testq $2,%r8 # check for trailing dword
+ jz 4f
+ movl (%rdi,%rdx,8),%ecx # copy trailing dword
+ movl %ecx,(%rsi,%rdx,8)
+ jmp 4f
+2: movq -8(%rdi,%rdx,8),%rcx
+ movq %rcx,-8(%rsi,%rdx,8)
+ subq $1,%rdx
+ jnz 2b
+ ret
+ .p2align 4,,15
+3: movq 24(%rdi,%rdx,8),%rcx
+ movq %rcx,24(%rsi,%rdx,8)
+ movq 16(%rdi,%rdx,8),%rcx
+ movq %rcx,16(%rsi,%rdx,8)
+ movq 8(%rdi,%rdx,8),%rcx
+ movq %rcx,8(%rsi,%rdx,8)
+ movq (%rdi,%rdx,8),%rcx
+ movq %rcx,(%rsi,%rdx,8)
+4: subq $4,%rdx
+ jge 3b
+ addq $4,%rdx
+ jg 2b
+ ret
+
+ # Support for void Copy::arrayof_conjoint_jints(jint* from,
+ # jint* to,
+ # size_t count)
+ # Equivalent to
+ # conjoint_jints_atomic
+ #
+ # If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
+ # the hardware handle it. The two dwords within qwords that span
+ # cache line boundaries will still be loaded and stored atomically.
+ #
+ # rdi - from
+ # rsi - to
+ # rdx - count, treated as ssize_t
+ #
+ .p2align 4,,15
+ ELF_TYPE(_Copy_arrayof_conjoint_jints, at function)
+ ELF_TYPE(_Copy_conjoint_jints_atomic, at function)
+SYMBOL(_Copy_arrayof_conjoint_jints):
+SYMBOL(_Copy_conjoint_jints_atomic):
+ movq %rdx,%r8 # dword count
+ shrq %rdx # qword count
+ cmpq %rdi,%rsi
+ leaq -4(%rdi,%r8,4),%rax # from + dcount*4 - 4
+ jbe aci_CopyRight
+ cmpq %rax,%rsi
+ jbe aci_CopyLeft
+aci_CopyRight:
+ leaq -8(%rdi,%rdx,8),%rax # from + qcount*8 - 8
+ leaq -8(%rsi,%rdx,8),%rcx # to + qcount*8 - 8
+ negq %rdx
+ jmp 5f
+ .p2align 4,,15
+1: movq 8(%rax,%rdx,8),%rsi
+ movq %rsi,8(%rcx,%rdx,8)
+ addq $1,%rdx
+ jnz 1b
+2: testq $1,%r8 # check for trailing dword
+ jz 3f
+ movl 8(%rax),%esi # copy trailing dword
+ movl %esi,8(%rcx)
+3: ret
+ .p2align 4,,15
+4: movq -24(%rax,%rdx,8),%rsi
+ movq %rsi,-24(%rcx,%rdx,8)
+ movq -16(%rax,%rdx,8),%rsi
+ movq %rsi,-16(%rcx,%rdx,8)
+ movq -8(%rax,%rdx,8),%rsi
+ movq %rsi,-8(%rcx,%rdx,8)
+ movq (%rax,%rdx,8),%rsi
+ movq %rsi,(%rcx,%rdx,8)
+5: addq $4,%rdx
+ jle 4b
+ subq $4,%rdx
+ jl 1b
+ jmp 2b
+aci_CopyLeft:
+ testq $1,%r8 # check for trailing dword
+ jz 3f
+ movl -4(%rdi,%r8,4),%ecx # copy trailing dword
+ movl %ecx,-4(%rsi,%r8,4)
+ jmp 3f
+1: movq -8(%rdi,%rdx,8),%rcx
+ movq %rcx,-8(%rsi,%rdx,8)
+ subq $1,%rdx
+ jnz 1b
+ ret
+ .p2align 4,,15
+2: movq 24(%rdi,%rdx,8),%rcx
+ movq %rcx,24(%rsi,%rdx,8)
+ movq 16(%rdi,%rdx,8),%rcx
+ movq %rcx,16(%rsi,%rdx,8)
+ movq 8(%rdi,%rdx,8),%rcx
+ movq %rcx,8(%rsi,%rdx,8)
+ movq (%rdi,%rdx,8),%rcx
+ movq %rcx,(%rsi,%rdx,8)
+3: subq $4,%rdx
+ jge 2b
+ addq $4,%rdx
+ jg 1b
+ ret
+
+ # Support for void Copy::arrayof_conjoint_jlongs(jlong* from,
+ # jlong* to,
+ # size_t count)
+ # Equivalent to
+ # conjoint_jlongs_atomic
+ # arrayof_conjoint_oops
+ # conjoint_oops_atomic
+ #
+ # rdi - from
+ # rsi - to
+ # rdx - count, treated as ssize_t
+ #
+ .p2align 4,,15
+ ELF_TYPE(_Copy_arrayof_conjoint_jlongs, at function)
+ ELF_TYPE(_Copy_conjoint_jlongs_atomic, at function)
+SYMBOL(_Copy_arrayof_conjoint_jlongs):
+SYMBOL(_Copy_conjoint_jlongs_atomic):
+ cmpq %rdi,%rsi
+ leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8
+ jbe acl_CopyRight
+ cmpq %rax,%rsi
+ jbe acl_CopyLeft
+acl_CopyRight:
+ leaq -8(%rsi,%rdx,8),%rcx # to + count*8 - 8
+ negq %rdx
+ jmp 3f
+1: movq 8(%rax,%rdx,8),%rsi
+ movq %rsi,8(%rcx,%rdx,8)
+ addq $1,%rdx
+ jnz 1b
+ ret
+ .p2align 4,,15
+2: movq -24(%rax,%rdx,8),%rsi
+ movq %rsi,-24(%rcx,%rdx,8)
+ movq -16(%rax,%rdx,8),%rsi
+ movq %rsi,-16(%rcx,%rdx,8)
+ movq -8(%rax,%rdx,8),%rsi
+ movq %rsi,-8(%rcx,%rdx,8)
+ movq (%rax,%rdx,8),%rsi
+ movq %rsi,(%rcx,%rdx,8)
+3: addq $4,%rdx
+ jle 2b
+ subq $4,%rdx
+ jl 1b
+ ret
+4: movq -8(%rdi,%rdx,8),%rcx
+ movq %rcx,-8(%rsi,%rdx,8)
+ subq $1,%rdx
+ jnz 4b
+ ret
+ .p2align 4,,15
+5: movq 24(%rdi,%rdx,8),%rcx
+ movq %rcx,24(%rsi,%rdx,8)
+ movq 16(%rdi,%rdx,8),%rcx
+ movq %rcx,16(%rsi,%rdx,8)
+ movq 8(%rdi,%rdx,8),%rcx
+ movq %rcx,8(%rsi,%rdx,8)
+ movq (%rdi,%rdx,8),%rcx
+ movq %rcx,(%rsi,%rdx,8)
+acl_CopyLeft:
+ subq $4,%rdx
+ jge 5b
+ addq $4,%rdx
+ jg 4b
+ ret
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp b/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
new file mode 100644
index 0000000..4fe770a
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 1999, 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 OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
+
+#ifndef _ALLBSD_SOURCE
+#include <byteswap.h>
+#endif
+
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#endif
+
+#if defined(AMD64)
+# if defined(__APPLE__)
+# define bswap_16(x) OSSwapInt16(x)
+# define bswap_32(x) OSSwapInt32(x)
+# define bswap_64(x) OSSwapInt64(x)
+# elif defined(__OpenBSD__)
+# define bswap_16(x) swap16(x)
+# define bswap_32(x) swap32(x)
+# define bswap_64(x) swap64(x)
+# elif defined(__NetBSD__)
+# define bswap_16(x) bswap16(x)
+# define bswap_32(x) bswap32(x)
+# define bswap_64(x) bswap64(x)
+# else
+# define bswap_16(x) __bswap16(x)
+# define bswap_32(x) __bswap32(x)
+# define bswap_64(x) __bswap64(x)
+# endif
+#endif
+
+// Efficient swapping of data bytes from Java byte
+// ordering to native byte ordering and vice versa.
+inline u2 Bytes::swap_u2(u2 x) {
+#ifdef AMD64
+ return bswap_16(x);
+#else
+ u2 ret;
+ __asm__ __volatile__ (
+ "movw %0, %%ax;"
+ "xchg %%al, %%ah;"
+ "movw %%ax, %0"
+ :"=r" (ret) // output : register 0 => ret
+ :"0" (x) // input : x => register 0
+ :"ax", "0" // clobbered registers
+ );
+ return ret;
+#endif // AMD64
+}
+
+inline u4 Bytes::swap_u4(u4 x) {
+#ifdef AMD64
+ return bswap_32(x);
+#else
+ u4 ret;
+ __asm__ __volatile__ (
+ "bswap %0"
+ :"=r" (ret) // output : register 0 => ret
+ :"0" (x) // input : x => register 0
+ :"0" // clobbered register
+ );
+ return ret;
+#endif // AMD64
+}
+
+#ifdef AMD64
+inline u8 Bytes::swap_u8(u8 x) {
+#ifdef SPARC_WORKS
+ // workaround for SunStudio12 CR6615391
+ __asm__ __volatile__ (
+ "bswapq %0"
+ :"=r" (x) // output : register 0 => x
+ :"0" (x) // input : x => register 0
+ :"0" // clobbered register
+ );
+ return x;
+#else
+ return bswap_64(x);
+#endif
+}
+#else
+// Helper function for swap_u8
+inline u8 Bytes::swap_u8_base(u4 x, u4 y) {
+ return (((u8)swap_u4(x))<<32) | swap_u4(y);
+}
+
+inline u8 Bytes::swap_u8(u8 x) {
+ return swap_u8_base(*(u4*)&x, *(((u4*)&x)+1));
+}
+#endif // !AMD64
+
+#endif // OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp b/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp
new file mode 100644
index 0000000..760c61a
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/copy_bsd_x86.inline.hpp
@@ -0,0 +1,309 @@
+/*
+ * Copyright (c) 2003, 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 OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
+
+static void pd_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
+#ifdef AMD64
+ (void)memmove(to, from, count * HeapWordSize);
+#else
+ // Includes a zero-count check.
+ intx temp;
+ __asm__ volatile(" testl %6,%6 ;"
+ " jz 7f ;"
+ " cmpl %4,%5 ;"
+ " leal -4(%4,%6,4),%3;"
+ " jbe 1f ;"
+ " cmpl %7,%5 ;"
+ " jbe 4f ;"
+ "1: cmpl $32,%6 ;"
+ " ja 3f ;"
+ " subl %4,%1 ;"
+ "2: movl (%4),%3 ;"
+ " movl %7,(%5,%4,1) ;"
+ " addl $4,%0 ;"
+ " subl $1,%2 ;"
+ " jnz 2b ;"
+ " jmp 7f ;"
+ "3: rep; smovl ;"
+ " jmp 7f ;"
+ "4: cmpl $32,%2 ;"
+ " movl %7,%0 ;"
+ " leal -4(%5,%6,4),%1;"
+ " ja 6f ;"
+ " subl %4,%1 ;"
+ "5: movl (%4),%3 ;"
+ " movl %7,(%5,%4,1) ;"
+ " subl $4,%0 ;"
+ " subl $1,%2 ;"
+ " jnz 5b ;"
+ " jmp 7f ;"
+ "6: std ;"
+ " rep; smovl ;"
+ " cld ;"
+ "7: nop "
+ : "=S" (from), "=D" (to), "=c" (count), "=r" (temp)
+ : "0" (from), "1" (to), "2" (count), "3" (temp)
+ : "memory", "flags");
+#endif // AMD64
+}
+
+static void pd_disjoint_words(HeapWord* from, HeapWord* to, size_t count) {
+#ifdef AMD64
+ switch (count) {
+ case 8: to[7] = from[7];
+ case 7: to[6] = from[6];
+ case 6: to[5] = from[5];
+ case 5: to[4] = from[4];
+ case 4: to[3] = from[3];
+ case 3: to[2] = from[2];
+ case 2: to[1] = from[1];
+ case 1: to[0] = from[0];
+ case 0: break;
+ default:
+ (void)memcpy(to, from, count * HeapWordSize);
+ break;
+ }
+#else
+ // Includes a zero-count check.
+ intx temp;
+ __asm__ volatile(" testl %6,%6 ;"
+ " jz 3f ;"
+ " cmpl $32,%6 ;"
+ " ja 2f ;"
+ " subl %4,%1 ;"
+ "1: movl (%4),%3 ;"
+ " movl %7,(%5,%4,1);"
+ " addl $4,%0 ;"
+ " subl $1,%2 ;"
+ " jnz 1b ;"
+ " jmp 3f ;"
+ "2: rep; smovl ;"
+ "3: nop "
+ : "=S" (from), "=D" (to), "=c" (count), "=r" (temp)
+ : "0" (from), "1" (to), "2" (count), "3" (temp)
+ : "memory", "cc");
+#endif // AMD64
+}
+
+static void pd_disjoint_words_atomic(HeapWord* from, HeapWord* to, size_t count) {
+#ifdef AMD64
+ switch (count) {
+ case 8: to[7] = from[7];
+ case 7: to[6] = from[6];
+ case 6: to[5] = from[5];
+ case 5: to[4] = from[4];
+ case 4: to[3] = from[3];
+ case 3: to[2] = from[2];
+ case 2: to[1] = from[1];
+ case 1: to[0] = from[0];
+ case 0: break;
+ default:
+ while (count-- > 0) {
+ *to++ = *from++;
+ }
+ break;
+ }
+#else
+ // pd_disjoint_words is word-atomic in this implementation.
+ pd_disjoint_words(from, to, count);
+#endif // AMD64
+}
+
+static void pd_aligned_conjoint_words(HeapWord* from, HeapWord* to, size_t count) {
+ pd_conjoint_words(from, to, count);
+}
+
+static void pd_aligned_disjoint_words(HeapWord* from, HeapWord* to, size_t count) {
+ pd_disjoint_words(from, to, count);
+}
+
+static void pd_conjoint_bytes(void* from, void* to, size_t count) {
+#ifdef AMD64
+ (void)memmove(to, from, count);
+#else
+ // Includes a zero-count check.
+ intx temp;
+ __asm__ volatile(" testl %6,%6 ;"
+ " jz 13f ;"
+ " cmpl %4,%5 ;"
+ " leal -1(%4,%6),%3 ;"
+ " jbe 1f ;"
+ " cmpl %7,%5 ;"
+ " jbe 8f ;"
+ "1: cmpl $3,%6 ;"
+ " jbe 6f ;"
+ " movl %6,%3 ;"
+ " movl $4,%2 ;"
+ " subl %4,%2 ;"
+ " andl $3,%2 ;"
+ " jz 2f ;"
+ " subl %6,%3 ;"
+ " rep; smovb ;"
+ "2: movl %7,%2 ;"
+ " shrl $2,%2 ;"
+ " jz 5f ;"
+ " cmpl $32,%2 ;"
+ " ja 4f ;"
+ " subl %4,%1 ;"
+ "3: movl (%4),%%edx ;"
+ " movl %%edx,(%5,%4,1);"
+ " addl $4,%0 ;"
+ " subl $1,%2 ;"
+ " jnz 3b ;"
+ " addl %4,%1 ;"
+ " jmp 5f ;"
+ "4: rep; smovl ;"
+ "5: movl %7,%2 ;"
+ " andl $3,%2 ;"
+ " jz 13f ;"
+ "6: xorl %7,%3 ;"
+ "7: movb (%4,%7,1),%%dl ;"
+ " movb %%dl,(%5,%7,1) ;"
+ " addl $1,%3 ;"
+ " subl $1,%2 ;"
+ " jnz 7b ;"
+ " jmp 13f ;"
+ "8: std ;"
+ " cmpl $12,%2 ;"
+ " ja 9f ;"
+ " movl %7,%0 ;"
+ " leal -1(%6,%5),%1 ;"
+ " jmp 11f ;"
+ "9: xchgl %3,%2 ;"
+ " movl %6,%0 ;"
+ " addl $1,%2 ;"
+ " leal -1(%7,%5),%1 ;"
+ " andl $3,%2 ;"
+ " jz 10f ;"
+ " subl %6,%3 ;"
+ " rep; smovb ;"
+ "10: movl %7,%2 ;"
+ " subl $3,%0 ;"
+ " shrl $2,%2 ;"
+ " subl $3,%1 ;"
+ " rep; smovl ;"
+ " andl $3,%3 ;"
+ " jz 12f ;"
+ " movl %7,%2 ;"
+ " addl $3,%0 ;"
+ " addl $3,%1 ;"
+ "11: rep; smovb ;"
+ "12: cld ;"
+ "13: nop ;"
+ : "=S" (from), "=D" (to), "=c" (count), "=r" (temp)
+ : "0" (from), "1" (to), "2" (count), "3" (temp)
+ : "memory", "flags", "%edx");
+#endif // AMD64
+}
+
+static void pd_conjoint_bytes_atomic(void* from, void* to, size_t count) {
+ pd_conjoint_bytes(from, to, count);
+}
+
+static void pd_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+ _Copy_conjoint_jshorts_atomic(from, to, count);
+}
+
+static void pd_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
+#ifdef AMD64
+ _Copy_conjoint_jints_atomic(from, to, count);
+#else
+ assert(HeapWordSize == BytesPerInt, "heapwords and jints must be the same size");
+ // pd_conjoint_words is word-atomic in this implementation.
+ pd_conjoint_words((HeapWord*)from, (HeapWord*)to, count);
+#endif // AMD64
+}
+
+static void pd_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
+#ifdef AMD64
+ _Copy_conjoint_jlongs_atomic(from, to, count);
+#else
+ // Guarantee use of fild/fistp or xmm regs via some asm code, because compilers won't.
+ if (from > to) {
+ while (count-- > 0) {
+ __asm__ volatile("fildll (%0); fistpll (%1)"
+ :
+ : "r" (from), "r" (to)
+ : "memory" );
+ ++from;
+ ++to;
+ }
+ } else {
+ while (count-- > 0) {
+ __asm__ volatile("fildll (%0,%2,8); fistpll (%1,%2,8)"
+ :
+ : "r" (from), "r" (to), "r" (count)
+ : "memory" );
+ }
+ }
+#endif // AMD64
+}
+
+static void pd_conjoint_oops_atomic(oop* from, oop* to, size_t count) {
+#ifdef AMD64
+ assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
+ _Copy_conjoint_jlongs_atomic((jlong*)from, (jlong*)to, count);
+#else
+ assert(HeapWordSize == BytesPerOop, "heapwords and oops must be the same size");
+ // pd_conjoint_words is word-atomic in this implementation.
+ pd_conjoint_words((HeapWord*)from, (HeapWord*)to, count);
+#endif // AMD64
+}
+
+static void pd_arrayof_conjoint_bytes(HeapWord* from, HeapWord* to, size_t count) {
+ _Copy_arrayof_conjoint_bytes(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jshorts(HeapWord* from, HeapWord* to, size_t count) {
+ _Copy_arrayof_conjoint_jshorts(from, to, count);
+}
+
+static void pd_arrayof_conjoint_jints(HeapWord* from, HeapWord* to, size_t count) {
+#ifdef AMD64
+ _Copy_arrayof_conjoint_jints(from, to, count);
+#else
+ pd_conjoint_jints_atomic((jint*)from, (jint*)to, count);
+#endif // AMD64
+}
+
+static void pd_arrayof_conjoint_jlongs(HeapWord* from, HeapWord* to, size_t count) {
+#ifdef AMD64
+ _Copy_arrayof_conjoint_jlongs(from, to, count);
+#else
+ pd_conjoint_jlongs_atomic((jlong*)from, (jlong*)to, count);
+#endif // AMD64
+}
+
+static void pd_arrayof_conjoint_oops(HeapWord* from, HeapWord* to, size_t count) {
+#ifdef AMD64
+ assert(BytesPerLong == BytesPerOop, "jlongs and oops must be the same size");
+ _Copy_arrayof_conjoint_jlongs(from, to, count);
+#else
+ pd_conjoint_oops_atomic((oop*)from, (oop*)to, count);
+#endif // AMD64
+}
+
+#endif // OS_CPU_BSD_X86_VM_COPY_BSD_X86_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp b/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp
new file mode 100644
index 0000000..9601188
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+
+//
+// Sets the default values for platform dependent flags used by the runtime system.
+// (see globals.hpp)
+//
+define_pd_global(bool, DontYieldALot, false);
+#ifdef AMD64
+define_pd_global(intx, ThreadStackSize, 1024); // 0 => use system default
+define_pd_global(intx, VMThreadStackSize, 1024);
+#else
+// ThreadStackSize 320 allows a couple of test cases to run while
+// keeping the number of threads that can be created high. System
+// default ThreadStackSize appears to be 512 which is too big.
+define_pd_global(intx, ThreadStackSize, 320);
+define_pd_global(intx, VMThreadStackSize, 512);
+#endif // AMD64
+
+define_pd_global(intx, CompilerThreadStackSize, 0);
+define_pd_global(intx, SurvivorRatio, 8);
+
+define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
+
+// Only used on 64 bit platforms
+define_pd_global(uintx, HeapBaseMinAddress, 2*G);
+// Only used on 64 bit Windows platforms
+define_pd_global(bool, UseVectoredExceptions, false);
+
+#endif // OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp b/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp
new file mode 100644
index 0000000..eaecd9c
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp
@@ -0,0 +1,215 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+
+#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
+
+#include "runtime/atomic.hpp"
+#include "runtime/orderAccess.hpp"
+#include "vm_version_x86.hpp"
+
+// Implementation of class OrderAccess.
+
+inline void OrderAccess::loadload() { acquire(); }
+inline void OrderAccess::storestore() { release(); }
+inline void OrderAccess::loadstore() { acquire(); }
+inline void OrderAccess::storeload() { fence(); }
+
+inline void OrderAccess::acquire() {
+ volatile intptr_t local_dummy;
+#ifdef AMD64
+ __asm__ volatile ("movq 0(%%rsp), %0" : "=r" (local_dummy) : : "memory");
+#else
+ __asm__ volatile ("movl 0(%%esp),%0" : "=r" (local_dummy) : : "memory");
+#endif // AMD64
+}
+
+inline void OrderAccess::release() {
+ // Avoid hitting the same cache-line from
+ // different threads.
+ volatile jint local_dummy = 0;
+}
+
+inline void OrderAccess::fence() {
+ if (os::is_MP()) {
+ // always use locked addl since mfence is sometimes expensive
+#ifdef AMD64
+ __asm__ volatile ("lock; addl $0,0(%%rsp)" : : : "cc", "memory");
+#else
+ __asm__ volatile ("lock; addl $0,0(%%esp)" : : : "cc", "memory");
+#endif
+ }
+}
+
+inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { return *p; }
+inline jshort OrderAccess::load_acquire(volatile jshort* p) { return *p; }
+inline jint OrderAccess::load_acquire(volatile jint* p) { return *p; }
+inline jlong OrderAccess::load_acquire(volatile jlong* p) { return Atomic::load(p); }
+inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { return *p; }
+inline jushort OrderAccess::load_acquire(volatile jushort* p) { return *p; }
+inline juint OrderAccess::load_acquire(volatile juint* p) { return *p; }
+inline julong OrderAccess::load_acquire(volatile julong* p) { return Atomic::load((volatile jlong*)p); }
+inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { return *p; }
+inline jdouble OrderAccess::load_acquire(volatile jdouble* p) { return *p; }
+
+inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) { return *p; }
+inline void* OrderAccess::load_ptr_acquire(volatile void* p) { return *(void* volatile *)p; }
+inline void* OrderAccess::load_ptr_acquire(const volatile void* p) { return *(void* const volatile *)p; }
+
+inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { *p = v; }
+inline void OrderAccess::release_store(volatile jshort* p, jshort v) { *p = v; }
+inline void OrderAccess::release_store(volatile jint* p, jint v) { *p = v; }
+inline void OrderAccess::release_store(volatile jlong* p, jlong v) { Atomic::store(v, p); }
+inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { *p = v; }
+inline void OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; }
+inline void OrderAccess::release_store(volatile juint* p, juint v) { *p = v; }
+inline void OrderAccess::release_store(volatile julong* p, julong v) { Atomic::store((jlong)v, (volatile jlong*)p); }
+inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { *p = v; }
+inline void OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; }
+
+inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; }
+inline void OrderAccess::release_store_ptr(volatile void* p, void* v) { *(void* volatile *)p = v; }
+
+inline void OrderAccess::store_fence(jbyte* p, jbyte v) {
+ __asm__ volatile ( "xchgb (%2),%0"
+ : "=q" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+}
+inline void OrderAccess::store_fence(jshort* p, jshort v) {
+ __asm__ volatile ( "xchgw (%2),%0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+}
+inline void OrderAccess::store_fence(jint* p, jint v) {
+ __asm__ volatile ( "xchgl (%2),%0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+}
+
+inline void OrderAccess::store_fence(jlong* p, jlong v) {
+#ifdef AMD64
+ __asm__ __volatile__ ("xchgq (%2), %0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+#else
+ *p = v; fence();
+#endif // AMD64
+}
+
+// AMD64 copied the bodies for the the signed version. 32bit did this. As long as the
+// compiler does the inlining this is simpler.
+inline void OrderAccess::store_fence(jubyte* p, jubyte v) { store_fence((jbyte*)p, (jbyte)v); }
+inline void OrderAccess::store_fence(jushort* p, jushort v) { store_fence((jshort*)p, (jshort)v); }
+inline void OrderAccess::store_fence(juint* p, juint v) { store_fence((jint*)p, (jint)v); }
+inline void OrderAccess::store_fence(julong* p, julong v) { store_fence((jlong*)p, (jlong)v); }
+inline void OrderAccess::store_fence(jfloat* p, jfloat v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jdouble* p, jdouble v) { *p = v; fence(); }
+
+inline void OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) {
+#ifdef AMD64
+ __asm__ __volatile__ ("xchgq (%2), %0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+#else
+ store_fence((jint*)p, (jint)v);
+#endif // AMD64
+}
+
+inline void OrderAccess::store_ptr_fence(void** p, void* v) {
+#ifdef AMD64
+ __asm__ __volatile__ ("xchgq (%2), %0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+#else
+ store_fence((jint*)p, (jint)v);
+#endif // AMD64
+}
+
+// Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
+inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) {
+ __asm__ volatile ( "xchgb (%2),%0"
+ : "=q" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+}
+inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) {
+ __asm__ volatile ( "xchgw (%2),%0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+}
+inline void OrderAccess::release_store_fence(volatile jint* p, jint v) {
+ __asm__ volatile ( "xchgl (%2),%0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+}
+
+inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) {
+#ifdef AMD64
+ __asm__ __volatile__ ( "xchgq (%2), %0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+#else
+ release_store(p, v); fence();
+#endif // AMD64
+}
+
+inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { release_store_fence((volatile jbyte*)p, (jbyte)v); }
+inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { release_store_fence((volatile jshort*)p, (jshort)v); }
+inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { release_store_fence((volatile jint*)p, (jint)v); }
+inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { release_store_fence((volatile jlong*)p, (jlong)v); }
+
+inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { *p = v; fence(); }
+inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); }
+
+inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) {
+#ifdef AMD64
+ __asm__ __volatile__ ( "xchgq (%2), %0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+#else
+ release_store_fence((volatile jint*)p, (jint)v);
+#endif // AMD64
+}
+inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) {
+#ifdef AMD64
+ __asm__ __volatile__ ( "xchgq (%2), %0"
+ : "=r" (v)
+ : "0" (v), "r" (p)
+ : "memory");
+#else
+ release_store_fence((volatile jint*)p, (jint)v);
+#endif // AMD64
+}
+
+#endif // OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
new file mode 100644
index 0000000..11374ac
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -0,0 +1,1124 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+// no precompiled headers
+#include "assembler_x86.inline.hpp"
+#include "classfile/classLoader.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "code/icBuffer.hpp"
+#include "code/vtableStubs.hpp"
+#include "interpreter/interpreter.hpp"
+#include "jvm_bsd.h"
+#include "memory/allocation.inline.hpp"
+#include "mutex_bsd.inline.hpp"
+#include "nativeInst_x86.hpp"
+#include "os_share_bsd.hpp"
+#include "prims/jniFastGetField.hpp"
+#include "prims/jvm.h"
+#include "prims/jvm_misc.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/extendedPC.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/java.hpp"
+#include "runtime/javaCalls.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/timer.hpp"
+#include "thread_bsd.inline.hpp"
+#include "utilities/events.hpp"
+#include "utilities/vmError.hpp"
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
+
+// put OS-includes here
+# include <sys/types.h>
+# include <sys/mman.h>
+# include <pthread.h>
+# include <signal.h>
+# include <errno.h>
+# include <dlfcn.h>
+# include <stdlib.h>
+# include <stdio.h>
+# include <unistd.h>
+# include <sys/resource.h>
+# include <pthread.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <sys/utsname.h>
+# include <sys/socket.h>
+# include <sys/wait.h>
+# include <pwd.h>
+# include <poll.h>
+#ifndef __OpenBSD__
+# include <ucontext.h>
+#endif
+
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
+# include <pthread_np.h>
+#endif
+
+#ifdef AMD64
+#define SPELL_REG_SP "rsp"
+#define SPELL_REG_FP "rbp"
+#else
+#define SPELL_REG_SP "esp"
+#define SPELL_REG_FP "ebp"
+#endif // AMD64
+
+#ifdef __FreeBSD__
+# define context_trapno uc_mcontext.mc_trapno
+# ifdef AMD64
+# define context_pc uc_mcontext.mc_rip
+# define context_sp uc_mcontext.mc_rsp
+# define context_fp uc_mcontext.mc_rbp
+# define context_rip uc_mcontext.mc_rip
+# define context_rsp uc_mcontext.mc_rsp
+# define context_rbp uc_mcontext.mc_rbp
+# define context_rax uc_mcontext.mc_rax
+# define context_rbx uc_mcontext.mc_rbx
+# define context_rcx uc_mcontext.mc_rcx
+# define context_rdx uc_mcontext.mc_rdx
+# define context_rsi uc_mcontext.mc_rsi
+# define context_rdi uc_mcontext.mc_rdi
+# define context_r8 uc_mcontext.mc_r8
+# define context_r9 uc_mcontext.mc_r9
+# define context_r10 uc_mcontext.mc_r10
+# define context_r11 uc_mcontext.mc_r11
+# define context_r12 uc_mcontext.mc_r12
+# define context_r13 uc_mcontext.mc_r13
+# define context_r14 uc_mcontext.mc_r14
+# define context_r15 uc_mcontext.mc_r15
+# define context_flags uc_mcontext.mc_flags
+# define context_err uc_mcontext.mc_err
+# else
+# define context_pc uc_mcontext.mc_eip
+# define context_sp uc_mcontext.mc_esp
+# define context_fp uc_mcontext.mc_ebp
+# define context_eip uc_mcontext.mc_eip
+# define context_esp uc_mcontext.mc_esp
+# define context_eax uc_mcontext.mc_eax
+# define context_ebx uc_mcontext.mc_ebx
+# define context_ecx uc_mcontext.mc_ecx
+# define context_edx uc_mcontext.mc_edx
+# define context_ebp uc_mcontext.mc_ebp
+# define context_esi uc_mcontext.mc_esi
+# define context_edi uc_mcontext.mc_edi
+# define context_eflags uc_mcontext.mc_eflags
+# define context_trapno uc_mcontext.mc_trapno
+# endif
+#endif
+
+#ifdef __APPLE__
+# if __DARWIN_UNIX03 && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+ // 10.5 UNIX03 member name prefixes
+ #define DU3_PREFIX(s, m) __ ## s.__ ## m
+# else
+ #define DU3_PREFIX(s, m) s ## . ## m
+# endif
+
+# ifdef AMD64
+# define context_pc context_rip
+# define context_sp context_rsp
+# define context_fp context_rbp
+# define context_rip uc_mcontext->DU3_PREFIX(ss,rip)
+# define context_rsp uc_mcontext->DU3_PREFIX(ss,rsp)
+# define context_rax uc_mcontext->DU3_PREFIX(ss,rax)
+# define context_rbx uc_mcontext->DU3_PREFIX(ss,rbx)
+# define context_rcx uc_mcontext->DU3_PREFIX(ss,rcx)
+# define context_rdx uc_mcontext->DU3_PREFIX(ss,rdx)
+# define context_rbp uc_mcontext->DU3_PREFIX(ss,rbp)
+# define context_rsi uc_mcontext->DU3_PREFIX(ss,rsi)
+# define context_rdi uc_mcontext->DU3_PREFIX(ss,rdi)
+# define context_r8 uc_mcontext->DU3_PREFIX(ss,r8)
+# define context_r9 uc_mcontext->DU3_PREFIX(ss,r9)
+# define context_r10 uc_mcontext->DU3_PREFIX(ss,r10)
+# define context_r11 uc_mcontext->DU3_PREFIX(ss,r11)
+# define context_r12 uc_mcontext->DU3_PREFIX(ss,r12)
+# define context_r13 uc_mcontext->DU3_PREFIX(ss,r13)
+# define context_r14 uc_mcontext->DU3_PREFIX(ss,r14)
+# define context_r15 uc_mcontext->DU3_PREFIX(ss,r15)
+# define context_flags uc_mcontext->DU3_PREFIX(ss,rflags)
+# define context_trapno uc_mcontext->DU3_PREFIX(es,trapno)
+# define context_err uc_mcontext->DU3_PREFIX(es,err)
+# else
+# define context_pc context_eip
+# define context_sp context_esp
+# define context_fp context_ebp
+# define context_eip uc_mcontext->DU3_PREFIX(ss,eip)
+# define context_esp uc_mcontext->DU3_PREFIX(ss,esp)
+# define context_eax uc_mcontext->DU3_PREFIX(ss,eax)
+# define context_ebx uc_mcontext->DU3_PREFIX(ss,ebx)
+# define context_ecx uc_mcontext->DU3_PREFIX(ss,ecx)
+# define context_edx uc_mcontext->DU3_PREFIX(ss,edx)
+# define context_ebp uc_mcontext->DU3_PREFIX(ss,ebp)
+# define context_esi uc_mcontext->DU3_PREFIX(ss,esi)
+# define context_edi uc_mcontext->DU3_PREFIX(ss,edi)
+# define context_eflags uc_mcontext->DU3_PREFIX(ss,eflags)
+# define context_trapno uc_mcontext->DU3_PREFIX(es,trapno)
+# endif
+#endif
+
+#ifdef __OpenBSD__
+# define context_trapno sc_trapno
+# ifdef AMD64
+# define context_pc sc_rip
+# define context_sp sc_rsp
+# define context_fp sc_rbp
+# define context_rip sc_rip
+# define context_rsp sc_rsp
+# define context_rbp sc_rbp
+# define context_rax sc_rax
+# define context_rbx sc_rbx
+# define context_rcx sc_rcx
+# define context_rdx sc_rdx
+# define context_rsi sc_rsi
+# define context_rdi sc_rdi
+# define context_r8 sc_r8
+# define context_r9 sc_r9
+# define context_r10 sc_r10
+# define context_r11 sc_r11
+# define context_r12 sc_r12
+# define context_r13 sc_r13
+# define context_r14 sc_r14
+# define context_r15 sc_r15
+# define context_flags sc_rflags
+# define context_err sc_err
+# else
+# define context_pc sc_eip
+# define context_sp sc_esp
+# define context_fp sc_ebp
+# define context_eip sc_eip
+# define context_esp sc_esp
+# define context_eax sc_eax
+# define context_ebx sc_ebx
+# define context_ecx sc_ecx
+# define context_edx sc_edx
+# define context_ebp sc_ebp
+# define context_esi sc_esi
+# define context_edi sc_edi
+# define context_eflags sc_eflags
+# define context_trapno sc_trapno
+# endif
+#endif
+
+#ifdef __NetBSD__
+# define context_trapno uc_mcontext.__gregs[_REG_TRAPNO]
+# ifdef AMD64
+# define __register_t __greg_t
+# define context_pc uc_mcontext.__gregs[_REG_RIP]
+# define context_sp uc_mcontext.__gregs[_REG_URSP]
+# define context_fp uc_mcontext.__gregs[_REG_RBP]
+# define context_rip uc_mcontext.__gregs[_REG_RIP]
+# define context_rsp uc_mcontext.__gregs[_REG_URSP]
+# define context_rax uc_mcontext.__gregs[_REG_RAX]
+# define context_rbx uc_mcontext.__gregs[_REG_RBX]
+# define context_rcx uc_mcontext.__gregs[_REG_RCX]
+# define context_rdx uc_mcontext.__gregs[_REG_RDX]
+# define context_rbp uc_mcontext.__gregs[_REG_RBP]
+# define context_rsi uc_mcontext.__gregs[_REG_RSI]
+# define context_rdi uc_mcontext.__gregs[_REG_RDI]
+# define context_r8 uc_mcontext.__gregs[_REG_R8]
+# define context_r9 uc_mcontext.__gregs[_REG_R9]
+# define context_r10 uc_mcontext.__gregs[_REG_R10]
+# define context_r11 uc_mcontext.__gregs[_REG_R11]
+# define context_r12 uc_mcontext.__gregs[_REG_R12]
+# define context_r13 uc_mcontext.__gregs[_REG_R13]
+# define context_r14 uc_mcontext.__gregs[_REG_R14]
+# define context_r15 uc_mcontext.__gregs[_REG_R15]
+# define context_flags uc_mcontext.__gregs[_REG_RFL]
+# define context_err uc_mcontext.__gregs[_REG_ERR]
+# else
+# define context_pc uc_mcontext.__gregs[_REG_EIP]
+# define context_sp uc_mcontext.__gregs[_REG_UESP]
+# define context_fp uc_mcontext.__gregs[_REG_EBP]
+# define context_eip uc_mcontext.__gregs[_REG_EIP]
+# define context_esp uc_mcontext.__gregs[_REG_UESP]
+# define context_eax uc_mcontext.__gregs[_REG_EAX]
+# define context_ebx uc_mcontext.__gregs[_REG_EBX]
+# define context_ecx uc_mcontext.__gregs[_REG_ECX]
+# define context_edx uc_mcontext.__gregs[_REG_EDX]
+# define context_ebp uc_mcontext.__gregs[_REG_EBP]
+# define context_esi uc_mcontext.__gregs[_REG_ESI]
+# define context_edi uc_mcontext.__gregs[_REG_EDI]
+# define context_eflags uc_mcontext.__gregs[_REG_EFL]
+# define context_trapno uc_mcontext.__gregs[_REG_TRAPNO]
+# endif
+#endif
+
+address os::current_stack_pointer() {
+#ifdef SPARC_WORKS
+ register void *esp;
+ __asm__("mov %%"SPELL_REG_SP", %0":"=r"(esp));
+ return (address) ((char*)esp + sizeof(long)*2);
+#else
+ register void *esp __asm__ (SPELL_REG_SP);
+ return (address) esp;
+#endif
+}
+
+char* os::non_memory_address_word() {
+ // Must never look like an address returned by reserve_memory,
+ // even in its subfields (as defined by the CPU immediate fields,
+ // if the CPU splits constants across multiple instructions).
+
+ return (char*) -1;
+}
+
+void os::initialize_thread() {
+// Nothing to do.
+}
+
+address os::Bsd::ucontext_get_pc(ucontext_t * uc) {
+ return (address)uc->context_pc;
+}
+
+intptr_t* os::Bsd::ucontext_get_sp(ucontext_t * uc) {
+ return (intptr_t*)uc->context_sp;
+}
+
+intptr_t* os::Bsd::ucontext_get_fp(ucontext_t * uc) {
+ return (intptr_t*)uc->context_fp;
+}
+
+// For Forte Analyzer AsyncGetCallTrace profiling support - thread
+// is currently interrupted by SIGPROF.
+// os::Solaris::fetch_frame_from_ucontext() tries to skip nested signal
+// frames. Currently we don't do that on Bsd, so it's the same as
+// os::fetch_frame_from_context().
+ExtendedPC os::Bsd::fetch_frame_from_ucontext(Thread* thread,
+ ucontext_t* uc, intptr_t** ret_sp, intptr_t** ret_fp) {
+
+ assert(thread != NULL, "just checking");
+ assert(ret_sp != NULL, "just checking");
+ assert(ret_fp != NULL, "just checking");
+
+ return os::fetch_frame_from_context(uc, ret_sp, ret_fp);
+}
+
+ExtendedPC os::fetch_frame_from_context(void* ucVoid,
+ intptr_t** ret_sp, intptr_t** ret_fp) {
+
+ ExtendedPC epc;
+ ucontext_t* uc = (ucontext_t*)ucVoid;
+
+ if (uc != NULL) {
+ epc = ExtendedPC(os::Bsd::ucontext_get_pc(uc));
+ if (ret_sp) *ret_sp = os::Bsd::ucontext_get_sp(uc);
+ if (ret_fp) *ret_fp = os::Bsd::ucontext_get_fp(uc);
+ } else {
+ // construct empty ExtendedPC for return value checking
+ epc = ExtendedPC(NULL);
+ if (ret_sp) *ret_sp = (intptr_t *)NULL;
+ if (ret_fp) *ret_fp = (intptr_t *)NULL;
+ }
+
+ return epc;
+}
+
+frame os::fetch_frame_from_context(void* ucVoid) {
+ intptr_t* sp;
+ intptr_t* fp;
+ ExtendedPC epc = fetch_frame_from_context(ucVoid, &sp, &fp);
+ return frame(sp, fp, epc.pc());
+}
+
+// By default, gcc always save frame pointer (%ebp/%rbp) on stack. It may get
+// turned off by -fomit-frame-pointer,
+frame os::get_sender_for_C_frame(frame* fr) {
+ return frame(fr->sender_sp(), fr->link(), fr->sender_pc());
+}
+
+intptr_t* _get_previous_fp() {
+#ifdef SPARC_WORKS
+ register intptr_t **ebp;
+ __asm__("mov %%"SPELL_REG_FP", %0":"=r"(ebp));
+#else
+ register intptr_t **ebp __asm__ (SPELL_REG_FP);
+#endif
+ return (intptr_t*) *ebp; // we want what it points to.
+}
+
+
+frame os::current_frame() {
+ intptr_t* fp = _get_previous_fp();
+ frame myframe((intptr_t*)os::current_stack_pointer(),
+ (intptr_t*)fp,
+ CAST_FROM_FN_PTR(address, os::current_frame));
+ if (os::is_first_C_frame(&myframe)) {
+ // stack is not walkable
+ return frame(NULL, NULL, NULL);
+ } else {
+ return os::get_sender_for_C_frame(&myframe);
+ }
+}
+
+// Utility functions
+
+// From IA32 System Programming Guide
+enum {
+ trap_page_fault = 0xE
+};
+
+extern "C" void Fetch32PFI () ;
+extern "C" void Fetch32Resume () ;
+#ifdef AMD64
+extern "C" void FetchNPFI () ;
+extern "C" void FetchNResume () ;
+#endif // AMD64
+
+extern "C" JNIEXPORT int
+JVM_handle_bsd_signal(int sig,
+ siginfo_t* info,
+ void* ucVoid,
+ int abort_if_unrecognized) {
+ ucontext_t* uc = (ucontext_t*) ucVoid;
+
+ Thread* t = ThreadLocalStorage::get_thread_slow();
+
+ SignalHandlerMark shm(t);
+
+ // Note: it's not uncommon that JNI code uses signal/sigset to install
+ // then restore certain signal handler (e.g. to temporarily block SIGPIPE,
+ // or have a SIGILL handler when detecting CPU type). When that happens,
+ // JVM_handle_bsd_signal() might be invoked with junk info/ucVoid. To
+ // avoid unnecessary crash when libjsig is not preloaded, try handle signals
+ // that do not require siginfo/ucontext first.
+
+ if (sig == SIGPIPE || sig == SIGXFSZ) {
+ // allow chained handler to go first
+ if (os::Bsd::chained_handler(sig, info, ucVoid)) {
+ return true;
+ } else {
+ if (PrintMiscellaneous && (WizardMode || Verbose)) {
+ char buf[64];
+ warning("Ignoring %s - see bugs 4229104 or 646499219",
+ os::exception_name(sig, buf, sizeof(buf)));
+ }
+ return true;
+ }
+ }
+
+ JavaThread* thread = NULL;
+ VMThread* vmthread = NULL;
+ if (os::Bsd::signal_handlers_are_installed) {
+ if (t != NULL ){
+ if(t->is_Java_thread()) {
+ thread = (JavaThread*)t;
+ }
+ else if(t->is_VM_thread()){
+ vmthread = (VMThread *)t;
+ }
+ }
+ }
+/*
+ NOTE: does not seem to work on bsd.
+ if (info == NULL || info->si_code <= 0 || info->si_code == SI_NOINFO) {
+ // can't decode this kind of signal
+ info = NULL;
+ } else {
+ assert(sig == info->si_signo, "bad siginfo");
+ }
+*/
+ // decide if this trap can be handled by a stub
+ address stub = NULL;
+
+ address pc = NULL;
+
+ //%note os_trap_1
+ if (info != NULL && uc != NULL && thread != NULL) {
+ pc = (address) os::Bsd::ucontext_get_pc(uc);
+
+ if (pc == (address) Fetch32PFI) {
+ uc->context_pc = intptr_t(Fetch32Resume) ;
+ return 1 ;
+ }
+#ifdef AMD64
+ if (pc == (address) FetchNPFI) {
+ uc->context_pc = intptr_t (FetchNResume) ;
+ return 1 ;
+ }
+#endif // AMD64
+
+ // Handle ALL stack overflow variations here
+ if (sig == SIGSEGV || sig == SIGBUS) {
+ address addr = (address) info->si_addr;
+
+ // check if fault address is within thread stack
+ if (addr < thread->stack_base() &&
+ addr >= thread->stack_base() - thread->stack_size()) {
+ // stack overflow
+ if (thread->in_stack_yellow_zone(addr)) {
+ thread->disable_stack_yellow_zone();
+ if (thread->thread_state() == _thread_in_Java) {
+ // Throw a stack overflow exception. Guard pages will be reenabled
+ // while unwinding the stack.
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW);
+ } else {
+ // Thread was in the vm or native code. Return and try to finish.
+ return 1;
+ }
+ } else if (thread->in_stack_red_zone(addr)) {
+ // Fatal red zone violation. Disable the guard pages and fall through
+ // to handle_unexpected_exception way down below.
+ thread->disable_stack_red_zone();
+ tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
+#ifndef _ALLBSD_SOURCE
+ } else {
+ // Accessing stack address below sp may cause SEGV if current
+ // thread has MAP_GROWSDOWN stack. This should only happen when
+ // current thread was created by user code with MAP_GROWSDOWN flag
+ // and then attached to VM. See notes in os_bsd.cpp.
+ if (thread->osthread()->expanding_stack() == 0) {
+ thread->osthread()->set_expanding_stack();
+ if (os::Bsd::manually_expand_stack(thread, addr)) {
+ thread->osthread()->clear_expanding_stack();
+ return 1;
+ }
+ thread->osthread()->clear_expanding_stack();
+ } else {
+ fatal("recursive segv. expanding stack.");
+ }
+#endif
+ }
+ }
+ }
+
+ if (thread->thread_state() == _thread_in_Java) {
+ // Java thread running in Java code => find exception handler if any
+ // a fault inside compiled code, the interpreter, or a stub
+
+ if ((sig == SIGSEGV || sig == SIGBUS) && os::is_poll_address((address)info->si_addr)) {
+ stub = SharedRuntime::get_poll_stub(pc);
+#if defined(__APPLE__) && !defined(AMD64)
+ // 32-bit Darwin reports a SIGBUS for nearly all memory access exceptions.
+ // Catching SIGBUS here prevents the implicit SIGBUS NULL check below from
+ // being called, so only do so if the implicit NULL check is not necessary.
+ } else if (sig == SIGBUS && MacroAssembler::needs_explicit_null_check((int)info->si_addr)) {
+#else
+ } else if (sig == SIGBUS /* && info->si_code == BUS_OBJERR */) {
+#endif
+ // BugId 4454115: A read from a MappedByteBuffer can fault
+ // here if the underlying file has been truncated.
+ // Do not crash the VM in such a case.
+ CodeBlob* cb = CodeCache::find_blob_unsafe(pc);
+ nmethod* nm = cb->is_nmethod() ? (nmethod*)cb : NULL;
+ if (nm != NULL && nm->has_unsafe_access()) {
+ stub = StubRoutines::handler_for_unsafe_access();
+ }
+ }
+ else
+
+#ifdef AMD64
+ if (sig == SIGFPE &&
+ (info->si_code == FPE_INTDIV || info->si_code == FPE_FLTDIV)) {
+ stub =
+ SharedRuntime::
+ continuation_for_implicit_exception(thread,
+ pc,
+ SharedRuntime::
+ IMPLICIT_DIVIDE_BY_ZERO);
+#ifdef __APPLE__
+ } else if (sig == SIGFPE && info->si_code == FPE_NOOP) {
+ int op = pc[0];
+
+ // Skip REX
+ if ((pc[0] & 0xf0) == 0x40) {
+ op = pc[1];
+ } else {
+ op = pc[0];
+ }
+
+ // Check for IDIV
+ if (op == 0xF7) {
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime:: IMPLICIT_DIVIDE_BY_ZERO);
+ } else {
+ // TODO: handle more cases if we are using other x86 instructions
+ // that can generate SIGFPE signal.
+ tty->print_cr("unknown opcode 0x%X with SIGFPE.", op);
+ fatal("please update this code.");
+ }
+#endif /* __APPLE__ */
+
+#else
+ if (sig == SIGFPE /* && info->si_code == FPE_INTDIV */) {
+ // HACK: si_code does not work on bsd 2.2.12-20!!!
+ int op = pc[0];
+ if (op == 0xDB) {
+ // FIST
+ // TODO: The encoding of D2I in i486.ad can cause an exception
+ // prior to the fist instruction if there was an invalid operation
+ // pending. We want to dismiss that exception. From the win_32
+ // side it also seems that if it really was the fist causing
+ // the exception that we do the d2i by hand with different
+ // rounding. Seems kind of weird.
+ // NOTE: that we take the exception at the NEXT floating point instruction.
+ assert(pc[0] == 0xDB, "not a FIST opcode");
+ assert(pc[1] == 0x14, "not a FIST opcode");
+ assert(pc[2] == 0x24, "not a FIST opcode");
+ return true;
+ } else if (op == 0xF7) {
+ // IDIV
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_DIVIDE_BY_ZERO);
+ } else {
+ // TODO: handle more cases if we are using other x86 instructions
+ // that can generate SIGFPE signal on bsd.
+ tty->print_cr("unknown opcode 0x%X with SIGFPE.", op);
+ fatal("please update this code.");
+ }
+#endif // AMD64
+ } else if ((sig == SIGSEGV || sig == SIGBUS) &&
+ !MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
+ // Determination of interpreter/vtable stub/compiled code null exception
+ stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
+ }
+ } else if (thread->thread_state() == _thread_in_vm &&
+ sig == SIGBUS && /* info->si_code == BUS_OBJERR && */
+ thread->doing_unsafe_access()) {
+ stub = StubRoutines::handler_for_unsafe_access();
+ }
+
+ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in
+ // and the heap gets shrunk before the field access.
+ if ((sig == SIGSEGV) || (sig == SIGBUS)) {
+ address addr = JNI_FastGetField::find_slowcase_pc(pc);
+ if (addr != (address)-1) {
+ stub = addr;
+ }
+ }
+
+ // Check to see if we caught the safepoint code in the
+ // process of write protecting the memory serialization page.
+ // It write enables the page immediately after protecting it
+ // so we can just return to retry the write.
+ if ((sig == SIGSEGV || sig == SIGBUS) &&
+ os::is_memory_serialize_page(thread, (address) info->si_addr)) {
+ // Block current thread until the memory serialize page permission restored.
+ os::block_on_serialize_page_trap();
+ return true;
+ }
+ }
+
+#ifndef AMD64
+ // Execution protection violation
+ //
+ // This should be kept as the last step in the triage. We don't
+ // have a dedicated trap number for a no-execute fault, so be
+ // conservative and allow other handlers the first shot.
+ //
+ // Note: We don't test that info->si_code == SEGV_ACCERR here.
+ // this si_code is so generic that it is almost meaningless; and
+ // the si_code for this condition may change in the future.
+ // Furthermore, a false-positive should be harmless.
+ if (UnguardOnExecutionViolation > 0 &&
+ (sig == SIGSEGV || sig == SIGBUS) &&
+ uc->context_trapno == trap_page_fault) {
+ int page_size = os::vm_page_size();
+ address addr = (address) info->si_addr;
+ address pc = os::Bsd::ucontext_get_pc(uc);
+ // Make sure the pc and the faulting address are sane.
+ //
+ // If an instruction spans a page boundary, and the page containing
+ // the beginning of the instruction is executable but the following
+ // page is not, the pc and the faulting address might be slightly
+ // different - we still want to unguard the 2nd page in this case.
+ //
+ // 15 bytes seems to be a (very) safe value for max instruction size.
+ bool pc_is_near_addr =
+ (pointer_delta((void*) addr, (void*) pc, sizeof(char)) < 15);
+ bool instr_spans_page_boundary =
+ (align_size_down((intptr_t) pc ^ (intptr_t) addr,
+ (intptr_t) page_size) > 0);
+
+ if (pc == addr || (pc_is_near_addr && instr_spans_page_boundary)) {
+ static volatile address last_addr =
+ (address) os::non_memory_address_word();
+
+ // In conservative mode, don't unguard unless the address is in the VM
+ if (addr != last_addr &&
+ (UnguardOnExecutionViolation > 1 || os::address_is_in_vm(addr))) {
+
+ // Set memory to RWX and retry
+ address page_start =
+ (address) align_size_down((intptr_t) addr, (intptr_t) page_size);
+ bool res = os::protect_memory((char*) page_start, page_size,
+ os::MEM_PROT_RWX);
+
+ if (PrintMiscellaneous && Verbose) {
+ char buf[256];
+ jio_snprintf(buf, sizeof(buf), "Execution protection violation "
+ "at " INTPTR_FORMAT
+ ", unguarding " INTPTR_FORMAT ": %s, errno=%d", addr,
+ page_start, (res ? "success" : "failed"), errno);
+ tty->print_raw_cr(buf);
+ }
+ stub = pc;
+
+ // Set last_addr so if we fault again at the same address, we don't end
+ // up in an endless loop.
+ //
+ // There are two potential complications here. Two threads trapping at
+ // the same address at the same time could cause one of the threads to
+ // think it already unguarded, and abort the VM. Likely very rare.
+ //
+ // The other race involves two threads alternately trapping at
+ // different addresses and failing to unguard the page, resulting in
+ // an endless loop. This condition is probably even more unlikely than
+ // the first.
+ //
+ // Although both cases could be avoided by using locks or thread local
+ // last_addr, these solutions are unnecessary complication: this
+ // handler is a best-effort safety net, not a complete solution. It is
+ // disabled by default and should only be used as a workaround in case
+ // we missed any no-execute-unsafe VM code.
+
+ last_addr = addr;
+ }
+ }
+ }
+#endif // !AMD64
+
+ if (stub != NULL) {
+ // save all thread context in case we need to restore it
+ if (thread != NULL) thread->set_saved_exception_pc(pc);
+
+ uc->context_pc = (intptr_t)stub;
+ return true;
+ }
+
+ // signal-chaining
+ if (os::Bsd::chained_handler(sig, info, ucVoid)) {
+ return true;
+ }
+
+ if (!abort_if_unrecognized) {
+ // caller wants another chance, so give it to him
+ return false;
+ }
+
+ if (pc == NULL && uc != NULL) {
+ pc = os::Bsd::ucontext_get_pc(uc);
+ }
+
+ // unmask current signal
+ sigset_t newset;
+ sigemptyset(&newset);
+ sigaddset(&newset, sig);
+ sigprocmask(SIG_UNBLOCK, &newset, NULL);
+
+ VMError err(t, sig, pc, info, ucVoid);
+ err.report_and_die();
+
+ ShouldNotReachHere();
+}
+
+#ifdef _ALLBSD_SOURCE
+// From solaris_i486.s ported to bsd_i486.s
+extern "C" void fixcw();
+#endif
+
+void os::Bsd::init_thread_fpu_state(void) {
+#ifndef AMD64
+# ifdef _ALLBSD_SOURCE
+ // Set fpu to 53 bit precision. This happens too early to use a stub.
+ fixcw();
+# else
+ // set fpu to 53 bit precision
+ set_fpu_control_word(0x27f);
+# endif
+#endif // !AMD64
+}
+
+#ifndef _ALLBSD_SOURCE
+int os::Bsd::get_fpu_control_word(void) {
+#ifdef AMD64
+ return 0;
+#else
+ int fpu_control;
+ _FPU_GETCW(fpu_control);
+ return fpu_control & 0xffff;
+#endif // AMD64
+}
+
+void os::Bsd::set_fpu_control_word(int fpu_control) {
+#ifndef AMD64
+ _FPU_SETCW(fpu_control);
+#endif // !AMD64
+}
+#endif
+
+// Check that the bsd kernel version is 2.4 or higher since earlier
+// versions do not support SSE without patches.
+bool os::supports_sse() {
+#if defined(AMD64) || defined(_ALLBSD_SOURCE)
+ return true;
+#else
+ struct utsname uts;
+ if( uname(&uts) != 0 ) return false; // uname fails?
+ char *minor_string;
+ int major = strtol(uts.release,&minor_string,10);
+ int minor = strtol(minor_string+1,NULL,10);
+ bool result = (major > 2 || (major==2 && minor >= 4));
+#ifndef PRODUCT
+ if (PrintMiscellaneous && Verbose) {
+ tty->print("OS version is %d.%d, which %s support SSE/SSE2\n",
+ major,minor, result ? "DOES" : "does NOT");
+ }
+#endif
+ return result;
+#endif // AMD64
+}
+
+bool os::is_allocatable(size_t bytes) {
+#ifdef AMD64
+ // unused on amd64?
+ return true;
+#else
+
+ if (bytes < 2 * G) {
+ return true;
+ }
+
+ char* addr = reserve_memory(bytes, NULL);
+
+ if (addr != NULL) {
+ release_memory(addr, bytes);
+ }
+
+ return addr != NULL;
+#endif // AMD64
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// thread stack
+
+#ifdef AMD64
+size_t os::Bsd::min_stack_allowed = 64 * K;
+
+// amd64: pthread on amd64 is always in floating stack mode
+bool os::Bsd::supports_variable_stack_size() { return true; }
+#else
+size_t os::Bsd::min_stack_allowed = (48 DEBUG_ONLY(+4))*K;
+
+#ifdef __GNUC__
+#define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
+#endif
+
+#ifdef _ALLBSD_SOURCE
+bool os::Bsd::supports_variable_stack_size() { return true; }
+#else
+// Test if pthread library can support variable thread stack size. BsdThreads
+// in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
+// in floating stack mode and NPTL support variable stack size.
+bool os::Bsd::supports_variable_stack_size() {
+ if (os::Bsd::is_NPTL()) {
+ // NPTL, yes
+ return true;
+
+ } else {
+ // Note: We can't control default stack size when creating a thread.
+ // If we use non-default stack size (pthread_attr_setstacksize), both
+ // floating stack and non-floating stack BsdThreads will return the
+ // same value. This makes it impossible to implement this function by
+ // detecting thread stack size directly.
+ //
+ // An alternative approach is to check %gs. Fixed-stack BsdThreads
+ // do not use %gs, so its value is 0. Floating-stack BsdThreads use
+ // %gs (either as LDT selector or GDT selector, depending on kernel)
+ // to access thread specific data.
+ //
+ // Note that %gs is a reserved glibc register since early 2001, so
+ // applications are not allowed to change its value (Ulrich Drepper from
+ // Redhat confirmed that all known offenders have been modified to use
+ // either %fs or TSD). In the worst case scenario, when VM is embedded in
+ // a native application that plays with %gs, we might see non-zero %gs
+ // even BsdThreads is running in fixed stack mode. As the result, we'll
+ // return true and skip _thread_safety_check(), so we may not be able to
+ // detect stack-heap collisions. But otherwise it's harmless.
+ //
+#ifdef __GNUC__
+ return (GET_GS() != 0);
+#else
+ return false;
+#endif
+ }
+}
+#endif
+#endif // AMD64
+
+// return default stack size for thr_type
+size_t os::Bsd::default_stack_size(os::ThreadType thr_type) {
+ // default stack size (compiler thread needs larger stack)
+#ifdef AMD64
+ size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
+#else
+ size_t s = (thr_type == os::compiler_thread ? 2 * M : 512 * K);
+#endif // AMD64
+ return s;
+}
+
+size_t os::Bsd::default_guard_size(os::ThreadType thr_type) {
+ // Creating guard page is very expensive. Java thread has HotSpot
+ // guard page, only enable glibc guard page for non-Java threads.
+ return (thr_type == java_thread ? 0 : page_size());
+}
+
+// Java thread:
+//
+// Low memory addresses
+// +------------------------+
+// | |\ JavaThread created by VM does not have glibc
+// | glibc guard page | - guard, attached Java thread usually has
+// | |/ 1 page glibc guard.
+// P1 +------------------------+ Thread::stack_base() - Thread::stack_size()
+// | |\
+// | HotSpot Guard Pages | - red and yellow pages
+// | |/
+// +------------------------+ JavaThread::stack_yellow_zone_base()
+// | |\
+// | Normal Stack | -
+// | |/
+// P2 +------------------------+ Thread::stack_base()
+//
+// Non-Java thread:
+//
+// Low memory addresses
+// +------------------------+
+// | |\
+// | glibc guard page | - usually 1 page
+// | |/
+// P1 +------------------------+ Thread::stack_base() - Thread::stack_size()
+// | |\
+// | Normal Stack | -
+// | |/
+// P2 +------------------------+ Thread::stack_base()
+//
+// ** P1 (aka bottom) and size ( P2 = P1 - size) are the address and stack size returned from
+// pthread_attr_getstack()
+
+static void current_stack_region(address * bottom, size_t * size) {
+#ifdef __APPLE__
+ pthread_t self = pthread_self();
+ void *stacktop = pthread_get_stackaddr_np(self);
+ *size = pthread_get_stacksize_np(self);
+ *bottom = (address) stacktop - *size;
+#elif defined(__OpenBSD__)
+ stack_t ss;
+ int rslt = pthread_stackseg_np(pthread_self(), &ss);
+
+ if (rslt != 0)
+ fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
+
+ *bottom = (address)((char *)ss.ss_sp - ss.ss_size);
+ *size = ss.ss_size;
+#elif defined(_ALLBSD_SOURCE)
+ pthread_attr_t attr;
+
+ int rslt = pthread_attr_init(&attr);
+
+ // JVM needs to know exact stack location, abort if it fails
+ if (rslt != 0)
+ fatal(err_msg("pthread_attr_init failed with err = %d", rslt));
+
+ rslt = pthread_attr_get_np(pthread_self(), &attr);
+
+ if (rslt != 0)
+ fatal(err_msg("pthread_attr_get_np failed with err = %d", rslt));
+
+ if (pthread_attr_getstackaddr(&attr, (void **)bottom) != 0 ||
+ pthread_attr_getstacksize(&attr, size) != 0) {
+ fatal("Can not locate current stack attributes!");
+ }
+
+ pthread_attr_destroy(&attr);
+#else
+ if (os::Bsd::is_initial_thread()) {
+ // initial thread needs special handling because pthread_getattr_np()
+ // may return bogus value.
+ *bottom = os::Bsd::initial_thread_stack_bottom();
+ *size = os::Bsd::initial_thread_stack_size();
+ } else {
+ pthread_attr_t attr;
+
+ int rslt = pthread_getattr_np(pthread_self(), &attr);
+
+ // JVM needs to know exact stack location, abort if it fails
+ if (rslt != 0) {
+ if (rslt == ENOMEM) {
+ vm_exit_out_of_memory(0, "pthread_getattr_np");
+ } else {
+ fatal(err_msg("pthread_getattr_np failed with errno = %d", rslt));
+ }
+ }
+
+ if (pthread_attr_getstack(&attr, (void **)bottom, size) != 0) {
+ fatal("Can not locate current stack attributes!");
+ }
+
+ pthread_attr_destroy(&attr);
+
+ }
+#endif
+ assert(os::current_stack_pointer() >= *bottom &&
+ os::current_stack_pointer() < *bottom + *size, "just checking");
+}
+
+address os::current_stack_base() {
+ address bottom;
+ size_t size;
+ current_stack_region(&bottom, &size);
+ return (bottom + size);
+}
+
+size_t os::current_stack_size() {
+ // stack size includes normal stack and HotSpot guard pages
+ address bottom;
+ size_t size;
+ current_stack_region(&bottom, &size);
+ return size;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// helper functions for fatal error handler
+
+void os::print_context(outputStream *st, void *context) {
+ if (context == NULL) return;
+
+ ucontext_t *uc = (ucontext_t*)context;
+ st->print_cr("Registers:");
+#ifdef AMD64
+ st->print( "RAX=" INTPTR_FORMAT, uc->context_rax);
+ st->print(", RBX=" INTPTR_FORMAT, uc->context_rbx);
+ st->print(", RCX=" INTPTR_FORMAT, uc->context_rcx);
+ st->print(", RDX=" INTPTR_FORMAT, uc->context_rdx);
+ st->cr();
+ st->print( "RSP=" INTPTR_FORMAT, uc->context_rsp);
+ st->print(", RBP=" INTPTR_FORMAT, uc->context_rbp);
+ st->print(", RSI=" INTPTR_FORMAT, uc->context_rsi);
+ st->print(", RDI=" INTPTR_FORMAT, uc->context_rdi);
+ st->cr();
+ st->print( "R8 =" INTPTR_FORMAT, uc->context_r8);
+ st->print(", R9 =" INTPTR_FORMAT, uc->context_r9);
+ st->print(", R10=" INTPTR_FORMAT, uc->context_r10);
+ st->print(", R11=" INTPTR_FORMAT, uc->context_r11);
+ st->cr();
+ st->print( "R12=" INTPTR_FORMAT, uc->context_r12);
+ st->print(", R13=" INTPTR_FORMAT, uc->context_r13);
+ st->print(", R14=" INTPTR_FORMAT, uc->context_r14);
+ st->print(", R15=" INTPTR_FORMAT, uc->context_r15);
+ st->cr();
+ st->print( "RIP=" INTPTR_FORMAT, uc->context_rip);
+ st->print(", EFLAGS=" INTPTR_FORMAT, uc->context_flags);
+ st->print(", ERR=" INTPTR_FORMAT, uc->context_err);
+ st->cr();
+ st->print(" TRAPNO=" INTPTR_FORMAT, uc->context_trapno);
+#else
+ st->print( "EAX=" INTPTR_FORMAT, uc->context_eax);
+ st->print(", EBX=" INTPTR_FORMAT, uc->context_ebx);
+ st->print(", ECX=" INTPTR_FORMAT, uc->context_ecx);
+ st->print(", EDX=" INTPTR_FORMAT, uc->context_edx);
+ st->cr();
+ st->print( "ESP=" INTPTR_FORMAT, uc->context_esp);
+ st->print(", EBP=" INTPTR_FORMAT, uc->context_ebp);
+ st->print(", ESI=" INTPTR_FORMAT, uc->context_esi);
+ st->print(", EDI=" INTPTR_FORMAT, uc->context_edi);
+ st->cr();
+ st->print( "EIP=" INTPTR_FORMAT, uc->context_eip);
+ st->print(", EFLAGS=" INTPTR_FORMAT, uc->context_eflags);
+#endif // AMD64
+ st->cr();
+ st->cr();
+
+ intptr_t *sp = (intptr_t *)os::Bsd::ucontext_get_sp(uc);
+ st->print_cr("Top of Stack: (sp=" PTR_FORMAT ")", sp);
+ print_hex_dump(st, (address)sp, (address)(sp + 8*sizeof(intptr_t)), sizeof(intptr_t));
+ st->cr();
+
+ // Note: it may be unsafe to inspect memory near pc. For example, pc may
+ // point to garbage if entry point in an nmethod is corrupted. Leave
+ // this at the end, and hope for the best.
+ address pc = os::Bsd::ucontext_get_pc(uc);
+ st->print_cr("Instructions: (pc=" PTR_FORMAT ")", pc);
+ print_hex_dump(st, pc - 32, pc + 32, sizeof(char));
+}
+
+void os::print_register_info(outputStream *st, void *context) {
+ if (context == NULL) return;
+
+ ucontext_t *uc = (ucontext_t*)context;
+
+ st->print_cr("Register to memory mapping:");
+ st->cr();
+
+ // this is horrendously verbose but the layout of the registers in the
+ // context does not match how we defined our abstract Register set, so
+ // we can't just iterate through the gregs area
+
+ // this is only for the "general purpose" registers
+
+#ifdef AMD64
+ st->print("RAX="); print_location(st, uc->context_rax);
+ st->print("RBX="); print_location(st, uc->context_rbx);
+ st->print("RCX="); print_location(st, uc->context_rcx);
+ st->print("RDX="); print_location(st, uc->context_rdx);
+ st->print("RSP="); print_location(st, uc->context_rsp);
+ st->print("RBP="); print_location(st, uc->context_rbp);
+ st->print("RSI="); print_location(st, uc->context_rsi);
+ st->print("RDI="); print_location(st, uc->context_rdi);
+ st->print("R8 ="); print_location(st, uc->context_r8);
+ st->print("R9 ="); print_location(st, uc->context_r9);
+ st->print("R10="); print_location(st, uc->context_r10);
+ st->print("R11="); print_location(st, uc->context_r11);
+ st->print("R12="); print_location(st, uc->context_r12);
+ st->print("R13="); print_location(st, uc->context_r13);
+ st->print("R14="); print_location(st, uc->context_r14);
+ st->print("R15="); print_location(st, uc->context_r15);
+#else
+ st->print("EAX="); print_location(st, uc->context_eax);
+ st->print("EBX="); print_location(st, uc->context_ebx);
+ st->print("ECX="); print_location(st, uc->context_ecx);
+ st->print("EDX="); print_location(st, uc->context_edx);
+ st->print("ESP="); print_location(st, uc->context_esp);
+ st->print("EBP="); print_location(st, uc->context_ebp);
+ st->print("ESI="); print_location(st, uc->context_esi);
+ st->print("EDI="); print_location(st, uc->context_edi);
+#endif // AMD64
+
+ st->cr();
+}
+
+void os::setup_fpu() {
+#ifndef AMD64
+ address fpu_cntrl = StubRoutines::addr_fpu_cntrl_wrd_std();
+ __asm__ volatile ( "fldcw (%0)" :
+ : "r" (fpu_cntrl) : "memory");
+#endif // !AMD64
+}
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp
new file mode 100644
index 0000000..7a4e710
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 1999, 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 OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
+
+ static void setup_fpu();
+ static bool supports_sse();
+
+ static bool is_allocatable(size_t bytes);
+
+ // Used to register dynamic code cache area with the OS
+ // Note: Currently only used in 64 bit Windows implementations
+ static bool register_code_area(char *low, char *high) { return true; }
+
+#endif // OS_CPU_BSD_X86_VM_OS_BSD_X86_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp b/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp
new file mode 100644
index 0000000..6da429b
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/prefetch_bsd_x86.inline.hpp
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2003, 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 OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
+#define OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
+
+#include "runtime/prefetch.hpp"
+
+
+inline void Prefetch::read (void *loc, intx interval) {
+#ifdef AMD64
+ __asm__ ("prefetcht0 (%0,%1,1)" : : "r" (loc), "r" (interval));
+#endif // AMD64
+}
+
+inline void Prefetch::write(void *loc, intx interval) {
+#ifdef AMD64
+
+ // Do not use the 3dnow prefetchw instruction. It isn't supported on em64t.
+ // __asm__ ("prefetchw (%0,%1,1)" : : "r" (loc), "r" (interval));
+ __asm__ ("prefetcht0 (%0,%1,1)" : : "r" (loc), "r" (interval));
+
+#endif // AMD64
+}
+
+#endif // OS_CPU_BSD_X86_VM_PREFETCH_BSD_X86_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp
new file mode 100644
index 0000000..3c76437
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.cpp
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 1999, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/threadLocalStorage.hpp"
+#include "thread_bsd.inline.hpp"
+
+// Map stack pointer (%esp) to thread pointer for faster TLS access
+//
+// Here we use a flat table for better performance. Getting current thread
+// is down to one memory access (read _sp_map[%esp>>12]) in generated code
+// and two in runtime code (-fPIC code needs an extra load for _sp_map).
+//
+// This code assumes stack page is not shared by different threads. It works
+// in 32-bit VM when page size is 4K (or a multiple of 4K, if that matters).
+//
+// Notice that _sp_map is allocated in the bss segment, which is ZFOD
+// (zero-fill-on-demand). While it reserves 4M address space upfront,
+// actual memory pages are committed on demand.
+//
+// If an application creates and destroys a lot of threads, usually the
+// stack space freed by a thread will soon get reused by new thread
+// (this is especially true in NPTL or BsdThreads in fixed-stack mode).
+// No memory page in _sp_map is wasted.
+//
+// However, it's still possible that we might end up populating &
+// committing a large fraction of the 4M table over time, but the actual
+// amount of live data in the table could be quite small. The max wastage
+// is less than 4M bytes. If it becomes an issue, we could use madvise()
+// with MADV_DONTNEED to reclaim unused (i.e. all-zero) pages in _sp_map.
+// MADV_DONTNEED on Bsd keeps the virtual memory mapping, but zaps the
+// physical memory page (i.e. similar to MADV_FREE on Solaris).
+
+#ifndef AMD64
+Thread* ThreadLocalStorage::_sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
+#endif // !AMD64
+
+void ThreadLocalStorage::generate_code_for_get_thread() {
+ // nothing we can do here for user-level thread
+}
+
+void ThreadLocalStorage::pd_init() {
+#ifndef AMD64
+ assert(align_size_down(os::vm_page_size(), PAGE_SIZE) == os::vm_page_size(),
+ "page size must be multiple of PAGE_SIZE");
+#endif // !AMD64
+}
+
+void ThreadLocalStorage::pd_set_thread(Thread* thread) {
+ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
+
+#ifndef AMD64
+ address stack_top = os::current_stack_base();
+ size_t stack_size = os::current_stack_size();
+
+ for (address p = stack_top - stack_size; p < stack_top; p += PAGE_SIZE) {
+ // pd_set_thread() is called with non-NULL value when a new thread is
+ // created/attached, or with NULL value when a thread is about to exit.
+ // If both "thread" and the corresponding _sp_map[] entry are non-NULL,
+ // they should have the same value. Otherwise it might indicate that the
+ // stack page is shared by multiple threads. However, a more likely cause
+ // for this assertion to fail is that an attached thread exited without
+ // detaching itself from VM, which is a program error and could cause VM
+ // to crash.
+ assert(thread == NULL || _sp_map[(uintptr_t)p >> PAGE_SHIFT] == NULL ||
+ thread == _sp_map[(uintptr_t)p >> PAGE_SHIFT],
+ "thread exited without detaching from VM??");
+ _sp_map[(uintptr_t)p >> PAGE_SHIFT] = thread;
+ }
+#endif // !AMD64
+}
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp b/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp
new file mode 100644
index 0000000..7fedb95
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 1999, 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 OS_CPU_BSD_X86_VM_THREADLS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_THREADLS_BSD_X86_HPP
+
+ // Processor dependent parts of ThreadLocalStorage
+
+#ifndef AMD64
+ // map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
+ #define SP_BITLENGTH 32
+#ifndef PAGE_SHIFT
+ #define PAGE_SHIFT 12
+ #define PAGE_SIZE (1UL << PAGE_SHIFT)
+#endif
+ static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
+#endif // !AMD64
+
+public:
+
+#ifndef AMD64
+ static Thread** sp_map_addr() { return _sp_map; }
+#endif // !AMD64
+
+ static Thread* thread() {
+#ifdef AMD64
+ return (Thread*) os::thread_local_storage_at(thread_index());
+#else
+ uintptr_t sp;
+ __asm__ volatile ("movl %%esp, %0" : "=r" (sp));
+ return _sp_map[sp >> PAGE_SHIFT];
+#endif // AMD64
+ }
+
+#endif // OS_CPU_BSD_X86_VM_THREADLS_BSD_X86_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp
new file mode 100644
index 0000000..e63c46e
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2003, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/frame.inline.hpp"
+#include "thread_bsd.inline.hpp"
+
+// For Forte Analyzer AsyncGetCallTrace profiling support - thread is
+// currently interrupted by SIGPROF
+bool JavaThread::pd_get_top_frame_for_signal_handler(frame* fr_addr,
+ void* ucontext, bool isInJava) {
+
+ assert(Thread::current() == this, "caller must be current thread");
+ assert(this->is_Java_thread(), "must be JavaThread");
+
+ JavaThread* jt = (JavaThread *)this;
+
+ // If we have a last_Java_frame, then we should use it even if
+ // isInJava == true. It should be more reliable than ucontext info.
+ if (jt->has_last_Java_frame()) {
+ *fr_addr = jt->pd_last_frame();
+ return true;
+ }
+
+ // At this point, we don't have a last_Java_frame, so
+ // we try to glean some information out of the ucontext
+ // if we were running Java code when SIGPROF came in.
+ if (isInJava) {
+ ucontext_t* uc = (ucontext_t*) ucontext;
+
+ intptr_t* ret_fp;
+ intptr_t* ret_sp;
+ ExtendedPC addr = os::Bsd::fetch_frame_from_ucontext(this, uc,
+ &ret_sp, &ret_fp);
+ if (addr.pc() == NULL || ret_sp == NULL ) {
+ // ucontext wasn't useful
+ return false;
+ }
+
+ frame ret_frame(ret_sp, ret_fp, addr.pc());
+ if (!ret_frame.safe_for_sender(jt)) {
+#ifdef COMPILER2
+ // C2 uses ebp as a general register see if NULL fp helps
+ frame ret_frame2(ret_sp, NULL, addr.pc());
+ if (!ret_frame2.safe_for_sender(jt)) {
+ // nothing else to try if the frame isn't good
+ return false;
+ }
+ ret_frame = ret_frame2;
+#else
+ // nothing else to try if the frame isn't good
+ return false;
+#endif /* COMPILER2 */
+ }
+ *fr_addr = ret_frame;
+ return true;
+ }
+
+ // nothing else to try
+ return false;
+}
+
+void JavaThread::cache_global_variables() { }
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp b/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp
new file mode 100644
index 0000000..69dba9b
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
+
+ private:
+ void pd_initialize() {
+ _anchor.clear();
+ }
+
+ frame pd_last_frame() {
+ assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
+ if (_anchor.last_Java_pc() != NULL) {
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
+ } else {
+ // This will pick up pc from sp
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
+ }
+ }
+
+ public:
+ // Mutators are highly dangerous....
+ intptr_t* last_Java_fp() { return _anchor.last_Java_fp(); }
+ void set_last_Java_fp(intptr_t* fp) { _anchor.set_last_Java_fp(fp); }
+
+ void set_base_of_stack_pointer(intptr_t* base_sp) {
+ }
+
+ static ByteSize last_Java_fp_offset() {
+ return byte_offset_of(JavaThread, _anchor) + JavaFrameAnchor::last_Java_fp_offset();
+ }
+
+ intptr_t* base_of_stack_pointer() {
+ return NULL;
+ }
+ void record_base_of_stack_pointer() {
+ }
+
+ bool pd_get_top_frame_for_signal_handler(frame* fr_addr, void* ucontext,
+ bool isInJava);
+
+ // These routines are only used on cpu architectures that
+ // have separate register stacks (Itanium).
+ static bool register_stack_overflow() { return false; }
+ static void enable_register_stack_guard() {}
+ static void disable_register_stack_guard() {}
+
+#endif // OS_CPU_BSD_X86_VM_THREAD_BSD_X86_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp b/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
new file mode 100644
index 0000000..210d5d9
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
+
+// These are the OS and CPU-specific fields, types and integer
+// constants required by the Serviceability Agent. This file is
+// referenced by vmStructs.cpp.
+
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+ \
+ /******************************/ \
+ /* Threads (NOTE: incomplete) */ \
+ /******************************/ \
+ nonstatic_field(OSThread, _thread_id, pthread_t) \
+ nonstatic_field(OSThread, _pthread_id, pthread_t) \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+ \
+ /**********************/ \
+ /* Posix Thread IDs */ \
+ /**********************/ \
+ \
+ declare_integer_type(pid_t) \
+ declare_unsigned_integer_type(pthread_t) \
+ \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+ \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+ \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+#endif // OS_CPU_BSD_X86_VM_VMSTRUCTS_BSD_X86_HPP
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp
new file mode 100644
index 0000000..d1c8c6b
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_x86/vm/vm_version_bsd_x86.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2006, 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "runtime/os.hpp"
+#include "vm_version_x86.hpp"
diff --git a/hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp
similarity index 100%
copy from hotspot/src/os_cpu/linux_zero/vm/assembler_linux_zero.cpp
copy to hotspot/src/os_cpu/bsd_zero/vm/assembler_bsd_zero.cpp
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
new file mode 100644
index 0000000..19027bd
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp
@@ -0,0 +1,323 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2011 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
+
+#include "orderAccess_bsd_zero.inline.hpp"
+#include "runtime/atomic.hpp"
+#include "runtime/os.hpp"
+#include "vm_version_zero.hpp"
+
+// Implementation of class atomic
+
+#ifdef M68K
+
+/*
+ * __m68k_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Returns newval on success and oldval if no exchange happened.
+ * This implementation is processor specific and works on
+ * 68020 68030 68040 and 68060.
+ *
+ * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
+ * instruction.
+ * Using a kernelhelper would be better for arch complete implementation.
+ *
+ */
+
+static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
+ int ret;
+ __asm __volatile ("cas%.l %0,%2,%1"
+ : "=d" (ret), "+m" (*(ptr))
+ : "d" (newval), "0" (oldval));
+ return ret;
+}
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int m68k_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval) {
+ for (;;) {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == newval)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
+ for (;;) {
+ // Loop until success.
+
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
+ for (;;) {
+ // Loop until success.
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == prev)
+ return prev;
+ }
+}
+#endif // M68K
+
+#ifdef ARM
+
+/*
+ * __kernel_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Return zero if *ptr was changed or non-zero if no exchange happened.
+ * The C flag is also set if *ptr was changed to allow for assembly
+ * optimization in the calling code.
+ *
+ */
+
+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
+
+
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int arm_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval) {
+ for (;;) {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
+ for (;;) {
+ // Loop until a __kernel_cmpxchg succeeds.
+
+ int prev = *ptr;
+
+ if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
+ for (;;) {
+ // Loop until a __kernel_cmpxchg succeeds.
+ int prev = *ptr;
+
+ if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+ return prev;
+ }
+}
+#endif // ARM
+
+inline void Atomic::store(jint store_value, volatile jint* dest) {
+#if !defined(ARM) && !defined(M68K)
+ __sync_synchronize();
+#endif
+ *dest = store_value;
+}
+
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
+#if !defined(ARM) && !defined(M68K)
+ __sync_synchronize();
+#endif
+ *dest = store_value;
+}
+
+inline jint Atomic::add(jint add_value, volatile jint* dest) {
+#ifdef ARM
+ return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
+ return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+#ifdef ARM
+ return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
+ return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
+}
+
+inline void Atomic::inc(volatile jint* dest) {
+ add(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ add_ptr(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ add_ptr(1, dest);
+}
+
+inline void Atomic::dec(volatile jint* dest) {
+ add(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ add_ptr(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ add_ptr(-1, dest);
+}
+
+inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
+#ifdef ARM
+ return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
+ // __sync_lock_test_and_set is a bizarrely named atomic exchange
+ // operation. Note that some platforms only support this with the
+ // limitation that the only valid value to store is the immediate
+ // constant 1. There is a test for this in JNI_CreateJavaVM().
+ return __sync_lock_test_and_set (dest, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
+ volatile intptr_t* dest) {
+#ifdef ARM
+ return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
+ return __sync_lock_test_and_set (dest, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void *) xchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest);
+}
+
+inline jint Atomic::cmpxchg(jint exchange_value,
+ volatile jint* dest,
+ jint compare_value) {
+#ifdef ARM
+ return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline jlong Atomic::cmpxchg(jlong exchange_value,
+ volatile jlong* dest,
+ jlong compare_value) {
+
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
+ volatile intptr_t* dest,
+ intptr_t compare_value) {
+#ifdef ARM
+ return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value,
+ volatile void* dest,
+ void* compare_value) {
+
+ return (void *) cmpxchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest,
+ (intptr_t) compare_value);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ os::atomic_copy64(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ os::atomic_copy64((volatile jlong*)&store_value, dest);
+}
+
+#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
new file mode 100644
index 0000000..b8217b4
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2003, 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 OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+
+// Efficient swapping of data bytes from Java byte
+// ordering to native byte ordering and vice versa.
+
+#ifdef __APPLE__
+#include <libkern/OSByteOrder.h>
+#else
+# include <sys/endian.h>
+#endif
+
+#if defined(__APPLE__)
+# define bswap_16(x) OSSwapInt16(x)
+# define bswap_32(x) OSSwapInt32(x)
+# define bswap_64(x) OSSwapInt64(x)
+#elif defined(__OpenBSD__)
+# define bswap_16(x) swap16(x)
+# define bswap_32(x) swap32(x)
+# define bswap_64(x) swap64(x)
+#elif defined(__NetBSD__)
+# define bswap_16(x) bswap16(x)
+# define bswap_32(x) bswap32(x)
+# define bswap_64(x) bswap64(x)
+#else
+# define bswap_16(x) __bswap16(x)
+# define bswap_32(x) __bswap32(x)
+# define bswap_64(x) __bswap64(x)
+#endif
+
+inline u2 Bytes::swap_u2(u2 x) {
+ return bswap_16(x);
+}
+
+inline u4 Bytes::swap_u4(u4 x) {
+ return bswap_32(x);
+}
+
+inline u8 Bytes::swap_u8(u8 x) {
+ return bswap_64(x);
+}
+
+#endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp b/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp
new file mode 100644
index 0000000..57e2759
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/globals_bsd_zero.hpp
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
+
+//
+// Set the default values for platform dependent flags used by the
+// runtime system. See globals.hpp for details of what they do.
+//
+
+define_pd_global(bool, DontYieldALot, false);
+define_pd_global(intx, ThreadStackSize, 1536);
+#ifdef _LP64
+define_pd_global(intx, VMThreadStackSize, 1024);
+#else
+define_pd_global(intx, VMThreadStackSize, 512);
+#endif // _LP64
+define_pd_global(intx, CompilerThreadStackSize, 0);
+define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
+
+define_pd_global(bool, UseVectoredExceptions, false);
+// Only used on 64 bit platforms
+define_pd_global(uintx, HeapBaseMinAddress, 2*G);
+
+#endif // OS_CPU_BSD_ZERO_VM_GLOBALS_BSD_ZERO_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
new file mode 100644
index 0000000..7f8e78b
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP
+
+#include "runtime/orderAccess.hpp"
+#include "vm_version_zero.hpp"
+
+#ifdef ARM
+
+/*
+ * ARM Kernel helper for memory barrier.
+ * Using __asm __volatile ("":::"memory") does not work reliable on ARM
+ * and gcc __sync_synchronize(); implementation does not use the kernel
+ * helper for all gcc versions so it is unreliable to use as well.
+ */
+typedef void (__kernel_dmb_t) (void);
+#define __kernel_dmb (*(__kernel_dmb_t *) 0xffff0fa0)
+
+#define FULL_MEM_BARRIER __kernel_dmb()
+#define READ_MEM_BARRIER __kernel_dmb()
+#define WRITE_MEM_BARRIER __kernel_dmb()
+
+#else // ARM
+
+#define FULL_MEM_BARRIER __sync_synchronize()
+
+#ifdef PPC
+
+#ifdef __NO_LWSYNC__
+#define READ_MEM_BARRIER __asm __volatile ("sync":::"memory")
+#define WRITE_MEM_BARRIER __asm __volatile ("sync":::"memory")
+#else
+#define READ_MEM_BARRIER __asm __volatile ("lwsync":::"memory")
+#define WRITE_MEM_BARRIER __asm __volatile ("lwsync":::"memory")
+#endif
+
+#else // PPC
+
+#define READ_MEM_BARRIER __asm __volatile ("":::"memory")
+#define WRITE_MEM_BARRIER __asm __volatile ("":::"memory")
+
+#endif // PPC
+
+#endif // ARM
+
+
+inline void OrderAccess::loadload() { acquire(); }
+inline void OrderAccess::storestore() { release(); }
+inline void OrderAccess::loadstore() { acquire(); }
+inline void OrderAccess::storeload() { fence(); }
+
+inline void OrderAccess::acquire() {
+ READ_MEM_BARRIER;
+}
+
+inline void OrderAccess::release() {
+ WRITE_MEM_BARRIER;
+}
+
+inline void OrderAccess::fence() {
+ FULL_MEM_BARRIER;
+}
+
+inline jbyte OrderAccess::load_acquire(volatile jbyte* p) { jbyte data = *p; acquire(); return data; }
+inline jshort OrderAccess::load_acquire(volatile jshort* p) { jshort data = *p; acquire(); return data; }
+inline jint OrderAccess::load_acquire(volatile jint* p) { jint data = *p; acquire(); return data; }
+inline jlong OrderAccess::load_acquire(volatile jlong* p) {
+ jlong tmp;
+ os::atomic_copy64(p, &tmp);
+ acquire();
+ return tmp;
+}
+inline jubyte OrderAccess::load_acquire(volatile jubyte* p) { jubyte data = *p; acquire(); return data; }
+inline jushort OrderAccess::load_acquire(volatile jushort* p) { jushort data = *p; acquire(); return data; }
+inline juint OrderAccess::load_acquire(volatile juint* p) { juint data = *p; acquire(); return data; }
+inline julong OrderAccess::load_acquire(volatile julong* p) {
+ julong tmp;
+ os::atomic_copy64(p, &tmp);
+ acquire();
+ return tmp;
+}
+inline jfloat OrderAccess::load_acquire(volatile jfloat* p) { jfloat data = *p; acquire(); return data; }
+inline jdouble OrderAccess::load_acquire(volatile jdouble* p) {
+ jdouble tmp;
+ os::atomic_copy64(p, &tmp);
+ acquire();
+ return tmp;
+}
+
+inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t* p) {
+ intptr_t data = *p;
+ acquire();
+ return data;
+}
+inline void* OrderAccess::load_ptr_acquire(volatile void* p) {
+ void *data = *(void* volatile *)p;
+ acquire();
+ return data;
+}
+inline void* OrderAccess::load_ptr_acquire(const volatile void* p) {
+ void *data = *(void* const volatile *)p;
+ acquire();
+ return data;
+}
+
+inline void OrderAccess::release_store(volatile jbyte* p, jbyte v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile jshort* p, jshort v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile jint* p, jint v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile jlong* p, jlong v)
+{ release(); os::atomic_copy64(&v, p); }
+inline void OrderAccess::release_store(volatile jubyte* p, jubyte v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile jushort* p, jushort v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile juint* p, juint v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile julong* p, julong v)
+{ release(); os::atomic_copy64(&v, p); }
+inline void OrderAccess::release_store(volatile jfloat* p, jfloat v) { release(); *p = v; }
+inline void OrderAccess::release_store(volatile jdouble* p, jdouble v)
+{ release(); os::atomic_copy64(&v, p); }
+
+inline void OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { release(); *p = v; }
+inline void OrderAccess::release_store_ptr(volatile void* p, void* v)
+{ release(); *(void* volatile *)p = v; }
+
+inline void OrderAccess::store_fence(jbyte* p, jbyte v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jshort* p, jshort v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jint* p, jint v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jlong* p, jlong v) { os::atomic_copy64(&v, p); fence(); }
+inline void OrderAccess::store_fence(jubyte* p, jubyte v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(juint* p, juint v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(julong* p, julong v) { os::atomic_copy64(&v, p); fence(); }
+inline void OrderAccess::store_fence(jfloat* p, jfloat v) { *p = v; fence(); }
+inline void OrderAccess::store_fence(jdouble* p, jdouble v) { os::atomic_copy64(&v, p); fence(); }
+
+inline void OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); }
+inline void OrderAccess::store_ptr_fence(void** p, void* v) { *p = v; fence(); }
+
+inline void OrderAccess::release_store_fence(volatile jbyte* p, jbyte v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jshort* p, jshort v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jint* p, jint v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jlong* p, jlong v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jubyte* p, jubyte v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jushort* p, jushort v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile juint* p, juint v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile julong* p, julong v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jfloat* p, jfloat v) { release_store(p, v); fence(); }
+inline void OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store(p, v); fence(); }
+
+inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { release_store_ptr(p, v); fence(); }
+inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { release_store_ptr(p, v); fence(); }
+
+#endif // OS_CPU_BSD_ZERO_VM_ORDERACCESS_BSD_ZERO_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
new file mode 100644
index 0000000..675ee54
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -0,0 +1,558 @@
+/*
+ * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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 defined(_ALLBSD_SOURCE) && !defined(__APPLE__) && !defined(__NetBSD__)
+#include <pthread.h>
+# include <pthread_np.h> /* For pthread_attr_get_np */
+#endif
+
+// no precompiled headers
+#include "assembler_zero.inline.hpp"
+#include "classfile/classLoader.hpp"
+#include "classfile/systemDictionary.hpp"
+#include "classfile/vmSymbols.hpp"
+#include "code/icBuffer.hpp"
+#include "code/vtableStubs.hpp"
+#include "interpreter/interpreter.hpp"
+#include "jvm_bsd.h"
+#include "memory/allocation.inline.hpp"
+#include "mutex_bsd.inline.hpp"
+#include "nativeInst_zero.hpp"
+#include "os_share_bsd.hpp"
+#include "prims/jniFastGetField.hpp"
+#include "prims/jvm.h"
+#include "prims/jvm_misc.hpp"
+#include "runtime/arguments.hpp"
+#include "runtime/extendedPC.hpp"
+#include "runtime/frame.inline.hpp"
+#include "runtime/interfaceSupport.hpp"
+#include "runtime/java.hpp"
+#include "runtime/javaCalls.hpp"
+#include "runtime/mutexLocker.hpp"
+#include "runtime/osThread.hpp"
+#include "runtime/sharedRuntime.hpp"
+#include "runtime/stubRoutines.hpp"
+#include "runtime/timer.hpp"
+#include "thread_bsd.inline.hpp"
+#include "utilities/events.hpp"
+#include "utilities/vmError.hpp"
+#ifdef COMPILER1
+#include "c1/c1_Runtime1.hpp"
+#endif
+#ifdef COMPILER2
+#include "opto/runtime.hpp"
+#endif
+
+address os::current_stack_pointer() {
+ address dummy = (address) &dummy;
+ return dummy;
+}
+
+frame os::get_sender_for_C_frame(frame* fr) {
+ ShouldNotCallThis();
+}
+
+frame os::current_frame() {
+ // The only thing that calls this is the stack printing code in
+ // VMError::report:
+ // - Step 110 (printing stack bounds) uses the sp in the frame
+ // to determine the amount of free space on the stack. We
+ // set the sp to a close approximation of the real value in
+ // order to allow this step to complete.
+ // - Step 120 (printing native stack) tries to walk the stack.
+ // The frame we create has a NULL pc, which is ignored as an
+ // invalid frame.
+ frame dummy = frame();
+ dummy.set_sp((intptr_t *) current_stack_pointer());
+ return dummy;
+}
+
+char* os::non_memory_address_word() {
+ // Must never look like an address returned by reserve_memory,
+ // even in its subfields (as defined by the CPU immediate fields,
+ // if the CPU splits constants across multiple instructions).
+#ifdef SPARC
+ // On SPARC, 0 != %hi(any real address), because there is no
+ // allocation in the first 1Kb of the virtual address space.
+ return (char *) 0;
+#else
+ // This is the value for x86; works pretty well for PPC too.
+ return (char *) -1;
+#endif // SPARC
+}
+
+void os::initialize_thread() {
+ // Nothing to do.
+}
+
+address os::Bsd::ucontext_get_pc(ucontext_t* uc) {
+ ShouldNotCallThis();
+}
+
+ExtendedPC os::fetch_frame_from_context(void* ucVoid,
+ intptr_t** ret_sp,
+ intptr_t** ret_fp) {
+ ShouldNotCallThis();
+}
+
+frame os::fetch_frame_from_context(void* ucVoid) {
+ ShouldNotCallThis();
+}
+
+extern "C" JNIEXPORT int
+JVM_handle_bsd_signal(int sig,
+ siginfo_t* info,
+ void* ucVoid,
+ int abort_if_unrecognized) {
+ ucontext_t* uc = (ucontext_t*) ucVoid;
+
+ Thread* t = ThreadLocalStorage::get_thread_slow();
+
+ SignalHandlerMark shm(t);
+
+ // Note: it's not uncommon that JNI code uses signal/sigset to
+ // install then restore certain signal handler (e.g. to temporarily
+ // block SIGPIPE, or have a SIGILL handler when detecting CPU
+ // type). When that happens, JVM_handle_bsd_signal() might be
+ // invoked with junk info/ucVoid. To avoid unnecessary crash when
+ // libjsig is not preloaded, try handle signals that do not require
+ // siginfo/ucontext first.
+
+ if (sig == SIGPIPE || sig == SIGXFSZ) {
+ // allow chained handler to go first
+ if (os::Bsd::chained_handler(sig, info, ucVoid)) {
+ return true;
+ } else {
+ if (PrintMiscellaneous && (WizardMode || Verbose)) {
+ char buf[64];
+ warning("Ignoring %s - see bugs 4229104 or 646499219",
+ os::exception_name(sig, buf, sizeof(buf)));
+ }
+ return true;
+ }
+ }
+
+ JavaThread* thread = NULL;
+ VMThread* vmthread = NULL;
+ if (os::Bsd::signal_handlers_are_installed) {
+ if (t != NULL ){
+ if(t->is_Java_thread()) {
+ thread = (JavaThread*)t;
+ }
+ else if(t->is_VM_thread()){
+ vmthread = (VMThread *)t;
+ }
+ }
+ }
+
+ if (info != NULL && thread != NULL) {
+ // Handle ALL stack overflow variations here
+ if (sig == SIGSEGV) {
+ address addr = (address) info->si_addr;
+
+ // check if fault address is within thread stack
+ if (addr < thread->stack_base() &&
+ addr >= thread->stack_base() - thread->stack_size()) {
+ // stack overflow
+ if (thread->in_stack_yellow_zone(addr)) {
+ thread->disable_stack_yellow_zone();
+ ShouldNotCallThis();
+ }
+ else if (thread->in_stack_red_zone(addr)) {
+ thread->disable_stack_red_zone();
+ ShouldNotCallThis();
+ }
+#ifndef _ALLBSD_SOURCE
+ else {
+ // Accessing stack address below sp may cause SEGV if
+ // current thread has MAP_GROWSDOWN stack. This should
+ // only happen when current thread was created by user
+ // code with MAP_GROWSDOWN flag and then attached to VM.
+ // See notes in os_bsd.cpp.
+ if (thread->osthread()->expanding_stack() == 0) {
+ thread->osthread()->set_expanding_stack();
+ if (os::Bsd::manually_expand_stack(thread, addr)) {
+ thread->osthread()->clear_expanding_stack();
+ return true;
+ }
+ thread->osthread()->clear_expanding_stack();
+ }
+ else {
+ fatal("recursive segv. expanding stack.");
+ }
+ }
+#endif
+ }
+ }
+
+ /*if (thread->thread_state() == _thread_in_Java) {
+ ShouldNotCallThis();
+ }
+ else*/ if (thread->thread_state() == _thread_in_vm &&
+ sig == SIGBUS && thread->doing_unsafe_access()) {
+ ShouldNotCallThis();
+ }
+
+ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC
+ // kicks in and the heap gets shrunk before the field access.
+ /*if (sig == SIGSEGV || sig == SIGBUS) {
+ address addr = JNI_FastGetField::find_slowcase_pc(pc);
+ if (addr != (address)-1) {
+ stub = addr;
+ }
+ }*/
+
+ // Check to see if we caught the safepoint code in the process
+ // of write protecting the memory serialization page. It write
+ // enables the page immediately after protecting it so we can
+ // just return to retry the write.
+ if (sig == SIGSEGV &&
+ os::is_memory_serialize_page(thread, (address) info->si_addr)) {
+ // Block current thread until permission is restored.
+ os::block_on_serialize_page_trap();
+ return true;
+ }
+ }
+
+ // signal-chaining
+ if (os::Bsd::chained_handler(sig, info, ucVoid)) {
+ return true;
+ }
+
+ if (!abort_if_unrecognized) {
+ // caller wants another chance, so give it to him
+ return false;
+ }
+
+#ifndef PRODUCT
+ if (sig == SIGSEGV) {
+ fatal("\n#"
+ "\n# /--------------------\\"
+ "\n# | segmentation fault |"
+ "\n# \\---\\ /--------------/"
+ "\n# /"
+ "\n# [-] |\\_/| "
+ "\n# (+)=C |o o|__ "
+ "\n# | | =-*-=__\\ "
+ "\n# OOO c_c_(___)");
+ }
+#endif // !PRODUCT
+
+ const char *fmt = "caught unhandled signal %d";
+ char buf[64];
+
+ sprintf(buf, fmt, sig);
+ fatal(buf);
+}
+
+void os::Bsd::init_thread_fpu_state(void) {
+ // Nothing to do
+}
+
+#ifndef _ALLBSD_SOURCE
+int os::Bsd::get_fpu_control_word() {
+ ShouldNotCallThis();
+}
+
+void os::Bsd::set_fpu_control_word(int fpu) {
+ ShouldNotCallThis();
+}
+#endif
+
+bool os::is_allocatable(size_t bytes) {
+#ifdef _LP64
+ return true;
+#else
+ if (bytes < 2 * G) {
+ return true;
+ }
+
+ char* addr = reserve_memory(bytes, NULL);
+
+ if (addr != NULL) {
+ release_memory(addr, bytes);
+ }
+
+ return addr != NULL;
+#endif // _LP64
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// thread stack
+
+size_t os::Bsd::min_stack_allowed = 64 * K;
+
+bool os::Bsd::supports_variable_stack_size() {
+ return true;
+}
+
+size_t os::Bsd::default_stack_size(os::ThreadType thr_type) {
+#ifdef _LP64
+ size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
+#else
+ size_t s = (thr_type == os::compiler_thread ? 2 * M : 512 * K);
+#endif // _LP64
+ return s;
+}
+
+size_t os::Bsd::default_guard_size(os::ThreadType thr_type) {
+ // Only enable glibc guard pages for non-Java threads
+ // (Java threads have HotSpot guard pages)
+ return (thr_type == java_thread ? 0 : page_size());
+}
+
+static void current_stack_region(address *bottom, size_t *size) {
+ address stack_bottom;
+ address stack_top;
+ size_t stack_bytes;
+
+#ifdef __APPLE__
+ pthread_t self = pthread_self();
+ stack_top = (address) pthread_get_stackaddr_np(self);
+ stack_bytes = pthread_get_stacksize_np(self);
+ stack_bottom = stack_top - stack_bytes;
+#elif defined(__OpenBSD__)
+ stack_t ss;
+ int rslt = pthread_stackseg_np(pthread_self(), &ss);
+
+ if (rslt != 0)
+ fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt));
+
+ stack_top = (address) ss.ss_sp;
+ stack_bytes = ss.ss_size;
+ stack_bottom = stack_top - stack_bytes;
+#elif defined(_ALLBSD_SOURCE)
+ pthread_attr_t attr;
+
+ int rslt = pthread_attr_init(&attr);
+
+ // JVM needs to know exact stack location, abort if it fails
+ if (rslt != 0)
+ fatal(err_msg("pthread_attr_init failed with err = %d", rslt));
+
+ rslt = pthread_attr_get_np(pthread_self(), &attr);
+
+ if (rslt != 0)
+ fatal(err_msg("pthread_attr_get_np failed with err = %d", rslt));
+
+ if (pthread_attr_getstackaddr(&attr, (void **) &stack_bottom) != 0 ||
+ pthread_attr_getstacksize(&attr, &stack_bytes) != 0) {
+ fatal("Can not locate current stack attributes!");
+ }
+
+ pthread_attr_destroy(&attr);
+
+ stack_top = stack_bottom + stack_bytes;
+#else /* Linux */
+ pthread_attr_t attr;
+ int res = pthread_getattr_np(pthread_self(), &attr);
+ if (res != 0) {
+ if (res == ENOMEM) {
+ vm_exit_out_of_memory(0, "pthread_getattr_np");
+ }
+ else {
+ fatal(err_msg("pthread_getattr_np failed with errno = %d", res));
+ }
+ }
+
+ res = pthread_attr_getstack(&attr, (void **) &stack_bottom, &stack_bytes);
+ if (res != 0) {
+ fatal(err_msg("pthread_attr_getstack failed with errno = %d", res));
+ }
+ stack_top = stack_bottom + stack_bytes;
+
+ // The block of memory returned by pthread_attr_getstack() includes
+ // guard pages where present. We need to trim these off.
+ size_t page_bytes = os::Bsd::page_size();
+ assert(((intptr_t) stack_bottom & (page_bytes - 1)) == 0, "unaligned stack");
+
+ size_t guard_bytes;
+ res = pthread_attr_getguardsize(&attr, &guard_bytes);
+ if (res != 0) {
+ fatal(err_msg("pthread_attr_getguardsize failed with errno = %d", res));
+ }
+ int guard_pages = align_size_up(guard_bytes, page_bytes) / page_bytes;
+ assert(guard_bytes == guard_pages * page_bytes, "unaligned guard");
+
+#ifdef IA64
+ // IA64 has two stacks sharing the same area of memory, a normal
+ // stack growing downwards and a register stack growing upwards.
+ // Guard pages, if present, are in the centre. This code splits
+ // the stack in two even without guard pages, though in theory
+ // there's nothing to stop us allocating more to the normal stack
+ // or more to the register stack if one or the other were found
+ // to grow faster.
+ int total_pages = align_size_down(stack_bytes, page_bytes) / page_bytes;
+ stack_bottom += (total_pages - guard_pages) / 2 * page_bytes;
+#endif // IA64
+
+ stack_bottom += guard_bytes;
+
+ pthread_attr_destroy(&attr);
+
+ // The initial thread has a growable stack, and the size reported
+ // by pthread_attr_getstack is the maximum size it could possibly
+ // be given what currently mapped. This can be huge, so we cap it.
+ if (os::Bsd::is_initial_thread()) {
+ stack_bytes = stack_top - stack_bottom;
+
+ if (stack_bytes > JavaThread::stack_size_at_create())
+ stack_bytes = JavaThread::stack_size_at_create();
+
+ stack_bottom = stack_top - stack_bytes;
+ }
+#endif
+
+ assert(os::current_stack_pointer() >= stack_bottom, "should do");
+ assert(os::current_stack_pointer() < stack_top, "should do");
+
+ *bottom = stack_bottom;
+ *size = stack_top - stack_bottom;
+}
+
+address os::current_stack_base() {
+ address bottom;
+ size_t size;
+ current_stack_region(&bottom, &size);
+ return bottom + size;
+}
+
+size_t os::current_stack_size() {
+ // stack size includes normal stack and HotSpot guard pages
+ address bottom;
+ size_t size;
+ current_stack_region(&bottom, &size);
+ return size;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// helper functions for fatal error handler
+
+void os::print_context(outputStream* st, void* context) {
+ ShouldNotCallThis();
+}
+
+void os::print_register_info(outputStream *st, void *context) {
+ ShouldNotCallThis();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Stubs for things that would be in bsd_zero.s if it existed.
+// You probably want to disassemble these monkeys to check they're ok.
+
+extern "C" {
+ int SpinPause() {
+ }
+
+ int SafeFetch32(int *adr, int errValue) {
+ int value = errValue;
+ value = *adr;
+ return value;
+ }
+ intptr_t SafeFetchN(intptr_t *adr, intptr_t errValue) {
+ intptr_t value = errValue;
+ value = *adr;
+ return value;
+ }
+
+ void _Copy_conjoint_jshorts_atomic(jshort* from, jshort* to, size_t count) {
+ if (from > to) {
+ jshort *end = from + count;
+ while (from < end)
+ *(to++) = *(from++);
+ }
+ else if (from < to) {
+ jshort *end = from;
+ from += count - 1;
+ to += count - 1;
+ while (from >= end)
+ *(to--) = *(from--);
+ }
+ }
+ void _Copy_conjoint_jints_atomic(jint* from, jint* to, size_t count) {
+ if (from > to) {
+ jint *end = from + count;
+ while (from < end)
+ *(to++) = *(from++);
+ }
+ else if (from < to) {
+ jint *end = from;
+ from += count - 1;
+ to += count - 1;
+ while (from >= end)
+ *(to--) = *(from--);
+ }
+ }
+ void _Copy_conjoint_jlongs_atomic(jlong* from, jlong* to, size_t count) {
+ if (from > to) {
+ jlong *end = from + count;
+ while (from < end)
+ os::atomic_copy64(from++, to++);
+ }
+ else if (from < to) {
+ jlong *end = from;
+ from += count - 1;
+ to += count - 1;
+ while (from >= end)
+ os::atomic_copy64(from--, to--);
+ }
+ }
+
+ void _Copy_arrayof_conjoint_bytes(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+ memmove(to, from, count);
+ }
+ void _Copy_arrayof_conjoint_jshorts(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+ memmove(to, from, count * 2);
+ }
+ void _Copy_arrayof_conjoint_jints(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+ memmove(to, from, count * 4);
+ }
+ void _Copy_arrayof_conjoint_jlongs(HeapWord* from,
+ HeapWord* to,
+ size_t count) {
+ memmove(to, from, count * 8);
+ }
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Implementations of atomic operations not supported by processors.
+// -- http://gcc.gnu.org/onlinedocs/gcc-4.2.1/gcc/Atomic-Builtins.html
+
+#ifndef _LP64
+extern "C" {
+ long long unsigned int __sync_val_compare_and_swap_8(
+ volatile void *ptr,
+ long long unsigned int oldval,
+ long long unsigned int newval) {
+ ShouldNotCallThis();
+ }
+};
+#endif // !_LP64
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp
new file mode 100644
index 0000000..873e598
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.hpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
+
+ static void setup_fpu() {}
+
+ static bool is_allocatable(size_t bytes);
+
+ // Used to register dynamic code cache area with the OS
+ // Note: Currently only used in 64 bit Windows implementations
+ static bool register_code_area(char *low, char *high) { return true; }
+
+ // Atomically copy 64 bits of data
+ static void atomic_copy64(volatile void *src, volatile void *dst) {
+#if defined(PPC) && !defined(_LP64)
+ double tmp;
+ asm volatile ("lfd %0, 0(%1)\n"
+ "stfd %0, 0(%2)\n"
+ : "=f"(tmp)
+ : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+ double tmp;
+ asm volatile ("ld %0, 0(%1)\n"
+ "std %0, 0(%2)\n"
+ : "=r"(tmp)
+ : "a"(src), "a"(dst));
+#else
+ *(jlong *) dst = *(jlong *) src;
+#endif
+ }
+
+#endif // OS_CPU_BSD_ZERO_VM_OS_BSD_ZERO_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp b/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp
new file mode 100644
index 0000000..7c4f786
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/prefetch_bsd_zero.inline.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
+#define OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
+
+#include "runtime/prefetch.hpp"
+
+inline void Prefetch::read(void* loc, intx interval) {
+}
+
+inline void Prefetch::write(void* loc, intx interval) {
+}
+
+#endif // OS_CPU_BSD_ZERO_VM_PREFETCH_BSD_ZERO_INLINE_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp
new file mode 100644
index 0000000..cd6e0f7
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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 "runtime/threadLocalStorage.hpp"
+#include "thread_bsd.inline.hpp"
+
+void ThreadLocalStorage::generate_code_for_get_thread() {
+ // nothing to do
+}
+
+void ThreadLocalStorage::pd_init() {
+ // nothing to do
+}
+
+void ThreadLocalStorage::pd_set_thread(Thread* thread) {
+ os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
+}
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp b/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp
new file mode 100644
index 0000000..0360b58
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/threadLS_bsd_zero.hpp
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2003, 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 OS_CPU_BSD_ZERO_VM_THREADLS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_THREADLS_BSD_ZERO_HPP
+
+// Processor dependent parts of ThreadLocalStorage
+
+ public:
+ static Thread* thread() {
+ return (Thread*) os::thread_local_storage_at(thread_index());
+ }
+
+#endif // OS_CPU_BSD_ZERO_VM_THREADLS_BSD_ZERO_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp
new file mode 100644
index 0000000..eb0abaa
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.cpp
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute 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 "runtime/frame.inline.hpp"
+#include "thread_bsd.inline.hpp"
+
+void JavaThread::cache_global_variables() {
+ // nothing to do
+}
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp b/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp
new file mode 100644
index 0000000..12971a6
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/thread_bsd_zero.hpp
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
+
+ private:
+ ZeroStack _zero_stack;
+ ZeroFrame* _top_zero_frame;
+
+ void pd_initialize() {
+ _top_zero_frame = NULL;
+ }
+
+ public:
+ ZeroStack *zero_stack() {
+ return &_zero_stack;
+ }
+
+ public:
+ ZeroFrame *top_zero_frame() {
+ return _top_zero_frame;
+ }
+ void push_zero_frame(ZeroFrame *frame) {
+ *(ZeroFrame **) frame = _top_zero_frame;
+ _top_zero_frame = frame;
+ }
+ void pop_zero_frame() {
+ zero_stack()->set_sp((intptr_t *) _top_zero_frame + 1);
+ _top_zero_frame = *(ZeroFrame **) _top_zero_frame;
+ }
+
+ public:
+ static ByteSize zero_stack_offset() {
+ return byte_offset_of(JavaThread, _zero_stack);
+ }
+ static ByteSize top_zero_frame_offset() {
+ return byte_offset_of(JavaThread, _top_zero_frame);
+ }
+
+ public:
+ void record_base_of_stack_pointer() {
+ assert(top_zero_frame() == NULL, "junk on stack prior to Java call");
+ }
+ void set_base_of_stack_pointer(intptr_t* base_sp) {
+ assert(base_sp == NULL, "should be");
+ assert(top_zero_frame() == NULL, "junk on stack after Java call");
+ }
+
+ public:
+ void set_last_Java_frame() {
+ set_last_Java_frame(top_zero_frame(), zero_stack()->sp());
+ }
+ void reset_last_Java_frame() {
+ frame_anchor()->zap();
+ }
+ void set_last_Java_frame(ZeroFrame* fp, intptr_t* sp) {
+ frame_anchor()->set(sp, NULL, fp);
+ }
+
+ public:
+ ZeroFrame* last_Java_fp() {
+ return frame_anchor()->last_Java_fp();
+ }
+
+ private:
+ frame pd_last_frame() {
+ assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
+ return frame(last_Java_fp(), last_Java_sp());
+ }
+
+ public:
+ static ByteSize last_Java_fp_offset() {
+ return byte_offset_of(JavaThread, _anchor) +
+ JavaFrameAnchor::last_Java_fp_offset();
+ }
+
+ public:
+ // Check for pending suspend requests and pending asynchronous
+ // exceptions. There are separate accessors for these, but
+ // _suspend_flags is volatile so using them would be unsafe.
+ bool has_special_condition_for_native_trans() {
+ return _suspend_flags != 0;
+ }
+
+ public:
+ bool pd_get_top_frame_for_signal_handler(frame* fr_addr,
+ void* ucontext,
+ bool isInJava) {
+ ShouldNotCallThis();
+ }
+
+ // These routines are only used on cpu architectures that
+ // have separate register stacks (Itanium).
+ static bool register_stack_overflow() { return false; }
+ static void enable_register_stack_guard() {}
+ static void disable_register_stack_guard() {}
+
+#endif // OS_CPU_BSD_ZERO_VM_THREAD_BSD_ZERO_HPP
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp b/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp
new file mode 100644
index 0000000..17165cc
--- /dev/null
+++ b/hotspot/src/os_cpu/bsd_zero/vm/vmStructs_bsd_zero.hpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
+
+// These are the OS and CPU-specific fields, types and integer
+// constants required by the Serviceability Agent. This file is
+// referenced by vmStructs.cpp.
+
+#define VM_STRUCTS_OS_CPU(nonstatic_field, static_field, unchecked_nonstatic_field, volatile_nonstatic_field, nonproduct_nonstatic_field, c2_nonstatic_field, unchecked_c1_static_field, unchecked_c2_static_field, last_entry) \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+
+#define VM_TYPES_OS_CPU(declare_type, declare_toplevel_type, declare_oop_type, declare_integer_type, declare_unsigned_integer_type, declare_c1_toplevel_type, declare_c2_type, declare_c2_toplevel_type, last_entry) \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+#define VM_INT_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+#define VM_LONG_CONSTANTS_OS_CPU(declare_constant, declare_preprocessor_constant, declare_c1_constant, declare_c2_constant, declare_c2_preprocessor_constant, last_entry) \
+ /* This must be the last entry, and must be present */ \
+ last_entry()
+
+#endif // OS_CPU_BSD_ZERO_VM_VMSTRUCTS_BSD_ZERO_HPP
diff --git a/hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp
similarity index 100%
copy from hotspot/src/os_cpu/linux_zero/vm/vm_version_linux_zero.cpp
copy to hotspot/src/os_cpu/bsd_zero/vm/vm_version_bsd_zero.cpp
diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad
index c179d08..3d8283d 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad
+++ b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_32.ad
@@ -154,7 +154,7 @@ void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return 5;
+ return MachNode::size(ra_);
}
%}
diff --git a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad
index e19ea02..0127df5 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad
+++ b/hotspot/src/os_cpu/linux_x86/vm/linux_x86_64.ad
@@ -167,7 +167,8 @@ void MachBreakpointNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const {
}
uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const {
- return 5;
+ // distance could be far and requires load and call through register
+ return MachNode::size(ra_);
}
%}
diff --git a/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp b/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
index f12bec9..d952cb7 100644
--- a/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
+++ b/hotspot/src/os_cpu/linux_zero/vm/globals_linux_zero.hpp
@@ -38,7 +38,6 @@ define_pd_global(intx, VMThreadStackSize, 1024);
#else
define_pd_global(intx, VMThreadStackSize, 512);
#endif // _LP64
-define_pd_global(intx, SurvivorRatio, 8);
define_pd_global(intx, CompilerThreadStackSize, 0);
define_pd_global(uintx, JVMInvokeMethodSlack, 8192);
diff --git a/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp b/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp
index 31f86cf..d53de80 100644
--- a/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/vm_version_solaris_sparc.cpp
@@ -114,6 +114,11 @@ int VM_Version::platform_features(int features) {
#endif
if (av & AV_SPARC_VIS3) features |= vis3_instructions_m;
+#ifndef AV_SPARC_CBCOND
+#define AV_SPARC_CBCOND 0x10000000 /* compare and branch instrs supported */
+#endif
+ if (av & AV_SPARC_CBCOND) features |= cbcond_instructions_m;
+
} else {
// getisax(2) failed, use the old legacy code.
#ifndef PRODUCT
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad
index 3e6930a..0883527 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_32.ad
@@ -161,7 +161,7 @@ void MachBreakpointNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
uint MachBreakpointNode::size(PhaseRegAlloc *ra_) const {
- return 5;
+ return MachNode::size(ra_);
}
%}
diff --git a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad
index 3b9c366..32a77c5 100644
--- a/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad
+++ b/hotspot/src/os_cpu/solaris_x86/vm/solaris_x86_64.ad
@@ -180,7 +180,8 @@ void MachBreakpointNode::emit(CodeBuffer& cbuf, PhaseRegAlloc* ra_) const
uint MachBreakpointNode::size(PhaseRegAlloc* ra_) const
{
- return 5;
+ // distance could be far and requires load and call through register
+ return MachNode::size(ra_);
}
%}
diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java
index c72d777..354b32a 100644
--- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java
+++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/CallSite.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -37,6 +37,8 @@ public class CallSite {
private int receiver_count;
private String reason;
private List<CallSite> calls;
+ private int endNodes;
+ private double timeStamp;
CallSite() {
}
@@ -93,18 +95,22 @@ public class CallSite {
emit(stream, indent);
String m = getMethod().getHolder().replace('/', '.') + "::" + getMethod().getName();
if (getReason() == null) {
- stream.println(" @ " + getBci() + " " + m + " (" + getMethod().getBytes() + " bytes)");
+ stream.print(" @ " + getBci() + " " + m + " (" + getMethod().getBytes() + " bytes)");
} else {
if (isCompat()) {
- stream.println(" @ " + getBci() + " " + m + " " + getReason());
+ stream.print(" @ " + getBci() + " " + m + " " + getReason());
} else {
- stream.println("- @ " + getBci() + " " + m +
+ stream.print("- @ " + getBci() + " " + m +
" (" + getMethod().getBytes() + " bytes) " + getReason());
}
}
+ if (getEndNodes() > 0) {
+ stream.printf(" (end time: %6.4f nodes: %d)", getTimeStamp(), getEndNodes());
+ }
+ stream.println("");
if (getReceiver() != null) {
- emit(stream, indent + 3);
+ emit(stream, indent + 4);
// stream.println("type profile " + method.holder + " -> " + receiver + " (" +
// receiver_count + "/" + count + "," + (receiver_count * 100 / count) + "%)");
stream.println("type profile " + getMethod().getHolder() + " -> " + getReceiver() + " (" +
@@ -180,4 +186,21 @@ public class CallSite {
public static void setCompat(boolean aCompat) {
compat = aCompat;
}
+
+ void setEndNodes(int n) {
+ endNodes = n;
+ }
+
+ public int getEndNodes() {
+ return endNodes;
+ }
+
+ void setTimeStamp(double time) {
+ timeStamp = time;
+ }
+
+ public double getTimeStamp() {
+ return timeStamp;
+ }
+
}
diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java
index 5705888..12689b0 100644
--- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java
+++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogCompilation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -126,7 +126,6 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons
maxattempts = Math.max(maxattempts,c.getAttempts());
elapsed += c.getElapsedTime();
for (Phase phase : c.getPhases()) {
- out.printf("\t%s %6.4f\n", phase.getName(), phase.getElapsedTime());
Double v = phaseTime.get(phase.getName());
if (v == null) {
v = Double.valueOf(0.0);
@@ -138,6 +137,7 @@ public class LogCompilation extends DefaultHandler implements ErrorHandler, Cons
v2 = Integer.valueOf(0);
}
phaseNodes.put(phase.getName(), Integer.valueOf(v2.intValue() + phase.getNodes()));
+ out.printf("\t%s %6.4f %d %d\n", phase.getName(), phase.getElapsedTime(), phase.getStartNodes(), phase.getNodes());
}
} else if (e instanceof MakeNotEntrantEvent) {
MakeNotEntrantEvent mne = (MakeNotEntrantEvent) e;
diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
index 265e92e..d864db0 100644
--- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
+++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/LogParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -365,7 +365,7 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
if (currentTrap != null) {
currentTrap.addJVMS(atts.getValue("method"), Integer.parseInt(atts.getValue("bci")));
} else {
- System.err.println("Missing uncommon_trap for jvms");
+ // Ignore <eliminate_allocation type='667'> and <eliminate_lock lock='1'>
}
} else if (qname.equals("nmethod")) {
String id = makeId(atts);
@@ -391,6 +391,11 @@ public class LogParser extends DefaultHandler implements ErrorHandler, Constants
throw new InternalError("call site and parse don't match");
}
}
+ } else if (qname.equals("parse_done")) {
+ CallSite call = scopes.pop();
+ call.setEndNodes(Integer.parseInt(search(atts, "nodes")));
+ call.setTimeStamp(Double.parseDouble(search(atts, "stamp")));
+ scopes.push(call);
}
}
diff --git a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java
index 4dc50ca..b448f45 100644
--- a/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java
+++ b/hotspot/src/share/tools/LogCompilation/src/com/sun/hotspot/tools/compiler/Phase.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 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
@@ -37,7 +37,7 @@ public class Phase extends BasicLogEvent {
}
int getNodes() {
- return getStartNodes();
+ return getEndNodes() - getStartNodes();
}
void setEndNodes(int n) {
diff --git a/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java b/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java
index 21c951d..4a96981 100644
--- a/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java
+++ b/hotspot/src/share/tools/ProjectCreator/WinGammaPlatformVC10.java
@@ -482,7 +482,7 @@ class CompilerInterfaceVC10 extends CompilerInterface {
"/export:JVM_GetThreadStateNames "+
"/export:JVM_GetThreadStateValues "+
"/export:JVM_InitAgentProperties");
- addAttr(rv, "AdditionalDependencies", "kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;Wsock32.lib;winmm.lib");
+ addAttr(rv, "AdditionalDependencies", "kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;Wsock32.lib;winmm.lib;psapi.lib");
addAttr(rv, "OutputFile", outDll);
addAttr(rv, "SuppressStartupBanner", "true");
addAttr(rv, "ModuleDefinitionFile", outDir+Util.sep+"vm.def");
diff --git a/hotspot/src/share/vm/adlc/adlc.hpp b/hotspot/src/share/vm/adlc/adlc.hpp
index 0ed4b77..8d48ed6 100644
--- a/hotspot/src/share/vm/adlc/adlc.hpp
+++ b/hotspot/src/share/vm/adlc/adlc.hpp
@@ -67,9 +67,9 @@ typedef unsigned int uintptr_t;
#endif
#endif // _WIN32
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
#include <inttypes.h>
-#endif // LINUX
+#endif // LINUX || _ALLBSD_SOURCE
// Macros
#define uint32 unsigned int
diff --git a/hotspot/src/share/vm/adlc/adlparse.cpp b/hotspot/src/share/vm/adlc/adlparse.cpp
index c5381df..a730a0a 100644
--- a/hotspot/src/share/vm/adlc/adlparse.cpp
+++ b/hotspot/src/share/vm/adlc/adlparse.cpp
@@ -126,9 +126,6 @@ void ADLParser::parse() {
if (_globalNames[AttributeForm::_ins_cost] == NULL) {
parse_err(SEMERR, "Did not declare 'ins_cost' attribute");
}
- if (_globalNames[AttributeForm::_ins_pc_relative] == NULL) {
- parse_err(SEMERR, "Did not declare 'ins_pc_relative' attribute");
- }
if (_globalNames[AttributeForm::_op_cost] == NULL) {
parse_err(SEMERR, "Did not declare 'op_cost' attribute");
}
diff --git a/hotspot/src/share/vm/adlc/archDesc.cpp b/hotspot/src/share/vm/adlc/archDesc.cpp
index e751b54..5b4c1fa 100644
--- a/hotspot/src/share/vm/adlc/archDesc.cpp
+++ b/hotspot/src/share/vm/adlc/archDesc.cpp
@@ -331,10 +331,18 @@ void ArchDesc::inspectInstructions() {
// Find result type for match
const char *result = instr->reduce_result();
+ if ( instr->is_ideal_branch() && instr->label_position() == -1 ||
+ !instr->is_ideal_branch() && instr->label_position() != -1) {
+ syntax_err(instr->_linenum, "%s: Only branches to a label are supported\n", rootOp);
+ }
+
Attribute *attr = instr->_attribs;
while (attr != NULL) {
if (strcmp(attr->_ident,"ins_short_branch") == 0 &&
attr->int_val(*this) != 0) {
+ if (!instr->is_ideal_branch() || instr->label_position() == -1) {
+ syntax_err(instr->_linenum, "%s: Only short branch to a label is supported\n", rootOp);
+ }
instr->set_short_branch(true);
} else if (strcmp(attr->_ident,"ins_alignment") == 0 &&
attr->int_val(*this) != 0) {
diff --git a/hotspot/src/share/vm/adlc/formssel.cpp b/hotspot/src/share/vm/adlc/formssel.cpp
index c659cdb..d3817ed 100644
--- a/hotspot/src/share/vm/adlc/formssel.cpp
+++ b/hotspot/src/share/vm/adlc/formssel.cpp
@@ -291,15 +291,6 @@ int InstructForm::is_tls_instruction() const {
}
-// Return 'true' if this instruction matches an ideal 'Copy*' node
-bool InstructForm::is_ideal_unlock() const {
- return _matrule ? _matrule->is_ideal_unlock() : false;
-}
-
-bool InstructForm::is_ideal_call_leaf() const {
- return _matrule ? _matrule->is_ideal_call_leaf() : false;
-}
-
// Return 'true' if this instruction matches an ideal 'If' node
bool InstructForm::is_ideal_if() const {
if( _matrule == NULL ) return false;
@@ -349,12 +340,11 @@ bool InstructForm::is_ideal_jump() const {
return _matrule->is_ideal_jump();
}
-// Return 'true' if instruction matches ideal 'If' | 'Goto' |
-// 'CountedLoopEnd' | 'Jump'
+// Return 'true' if instruction matches ideal 'If' | 'Goto' | 'CountedLoopEnd'
bool InstructForm::is_ideal_branch() const {
if( _matrule == NULL ) return false;
- return _matrule->is_ideal_if() || _matrule->is_ideal_goto() || _matrule->is_ideal_jump();
+ return _matrule->is_ideal_if() || _matrule->is_ideal_goto();
}
@@ -392,7 +382,7 @@ bool InstructForm::is_ideal_nop() const {
bool InstructForm::is_ideal_control() const {
if ( ! _matrule) return false;
- return is_ideal_return() || is_ideal_branch() || is_ideal_halt();
+ return is_ideal_return() || is_ideal_branch() || _matrule->is_ideal_jump() || is_ideal_halt();
}
// Return 'true' if this instruction matches an ideal 'Call' node
@@ -633,6 +623,8 @@ bool InstructForm::is_wide_memory_kill(FormDict &globals) const {
if( strcmp(_matrule->_opType,"MemBarRelease") == 0 ) return true;
if( strcmp(_matrule->_opType,"MemBarAcquire") == 0 ) return true;
+ if( strcmp(_matrule->_opType,"MemBarReleaseLock") == 0 ) return true;
+ if( strcmp(_matrule->_opType,"MemBarAcquireLock") == 0 ) return true;
return false;
}
@@ -1094,6 +1086,9 @@ const char *InstructForm::mach_base_class(FormDict &globals) const {
else if (is_ideal_if()) {
return "MachIfNode";
}
+ else if (is_ideal_goto()) {
+ return "MachGotoNode";
+ }
else if (is_ideal_fastlock()) {
return "MachFastLockNode";
}
@@ -1185,6 +1180,34 @@ bool InstructForm::check_branch_variant(ArchDesc &AD, InstructForm *short_branch
strcmp(reduce_result(), short_branch->reduce_result()) == 0 &&
_matrule->equivalent(AD.globalNames(), short_branch->_matrule)) {
// The instructions are equivalent.
+
+ // Now verify that both instructions have the same parameters and
+ // the same effects. Both branch forms should have the same inputs
+ // and resulting projections to correctly replace a long branch node
+ // with corresponding short branch node during code generation.
+
+ bool different = false;
+ if (short_branch->_components.count() != _components.count()) {
+ different = true;
+ } else if (_components.count() > 0) {
+ short_branch->_components.reset();
+ _components.reset();
+ Component *comp;
+ while ((comp = _components.iter()) != NULL) {
+ Component *short_comp = short_branch->_components.iter();
+ if (short_comp == NULL ||
+ short_comp->_type != comp->_type ||
+ short_comp->_usedef != comp->_usedef) {
+ different = true;
+ break;
+ }
+ }
+ if (short_branch->_components.iter() != NULL)
+ different = true;
+ }
+ if (different) {
+ globalAD->syntax_err(short_branch->_linenum, "Instruction %s and its short form %s have different parameters\n", _ident, short_branch->_ident);
+ }
if (AD._short_branch_debug) {
fprintf(stderr, "Instruction %s has short form %s\n", _ident, short_branch->_ident);
}
@@ -1202,7 +1225,7 @@ void InstructForm::rep_var_format(FILE *fp, const char *rep_var) {
// Handle special constant table variables.
if (strcmp(rep_var, "constanttablebase") == 0) {
fprintf(fp, "char reg[128]; ra->dump_register(in(mach_constant_base_node_input()), reg);\n");
- fprintf(fp, "st->print(\"%%s\");\n");
+ fprintf(fp, " st->print(\"%%s\", reg);\n");
return;
}
if (strcmp(rep_var, "constantoffset") == 0) {
@@ -2706,7 +2729,6 @@ void ConstructRule::output(FILE *fp) {
int AttributeForm::_insId = 0; // start counter at 0
int AttributeForm::_opId = 0; // start counter at 0
const char* AttributeForm::_ins_cost = "ins_cost"; // required name
-const char* AttributeForm::_ins_pc_relative = "ins_pc_relative";
const char* AttributeForm::_op_cost = "op_cost"; // required name
AttributeForm::AttributeForm(char *attr, int type, char *attrdef)
@@ -3368,7 +3390,9 @@ int MatchNode::needs_ideal_memory_edge(FormDict &globals) const {
"ClearArray"
};
int cnt = sizeof(needs_ideal_memory_list)/sizeof(char*);
- if( strcmp(_opType,"PrefetchRead")==0 || strcmp(_opType,"PrefetchWrite")==0 )
+ if( strcmp(_opType,"PrefetchRead")==0 ||
+ strcmp(_opType,"PrefetchWrite")==0 ||
+ strcmp(_opType,"PrefetchAllocation")==0 )
return 1;
if( _lChild ) {
const char *opType = _lChild->_opType;
@@ -3623,7 +3647,27 @@ bool MatchNode::equivalent(FormDict &globals, MatchNode *mNode2) {
assert( mNode2->_opType, "Must have _opType");
const Form *form = globals[_opType];
const Form *form2 = globals[mNode2->_opType];
- return (form == form2);
+ if( form != form2 ) {
+ return false;
+ }
+
+ // Check that their children also match
+ if (_lChild ) {
+ if( !_lChild->equivalent(globals, mNode2->_lChild) )
+ return false;
+ } else if (mNode2->_lChild) {
+ return false; // I have NULL left child, mNode2 has non-NULL left child.
+ }
+
+ if (_rChild ) {
+ if( !_rChild->equivalent(globals, mNode2->_rChild) )
+ return false;
+ } else if (mNode2->_rChild) {
+ return false; // I have NULL right child, mNode2 has non-NULL right child.
+ }
+
+ // We've made it through the gauntlet.
+ return true;
}
//-------------------------- has_commutative_op -------------------------------
@@ -3909,19 +3953,6 @@ int MatchRule::is_expensive() const {
return 0;
}
-bool MatchRule::is_ideal_unlock() const {
- if( !_opType ) return false;
- return !strcmp(_opType,"Unlock") || !strcmp(_opType,"FastUnlock");
-}
-
-
-bool MatchRule::is_ideal_call_leaf() const {
- if( !_opType ) return false;
- return !strcmp(_opType,"CallLeaf") ||
- !strcmp(_opType,"CallLeafNoFP");
-}
-
-
bool MatchRule::is_ideal_if() const {
if( !_opType ) return false;
return
@@ -3941,6 +3972,8 @@ bool MatchRule::is_ideal_membar() const {
return
!strcmp(_opType,"MemBarAcquire" ) ||
!strcmp(_opType,"MemBarRelease" ) ||
+ !strcmp(_opType,"MemBarAcquireLock") ||
+ !strcmp(_opType,"MemBarReleaseLock") ||
!strcmp(_opType,"MemBarVolatile" ) ||
!strcmp(_opType,"MemBarCPUOrder" ) ;
}
diff --git a/hotspot/src/share/vm/adlc/formssel.hpp b/hotspot/src/share/vm/adlc/formssel.hpp
index 88ba702..50d7a70 100644
--- a/hotspot/src/share/vm/adlc/formssel.hpp
+++ b/hotspot/src/share/vm/adlc/formssel.hpp
@@ -145,8 +145,6 @@ public:
virtual int is_empty_encoding() const; // _size=0 and/or _insencode empty
virtual int is_tls_instruction() const; // tlsLoadP rule or ideal ThreadLocal
virtual int is_ideal_copy() const; // node matches ideal 'Copy*'
- virtual bool is_ideal_unlock() const; // node matches ideal 'Unlock'
- virtual bool is_ideal_call_leaf() const; // node matches ideal 'CallLeaf'
virtual bool is_ideal_if() const; // node matches ideal 'If'
virtual bool is_ideal_fastlock() const; // node matches 'FastLock'
virtual bool is_ideal_membar() const; // node matches ideal 'MemBarXXX'
@@ -857,7 +855,6 @@ public:
int type() { return id;} // return this object's "id"
static const char* _ins_cost; // "ins_cost"
- static const char* _ins_pc_relative; // "ins_pc_relative"
static const char* _op_cost; // "op_cost"
void dump(); // Debug printer
@@ -1002,8 +999,6 @@ public:
bool is_chain_rule(FormDict &globals) const;
int is_ideal_copy() const;
int is_expensive() const; // node matches ideal 'CosD'
- bool is_ideal_unlock() const;
- bool is_ideal_call_leaf() const;
bool is_ideal_if() const; // node matches ideal 'If'
bool is_ideal_fastlock() const; // node matches ideal 'FastLock'
bool is_ideal_jump() const; // node matches ideal 'Jump'
diff --git a/hotspot/src/share/vm/adlc/output_c.cpp b/hotspot/src/share/vm/adlc/output_c.cpp
index c0ef389..493c31e 100644
--- a/hotspot/src/share/vm/adlc/output_c.cpp
+++ b/hotspot/src/share/vm/adlc/output_c.cpp
@@ -3088,12 +3088,19 @@ void ArchDesc::defineClasses(FILE *fp) {
int label_position = instr->label_position();
if( label_position != -1 ) {
// Set the label
- fprintf(fp,"void %sNode::label_set( Label& label, uint block_num ) {\n", instr->_ident);
+ fprintf(fp,"void %sNode::label_set( Label* label, uint block_num ) {\n", instr->_ident);
fprintf(fp," labelOper* oper = (labelOper*)(opnd_array(%d));\n",
label_position );
- fprintf(fp," oper->_label = &label;\n");
+ fprintf(fp," oper->_label = label;\n");
fprintf(fp," oper->_block_num = block_num;\n");
fprintf(fp,"}\n");
+ // Save the label
+ fprintf(fp,"void %sNode::save_label( Label** label, uint* block_num ) {\n", instr->_ident);
+ fprintf(fp," labelOper* oper = (labelOper*)(opnd_array(%d));\n",
+ label_position );
+ fprintf(fp," *label = oper->_label;\n");
+ fprintf(fp," *block_num = oper->_block_num;\n");
+ fprintf(fp,"}\n");
}
}
diff --git a/hotspot/src/share/vm/adlc/output_h.cpp b/hotspot/src/share/vm/adlc/output_h.cpp
index 08e8ca6..9e609b8 100644
--- a/hotspot/src/share/vm/adlc/output_h.cpp
+++ b/hotspot/src/share/vm/adlc/output_h.cpp
@@ -1519,8 +1519,9 @@ void ArchDesc::declareClasses(FILE *fp) {
// Declare Node::methods that set operand Label's contents
int label_position = instr->label_position();
if( label_position != -1 ) {
- // Set the label, stored in labelOper::_branch_label
- fprintf(fp," virtual void label_set( Label& label, uint block_num );\n");
+ // Set/Save the label, stored in labelOper::_branch_label
+ fprintf(fp," virtual void label_set( Label* label, uint block_num );\n");
+ fprintf(fp," virtual void save_label( Label** label, uint* block_num );\n");
}
// If this instruction contains a methodOper
@@ -1536,16 +1537,16 @@ void ArchDesc::declareClasses(FILE *fp) {
// Each instruction attribute results in a virtual call of same name.
// The ins_cost is not handled here.
Attribute *attr = instr->_attribs;
- bool is_pc_relative = false;
+ bool avoid_back_to_back = false;
while (attr != NULL) {
if (strcmp(attr->_ident,"ins_cost") &&
- strcmp(attr->_ident,"ins_pc_relative")) {
+ strcmp(attr->_ident,"ins_short_branch")) {
fprintf(fp," int %s() const { return %s; }\n",
attr->_ident, attr->_val);
}
- // Check value for ins_pc_relative, and if it is true (1), set the flag
- if (!strcmp(attr->_ident,"ins_pc_relative") && attr->int_val(*this) != 0)
- is_pc_relative = true;
+ // Check value for ins_avoid_back_to_back, and if it is true (1), set the flag
+ if (!strcmp(attr->_ident,"ins_avoid_back_to_back") && attr->int_val(*this) != 0)
+ avoid_back_to_back = true;
attr = (Attribute *)attr->_next;
}
@@ -1657,20 +1658,10 @@ void ArchDesc::declareClasses(FILE *fp) {
fprintf(fp," _num_opnds = %d; _opnds = _opnd_array; ", instr->num_opnds());
bool node_flags_set = false;
- // flag: if this instruction matches an ideal 'Goto' node
- if ( instr->is_ideal_goto() ) {
- fprintf(fp,"init_flags(Flag_is_Goto");
- node_flags_set = true;
- }
-
// flag: if this instruction matches an ideal 'Copy*' node
if ( instr->is_ideal_copy() != 0 ) {
- if ( node_flags_set ) {
- fprintf(fp," | Flag_is_Copy");
- } else {
- fprintf(fp,"init_flags(Flag_is_Copy");
- node_flags_set = true;
- }
+ fprintf(fp,"init_flags(Flag_is_Copy");
+ node_flags_set = true;
}
// Is an instruction is a constant? If so, get its type
@@ -1688,16 +1679,6 @@ void ArchDesc::declareClasses(FILE *fp) {
}
}
- // flag: if instruction matches 'If' | 'Goto' | 'CountedLoopEnd | 'Jump'
- if ( instr->is_ideal_branch() ) {
- if ( node_flags_set ) {
- fprintf(fp," | Flag_is_Branch");
- } else {
- fprintf(fp,"init_flags(Flag_is_Branch");
- node_flags_set = true;
- }
- }
-
// flag: if this instruction is cisc alternate
if ( can_cisc_spill() && instr->is_cisc_alternate() ) {
if ( node_flags_set ) {
@@ -1708,22 +1689,22 @@ void ArchDesc::declareClasses(FILE *fp) {
}
}
- // flag: if this instruction is pc relative
- if ( is_pc_relative ) {
+ // flag: if this instruction has short branch form
+ if ( instr->has_short_branch_form() ) {
if ( node_flags_set ) {
- fprintf(fp," | Flag_is_pc_relative");
+ fprintf(fp," | Flag_may_be_short_branch");
} else {
- fprintf(fp,"init_flags(Flag_is_pc_relative");
+ fprintf(fp,"init_flags(Flag_may_be_short_branch");
node_flags_set = true;
}
}
- // flag: if this instruction has short branch form
- if ( instr->has_short_branch_form() ) {
+ // flag: if this instruction should not be generated back to back.
+ if ( avoid_back_to_back ) {
if ( node_flags_set ) {
- fprintf(fp," | Flag_may_be_short_branch");
+ fprintf(fp," | Flag_avoid_back_to_back");
} else {
- fprintf(fp,"init_flags(Flag_may_be_short_branch");
+ fprintf(fp,"init_flags(Flag_avoid_back_to_back");
node_flags_set = true;
}
}
@@ -1743,10 +1724,6 @@ void ArchDesc::declareClasses(FILE *fp) {
fprintf(fp,"); ");
}
- if (instr->is_ideal_unlock() || instr->is_ideal_call_leaf()) {
- fprintf(fp,"clear_flag(Flag_is_safepoint_node); ");
- }
-
fprintf(fp,"}\n");
// size_of, used by base class's clone to obtain the correct size.
diff --git a/hotspot/src/share/vm/c1/c1_Compilation.cpp b/hotspot/src/share/vm/c1/c1_Compilation.cpp
index 4521b0f..ab3930c 100644
--- a/hotspot/src/share/vm/c1/c1_Compilation.cpp
+++ b/hotspot/src/share/vm/c1/c1_Compilation.cpp
@@ -346,7 +346,6 @@ void Compilation::install_code(int frame_size) {
implicit_exception_table(),
compiler(),
_env->comp_level(),
- true,
has_unsafe_access()
);
}
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index 1a6ad3d..e103fbf 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -28,8 +28,10 @@
#include "c1/c1_Compilation.hpp"
#include "c1/c1_GraphBuilder.hpp"
#include "c1/c1_InstructionPrinter.hpp"
+#include "ci/ciCallSite.hpp"
#include "ci/ciField.hpp"
#include "ci/ciKlass.hpp"
+#include "ci/ciMethodHandle.hpp"
#include "compiler/compileBroker.hpp"
#include "interpreter/bytecode.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -1424,7 +1426,7 @@ void GraphBuilder::method_return(Value x) {
// See whether this is the first return; if so, store off some
// of the state for later examination
if (num_returns() == 0) {
- set_inline_cleanup_info(_block, _last, state());
+ set_inline_cleanup_info();
}
// The current bci() is in the wrong scope, so use the bci() of
@@ -1582,6 +1584,8 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
code = Bytecodes::_invokespecial;
}
+ bool is_invokedynamic = code == Bytecodes::_invokedynamic;
+
// NEEDS_CLEANUP
// I've added the target-is_loaded() test below but I don't really understand
// how klass->is_loaded() can be true and yet target->is_loaded() is false.
@@ -1693,26 +1697,31 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
&& target->will_link(klass, callee_holder, code)) {
// callee is known => check if we have static binding
assert(target->is_loaded(), "callee must be known");
- if (code == Bytecodes::_invokestatic
- || code == Bytecodes::_invokespecial
- || code == Bytecodes::_invokevirtual && target->is_final_method()
- ) {
- // static binding => check if callee is ok
- ciMethod* inline_target = (cha_monomorphic_target != NULL)
- ? cha_monomorphic_target
- : target;
- bool res = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL));
+ if (code == Bytecodes::_invokestatic ||
+ code == Bytecodes::_invokespecial ||
+ 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_invoke()) {
+ // method handle invokes
+ success = !is_invokedynamic ? for_method_handle_inline(target) : for_invokedynamic_inline(target);
+ }
+ if (!success) {
+ // static binding => check if callee is ok
+ success = try_inline(inline_target, (cha_monomorphic_target != NULL) || (exact_target != NULL));
+ }
CHECK_BAILOUT();
#ifndef PRODUCT
// printing
- if (PrintInlining && !res) {
+ if (PrintInlining && !success) {
// if it was successfully inlined, then it was already printed.
- print_inline_result(inline_target, res);
+ print_inline_result(inline_target, success);
}
#endif
clear_inline_bailout();
- if (res) {
+ if (success) {
// Register dependence if JVMTI has either breakpoint
// setting or hotswapping of methods capabilities since they may
// cause deoptimization.
@@ -1740,7 +1749,6 @@ void GraphBuilder::invoke(Bytecodes::Code code) {
code == Bytecodes::_invokespecial ||
code == Bytecodes::_invokevirtual ||
code == Bytecodes::_invokeinterface;
- bool is_invokedynamic = code == Bytecodes::_invokedynamic;
ValueType* result_type = as_ValueType(target->return_type());
// We require the debug info to be the "state before" because
@@ -3033,9 +3041,12 @@ bool GraphBuilder::try_inline(ciMethod* callee, bool holder_known) {
if (callee->should_exclude()) {
// callee is excluded
INLINE_BAILOUT("excluded by CompilerOracle")
+ } else if (callee->should_not_inline()) {
+ // callee is excluded
+ INLINE_BAILOUT("disallowed by CompilerOracle")
} else if (!callee->can_be_compiled()) {
// callee is not compilable (prob. has breakpoints)
- INLINE_BAILOUT("not compilable")
+ INLINE_BAILOUT("not compilable (disabled)")
} else if (callee->intrinsic_id() != vmIntrinsics::_none && try_inline_intrinsics(callee)) {
// intrinsics can be native or not
return true;
@@ -3394,7 +3405,7 @@ void GraphBuilder::fill_sync_handler(Value lock, BlockBegin* sync_handler, bool
}
-bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
+bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known, BlockBegin* cont_block) {
assert(!callee->is_native(), "callee must not be native");
if (CompilationPolicy::policy()->should_not_inline(compilation()->env(), callee)) {
INLINE_BAILOUT("inlining prohibited by policy");
@@ -3410,24 +3421,6 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
// Proper inlining of methods with jsrs requires a little more work.
if (callee->has_jsrs() ) INLINE_BAILOUT("jsrs not handled properly by inliner yet");
- // now perform tests that are based on flag settings
- if (inline_level() > MaxInlineLevel ) INLINE_BAILOUT("too-deep inlining");
- if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("too-deep recursive inlining");
- if (callee->code_size() > max_inline_size() ) INLINE_BAILOUT("callee is too large");
-
- // don't inline throwable methods unless the inlining tree is rooted in a throwable class
- if (callee->name() == ciSymbol::object_initializer_name() &&
- callee->holder()->is_subclass_of(ciEnv::current()->Throwable_klass())) {
- // Throwable constructor call
- IRScope* top = scope();
- while (top->caller() != NULL) {
- top = top->caller();
- }
- if (!top->method()->holder()->is_subclass_of(ciEnv::current()->Throwable_klass())) {
- INLINE_BAILOUT("don't inline Throwable constructors");
- }
- }
-
// When SSE2 is used on intel, then no special handling is needed
// for strictfp because the enum-constant is fixed at compile time,
// the check for UseSSE2 is needed here
@@ -3435,13 +3428,36 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
INLINE_BAILOUT("caller and callee have different strict fp requirements");
}
- if (compilation()->env()->num_inlined_bytecodes() > DesiredMethodLimit) {
- INLINE_BAILOUT("total inlining greater than DesiredMethodLimit");
- }
-
if (is_profiling() && !callee->ensure_method_data()) {
INLINE_BAILOUT("mdo allocation failed");
}
+
+ // now perform tests that are based on flag settings
+ if (callee->should_inline()) {
+ // ignore heuristic controls on inlining
+ } else {
+ if (inline_level() > MaxInlineLevel ) INLINE_BAILOUT("too-deep inlining");
+ if (recursive_inline_level(callee) > MaxRecursiveInlineLevel) INLINE_BAILOUT("too-deep recursive inlining");
+ if (callee->code_size_for_inlining() > max_inline_size() ) INLINE_BAILOUT("callee is too large");
+
+ // don't inline throwable methods unless the inlining tree is rooted in a throwable class
+ if (callee->name() == ciSymbol::object_initializer_name() &&
+ callee->holder()->is_subclass_of(ciEnv::current()->Throwable_klass())) {
+ // Throwable constructor call
+ IRScope* top = scope();
+ while (top->caller() != NULL) {
+ top = top->caller();
+ }
+ if (!top->method()->holder()->is_subclass_of(ciEnv::current()->Throwable_klass())) {
+ INLINE_BAILOUT("don't inline Throwable constructors");
+ }
+ }
+
+ if (compilation()->env()->num_inlined_bytecodes() > DesiredMethodLimit) {
+ INLINE_BAILOUT("total inlining greater than DesiredMethodLimit");
+ }
+ }
+
#ifndef PRODUCT
// printing
if (PrintInlining) {
@@ -3460,7 +3476,8 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
// Insert null check if necessary
Value recv = NULL;
- if (code() != Bytecodes::_invokestatic) {
+ if (code() != Bytecodes::_invokestatic &&
+ code() != Bytecodes::_invokedynamic) {
// note: null check must happen even if first instruction of callee does
// an implicit null check since the callee is in a different scope
// and we must make sure exception handling does the right thing
@@ -3488,7 +3505,7 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
// fall-through of control flow, all return instructions of the
// callee will need to be replaced by Goto's pointing to this
// continuation point.
- BlockBegin* cont = block_at(next_bci());
+ BlockBegin* cont = cont_block != NULL ? cont_block : block_at(next_bci());
bool continuation_existed = true;
if (cont == NULL) {
cont = new BlockBegin(next_bci());
@@ -3600,27 +3617,29 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
// block merging. This allows load elimination and CSE to take place
// across multiple callee scopes if they are relatively simple, and
// is currently essential to making inlining profitable.
- if ( num_returns() == 1
- && block() == orig_block
- && block() == inline_cleanup_block()) {
- _last = inline_cleanup_return_prev();
- _state = inline_cleanup_state();
- } else if (continuation_preds == cont->number_of_preds()) {
- // Inlining caused that the instructions after the invoke in the
- // caller are not reachable any more. So skip filling this block
- // with instructions!
- assert (cont == continuation(), "");
- assert(_last && _last->as_BlockEnd(), "");
- _skip_block = true;
- } else {
- // Resume parsing in continuation block unless it was already parsed.
- // Note that if we don't change _last here, iteration in
- // iterate_bytecodes_for_block will stop when we return.
- if (!continuation()->is_set(BlockBegin::was_visited_flag)) {
- // add continuation to work list instead of parsing it immediately
+ if (cont_block == NULL) {
+ if (num_returns() == 1
+ && block() == orig_block
+ && block() == inline_cleanup_block()) {
+ _last = inline_cleanup_return_prev();
+ _state = inline_cleanup_state();
+ } else if (continuation_preds == cont->number_of_preds()) {
+ // Inlining caused that the instructions after the invoke in the
+ // caller are not reachable any more. So skip filling this block
+ // with instructions!
+ assert(cont == continuation(), "");
assert(_last && _last->as_BlockEnd(), "");
- scope_data()->parent()->add_to_work_list(continuation());
_skip_block = true;
+ } else {
+ // Resume parsing in continuation block unless it was already parsed.
+ // Note that if we don't change _last here, iteration in
+ // iterate_bytecodes_for_block will stop when we return.
+ if (!continuation()->is_set(BlockBegin::was_visited_flag)) {
+ // add continuation to work list instead of parsing it immediately
+ assert(_last && _last->as_BlockEnd(), "");
+ scope_data()->parent()->add_to_work_list(continuation());
+ _skip_block = true;
+ }
}
}
@@ -3637,6 +3656,114 @@ bool GraphBuilder::try_inline_full(ciMethod* callee, bool holder_known) {
}
+bool GraphBuilder::for_method_handle_inline(ciMethod* callee) {
+ assert(!callee->is_static(), "change next line");
+ int index = state()->stack_size() - (callee->arg_size_no_receiver() + 1);
+ Value receiver = state()->stack_at(index);
+
+ if (receiver->type()->is_constant()) {
+ ciMethodHandle* method_handle = receiver->type()->as_ObjectType()->constant_value()->as_method_handle();
+
+ // Set the callee to have access to the class and signature in
+ // the MethodHandleCompiler.
+ method_handle->set_callee(callee);
+ method_handle->set_caller(method());
+
+ // Get an adapter for the MethodHandle.
+ ciMethod* method_handle_adapter = method_handle->get_method_handle_adapter();
+ if (method_handle_adapter != NULL) {
+ return try_inline(method_handle_adapter, /*holder_known=*/ true);
+ }
+ } else if (receiver->as_CheckCast()) {
+ // Match MethodHandle.selectAlternative idiom
+ Phi* phi = receiver->as_CheckCast()->obj()->as_Phi();
+
+ if (phi != NULL && phi->operand_count() == 2) {
+ // Get the two MethodHandle inputs from the Phi.
+ Value op1 = phi->operand_at(0);
+ Value op2 = phi->operand_at(1);
+ ciMethodHandle* mh1 = op1->type()->as_ObjectType()->constant_value()->as_method_handle();
+ ciMethodHandle* mh2 = op2->type()->as_ObjectType()->constant_value()->as_method_handle();
+
+ // Set the callee to have access to the class and signature in
+ // the MethodHandleCompiler.
+ mh1->set_callee(callee);
+ mh1->set_caller(method());
+ mh2->set_callee(callee);
+ mh2->set_caller(method());
+
+ // Get adapters for the MethodHandles.
+ ciMethod* mh1_adapter = mh1->get_method_handle_adapter();
+ ciMethod* mh2_adapter = mh2->get_method_handle_adapter();
+
+ if (mh1_adapter != NULL && mh2_adapter != NULL) {
+ set_inline_cleanup_info();
+
+ // Build the If guard
+ BlockBegin* one = new BlockBegin(next_bci());
+ BlockBegin* two = new BlockBegin(next_bci());
+ BlockBegin* end = new BlockBegin(next_bci());
+ Instruction* iff = append(new If(phi, If::eql, false, op1, one, two, NULL, false));
+ block()->set_end(iff->as_BlockEnd());
+
+ // Connect up the states
+ one->merge(block()->end()->state());
+ two->merge(block()->end()->state());
+
+ // Save the state for the second inlinee
+ ValueStack* state_before = copy_state_before();
+
+ // Parse first adapter
+ _last = _block = one;
+ if (!try_inline_full(mh1_adapter, /*holder_known=*/ true, end)) {
+ restore_inline_cleanup_info();
+ block()->clear_end(); // remove appended iff
+ return false;
+ }
+
+ // Parse second adapter
+ _last = _block = two;
+ _state = state_before;
+ if (!try_inline_full(mh2_adapter, /*holder_known=*/ true, end)) {
+ restore_inline_cleanup_info();
+ block()->clear_end(); // remove appended iff
+ return false;
+ }
+
+ connect_to_end(end);
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+
+bool GraphBuilder::for_invokedynamic_inline(ciMethod* callee) {
+ // Get the MethodHandle from the CallSite.
+ ciCallSite* call_site = stream()->get_call_site();
+ ciMethodHandle* method_handle = call_site->get_target();
+
+ // Set the callee to have access to the class and signature in the
+ // MethodHandleCompiler.
+ method_handle->set_callee(callee);
+ method_handle->set_caller(method());
+
+ // Get an adapter for the MethodHandle.
+ ciMethod* method_handle_adapter = method_handle->get_invokedynamic_adapter();
+ if (method_handle_adapter != NULL) {
+ if (try_inline(method_handle_adapter, /*holder_known=*/ true)) {
+ // Add a dependence for invalidation of the optimization.
+ if (!call_site->is_constant_call_site()) {
+ dependency_recorder()->assert_call_site_target_value(call_site, method_handle);
+ }
+ return true;
+ }
+ }
+ return false;
+}
+
+
void GraphBuilder::inline_bailout(const char* msg) {
assert(msg != NULL, "inline bailout msg must exist");
_inline_bailout_msg = msg;
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
index b41d947..8b8800e 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -315,9 +315,17 @@ class GraphBuilder VALUE_OBJ_CLASS_SPEC {
ValueStack* return_state) { scope_data()->set_inline_cleanup_info(block,
return_prev,
return_state); }
+ void set_inline_cleanup_info() {
+ set_inline_cleanup_info(_block, _last, _state);
+ }
BlockBegin* inline_cleanup_block() const { return scope_data()->inline_cleanup_block(); }
Instruction* inline_cleanup_return_prev() const { return scope_data()->inline_cleanup_return_prev(); }
ValueStack* inline_cleanup_state() const { return scope_data()->inline_cleanup_state(); }
+ void restore_inline_cleanup_info() {
+ _block = inline_cleanup_block();
+ _last = inline_cleanup_return_prev();
+ _state = inline_cleanup_state();
+ }
void incr_num_returns() { scope_data()->incr_num_returns(); }
int num_returns() const { return scope_data()->num_returns(); }
intx max_inline_size() const { return scope_data()->max_inline_size(); }
@@ -329,11 +337,15 @@ class GraphBuilder VALUE_OBJ_CLASS_SPEC {
void fill_sync_handler(Value lock, BlockBegin* sync_handler, bool default_handler = false);
// inliners
- bool try_inline(ciMethod* callee, bool holder_known);
+ bool try_inline( ciMethod* callee, bool holder_known);
bool try_inline_intrinsics(ciMethod* callee);
- bool try_inline_full (ciMethod* callee, bool holder_known);
+ bool try_inline_full( ciMethod* callee, bool holder_known, BlockBegin* cont_block = NULL);
bool try_inline_jsr(int jsr_dest_bci);
+ // JSR 292 support
+ bool for_method_handle_inline(ciMethod* callee);
+ bool for_invokedynamic_inline(ciMethod* callee);
+
// helpers
void inline_bailout(const char* msg);
BlockBegin* header_block(BlockBegin* entry, BlockBegin::Flag f, ValueStack* state);
diff --git a/hotspot/src/share/vm/c1/c1_Instruction.cpp b/hotspot/src/share/vm/c1/c1_Instruction.cpp
index 46857e1..c723193 100644
--- a/hotspot/src/share/vm/c1/c1_Instruction.cpp
+++ b/hotspot/src/share/vm/c1/c1_Instruction.cpp
@@ -514,28 +514,17 @@ Constant::CompareResult Constant::compare(Instruction::Condition cond, Value rig
void BlockBegin::set_end(BlockEnd* end) {
assert(end != NULL, "should not reset block end to NULL");
- BlockEnd* old_end = _end;
- if (end == old_end) {
+ if (end == _end) {
return;
}
- // Must make the predecessors/successors match up with the
- // BlockEnd's notion.
- int i, n;
- if (old_end != NULL) {
- // disconnect from the old end
- old_end->set_begin(NULL);
+ clear_end();
- // disconnect this block from it's current successors
- for (i = 0; i < _successors.length(); i++) {
- _successors.at(i)->remove_predecessor(this);
- }
- }
+ // Set the new end
_end = end;
_successors.clear();
// Now reset successors list based on BlockEnd
- n = end->number_of_sux();
- for (i = 0; i < n; i++) {
+ for (int i = 0; i < end->number_of_sux(); i++) {
BlockBegin* sux = end->sux_at(i);
_successors.append(sux);
sux->_predecessors.append(this);
@@ -544,6 +533,22 @@ void BlockBegin::set_end(BlockEnd* end) {
}
+void BlockBegin::clear_end() {
+ // Must make the predecessors/successors match up with the
+ // BlockEnd's notion.
+ if (_end != NULL) {
+ // disconnect from the old end
+ _end->set_begin(NULL);
+
+ // disconnect this block from it's current successors
+ for (int i = 0; i < _successors.length(); i++) {
+ _successors.at(i)->remove_predecessor(this);
+ }
+ _end = NULL;
+ }
+}
+
+
void BlockBegin::disconnect_edge(BlockBegin* from, BlockBegin* to) {
// disconnect any edges between from and to
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/c1/c1_Instruction.hpp b/hotspot/src/share/vm/c1/c1_Instruction.hpp
index 719c1f2..44022c2 100644
--- a/hotspot/src/share/vm/c1/c1_Instruction.hpp
+++ b/hotspot/src/share/vm/c1/c1_Instruction.hpp
@@ -1601,6 +1601,7 @@ LEAF(BlockBegin, StateSplit)
void set_depth_first_number(int dfn) { _depth_first_number = dfn; }
void set_linear_scan_number(int lsn) { _linear_scan_number = lsn; }
void set_end(BlockEnd* end);
+ void clear_end();
void disconnect_from_graph();
static void disconnect_edge(BlockBegin* from, BlockBegin* to);
BlockBegin* insert_block_between(BlockBegin* sux);
diff --git a/hotspot/src/share/vm/c1/c1_LIR.cpp b/hotspot/src/share/vm/c1/c1_LIR.cpp
index f6e10ec..267b966 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.cpp
@@ -142,7 +142,8 @@ void LIR_Address::verify() const {
#endif
#ifdef ARM
assert(disp() == 0 || index()->is_illegal(), "can't have both");
- assert(-4096 < disp() && disp() < 4096, "architecture constraint");
+ // Note: offsets higher than 4096 must not be rejected here. They can
+ // be handled by the back-end or will be rejected if not.
#endif
#ifdef _LP64
assert(base()->is_cpu_register(), "wrong base operand");
@@ -1393,8 +1394,15 @@ void LIR_List::instanceof(LIR_Opr result, LIR_Opr object, ciKlass* klass, LIR_Op
}
-void LIR_List::store_check(LIR_Opr object, LIR_Opr array, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3, CodeEmitInfo* info_for_exception) {
- append(new LIR_OpTypeCheck(lir_store_check, object, array, tmp1, tmp2, tmp3, info_for_exception));
+void LIR_List::store_check(LIR_Opr object, LIR_Opr array, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3,
+ CodeEmitInfo* info_for_exception, ciMethod* profiled_method, int profiled_bci) {
+ LIR_OpTypeCheck* c = new LIR_OpTypeCheck(lir_store_check, object, array, tmp1, tmp2, tmp3, info_for_exception);
+ if (profiled_method != NULL) {
+ c->set_profiled_method(profiled_method);
+ c->set_profiled_bci(profiled_bci);
+ c->set_should_profile(true);
+ }
+ append(c);
}
diff --git a/hotspot/src/share/vm/c1/c1_LIR.hpp b/hotspot/src/share/vm/c1/c1_LIR.hpp
index a2770e4..c440b71 100644
--- a/hotspot/src/share/vm/c1/c1_LIR.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIR.hpp
@@ -2100,7 +2100,7 @@ class LIR_List: public CompilationResourceObj {
void fpop_raw() { append(new LIR_Op0(lir_fpop_raw)); }
void instanceof(LIR_Opr result, LIR_Opr object, ciKlass* klass, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3, bool fast_check, CodeEmitInfo* info_for_patch, ciMethod* profiled_method, int profiled_bci);
- void store_check(LIR_Opr object, LIR_Opr array, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3, CodeEmitInfo* info_for_exception);
+ void store_check(LIR_Opr object, LIR_Opr array, LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3, CodeEmitInfo* info_for_exception, ciMethod* profiled_method, int profiled_bci);
void checkcast (LIR_Opr result, LIR_Opr object, ciKlass* klass,
LIR_Opr tmp1, LIR_Opr tmp2, LIR_Opr tmp3, bool fast_check,
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
index d3b853b..258fde2 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
@@ -121,7 +121,7 @@ void LIR_Assembler::append_patching_stub(PatchingStub* stub) {
void LIR_Assembler::check_codespace() {
CodeSection* cs = _masm->code_section();
- if (cs->remaining() < (int)(1*K)) {
+ if (cs->remaining() < (int)(NOT_LP64(1*K)LP64_ONLY(2*K))) {
BAILOUT("CodeBuffer overflow");
}
}
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
index 857b663..14b6298 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.hpp
@@ -133,7 +133,6 @@ class LIR_Assembler: public CompilationResourceObj {
static bool is_small_constant(LIR_Opr opr);
static LIR_Opr receiverOpr();
- static LIR_Opr incomingReceiverOpr();
static LIR_Opr osrBufferPointer();
// stubs
diff --git a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
index 676efe3..c2c2f7c 100644
--- a/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRGenerator.cpp
@@ -2970,8 +2970,8 @@ void LIRGenerator::do_ProfileInvoke(ProfileInvoke* x) {
// accessors are also always mature.
if (!x->inlinee()->is_accessor()) {
CodeEmitInfo* info = state_for(x, x->state(), true);
- // Increment invocation counter, don't notify the runtime, because we don't inline loops,
- increment_event_counter_impl(info, x->inlinee(), 0, InvocationEntryBci, false, false);
+ // Notify the runtime very infrequently only to take care of counter overflows
+ increment_event_counter_impl(info, x->inlinee(), (1 << Tier23InlineeNotifyFreqLog) - 1, InvocationEntryBci, false, true);
}
}
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.cpp b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
index ef41cfd..38ee82a 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.cpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.cpp
@@ -2404,7 +2404,7 @@ OopMap* LinearScan::compute_oop_map(IntervalWalker* iw, LIR_Op* op, CodeEmitInfo
assert(!is_call_site || assigned_reg >= nof_regs || !is_caller_save(assigned_reg), "interval is in a caller-save register at a call -> register will be overwritten");
VMReg name = vm_reg_for_interval(interval);
- map->set_oop(name);
+ set_oop(map, name);
// Spill optimization: when the stack value is guaranteed to be always correct,
// then it must be added to the oop map even if the interval is currently in a register
@@ -2415,7 +2415,7 @@ OopMap* LinearScan::compute_oop_map(IntervalWalker* iw, LIR_Op* op, CodeEmitInfo
assert(interval->canonical_spill_slot() >= LinearScan::nof_regs, "no spill slot assigned");
assert(interval->assigned_reg() < LinearScan::nof_regs, "interval is on stack, so stack slot is registered twice");
- map->set_oop(frame_map()->slot_regname(interval->canonical_spill_slot() - LinearScan::nof_regs));
+ set_oop(map, frame_map()->slot_regname(interval->canonical_spill_slot() - LinearScan::nof_regs));
}
}
}
@@ -2424,7 +2424,7 @@ OopMap* LinearScan::compute_oop_map(IntervalWalker* iw, LIR_Op* op, CodeEmitInfo
assert(info->stack() != NULL, "CodeEmitInfo must always have a stack");
int locks_count = info->stack()->total_locks_size();
for (int i = 0; i < locks_count; i++) {
- map->set_oop(frame_map()->monitor_object_regname(i));
+ set_oop(map, frame_map()->monitor_object_regname(i));
}
return map;
diff --git a/hotspot/src/share/vm/c1/c1_LinearScan.hpp b/hotspot/src/share/vm/c1/c1_LinearScan.hpp
index 51789eb..133cc85 100644
--- a/hotspot/src/share/vm/c1/c1_LinearScan.hpp
+++ b/hotspot/src/share/vm/c1/c1_LinearScan.hpp
@@ -352,6 +352,13 @@ class LinearScan : public CompilationResourceObj {
MonitorValue* location_for_monitor_index(int monitor_index);
LocationValue* location_for_name(int name, Location::Type loc_type);
+ void set_oop(OopMap* map, VMReg name) {
+ if (map->legal_vm_reg_name(name)) {
+ map->set_oop(name);
+ } else {
+ bailout("illegal oopMap register name");
+ }
+ }
int append_scope_value_for_constant(LIR_Opr opr, GrowableArray<ScopeValue*>* scope_values);
int append_scope_value_for_operand(LIR_Opr opr, GrowableArray<ScopeValue*>* scope_values);
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.cpp b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
index d806b83..675d389 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp
@@ -375,14 +375,6 @@ JRT_ENTRY(void, Runtime1::throw_array_store_exception(JavaThread* thread, oopDes
JRT_END
-JRT_ENTRY(void, Runtime1::post_jvmti_exception_throw(JavaThread* thread))
- if (JvmtiExport::can_post_on_exceptions()) {
- vframeStream vfst(thread, true);
- address bcp = vfst.method()->bcp_from(vfst.bci());
- JvmtiExport::post_exception_throw(thread, vfst.method(), bcp, thread->exception_oop());
- }
-JRT_END
-
// counter_overflow() is called from within C1-compiled methods. The enclosing method is the method
// associated with the top activation record. The inlinee (that is possibly included in the enclosing
// method) method oop is passed as an argument. In order to do that it is embedded in the code as
diff --git a/hotspot/src/share/vm/c1/c1_Runtime1.hpp b/hotspot/src/share/vm/c1/c1_Runtime1.hpp
index 78f73bf..5499740 100644
--- a/hotspot/src/share/vm/c1/c1_Runtime1.hpp
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.hpp
@@ -65,7 +65,6 @@ class StubAssembler;
stub(monitorexit_nofpu) /* optimized version that does not preserve fpu registers */ \
stub(access_field_patching) \
stub(load_klass_patching) \
- stub(jvmti_exception_throw) \
stub(g1_pre_barrier_slow) \
stub(g1_post_barrier_slow) \
stub(fpu2long_stub) \
@@ -141,7 +140,6 @@ class Runtime1: public AllStatic {
static void unimplemented_entry (JavaThread* thread, StubID id);
static address exception_handler_for_pc(JavaThread* thread);
- static void post_jvmti_exception_throw(JavaThread* thread);
static void throw_range_check_exception(JavaThread* thread, int index);
static void throw_index_exception(JavaThread* thread, int index);
diff --git a/hotspot/src/share/vm/c1/c1_globals.hpp b/hotspot/src/share/vm/c1/c1_globals.hpp
index 110371d..15f3cc1 100644
--- a/hotspot/src/share/vm/c1/c1_globals.hpp
+++ b/hotspot/src/share/vm/c1/c1_globals.hpp
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "c1_globals_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "c1_globals_bsd.hpp"
+#endif
//
// Defines all global flags used by the client compiler.
@@ -278,7 +281,7 @@
product(intx, CompilationRepeat, 0, \
"Number of times to recompile method before returning result") \
\
- develop(intx, NMethodSizeLimit, (32*K)*wordSize, \
+ develop(intx, NMethodSizeLimit, (64*K)*wordSize, \
"Maximum size of a compiled method.") \
\
develop(bool, TraceFPUStack, false, \
diff --git a/hotspot/src/share/vm/ci/ciArrayKlass.hpp b/hotspot/src/share/vm/ci/ciArrayKlass.hpp
index 98b0051..aae2f33 100644
--- a/hotspot/src/share/vm/ci/ciArrayKlass.hpp
+++ b/hotspot/src/share/vm/ci/ciArrayKlass.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -32,6 +32,7 @@
// This class, and its subclasses represent klassOops in the
// HotSpot virtual machine whose Klass part is an arrayKlass.
class ciArrayKlass : public ciKlass {
+ CI_PACKAGE_ACCESS
private:
jint _dimension;
diff --git a/hotspot/src/share/vm/ci/ciCallProfile.hpp b/hotspot/src/share/vm/ci/ciCallProfile.hpp
index 438067a..0810149 100644
--- a/hotspot/src/share/vm/ci/ciCallProfile.hpp
+++ b/hotspot/src/share/vm/ci/ciCallProfile.hpp
@@ -79,6 +79,17 @@ public:
assert(i < _limit, "out of Call Profile MorphismLimit");
return _receiver[i];
}
+
+ // Rescale the current profile based on the incoming scale
+ ciCallProfile rescale(double scale) {
+ assert(scale >= 0 && scale <= 1.0, "out of range");
+ ciCallProfile call = *this;
+ call._count = (int)(call._count * scale);
+ for (int i = 0; i < _morphism; i++) {
+ call._receiver_count[i] = (int)(call._receiver_count[i] * scale);
+ }
+ return call;
+ }
};
#endif // SHARE_VM_CI_CICALLPROFILE_HPP
diff --git a/hotspot/src/share/vm/ci/ciCallSite.cpp b/hotspot/src/share/vm/ci/ciCallSite.cpp
index b2118e8..794042a 100644
--- a/hotspot/src/share/vm/ci/ciCallSite.cpp
+++ b/hotspot/src/share/vm/ci/ciCallSite.cpp
@@ -28,6 +28,16 @@
// ciCallSite
+bool ciCallSite::is_constant_call_site() {
+ return klass()->is_subclass_of(CURRENT_ENV->ConstantCallSite_klass());
+}
+bool ciCallSite::is_mutable_call_site() {
+ return klass()->is_subclass_of(CURRENT_ENV->MutableCallSite_klass());
+}
+bool ciCallSite::is_volatile_call_site() {
+ return klass()->is_subclass_of(CURRENT_ENV->VolatileCallSite_klass());
+}
+
// ------------------------------------------------------------------
// ciCallSite::get_target
//
diff --git a/hotspot/src/share/vm/ci/ciCallSite.hpp b/hotspot/src/share/vm/ci/ciCallSite.hpp
index f9ad78d..063f1e3 100644
--- a/hotspot/src/share/vm/ci/ciCallSite.hpp
+++ b/hotspot/src/share/vm/ci/ciCallSite.hpp
@@ -37,6 +37,10 @@ public:
// What kind of ciObject is this?
bool is_call_site() const { return true; }
+ bool is_constant_call_site();
+ bool is_mutable_call_site();
+ bool is_volatile_call_site();
+
// Return the target MethodHandle of this CallSite.
ciMethodHandle* get_target() const;
diff --git a/hotspot/src/share/vm/ci/ciClassList.hpp b/hotspot/src/share/vm/ci/ciClassList.hpp
index bc96594..4d19439 100644
--- a/hotspot/src/share/vm/ci/ciClassList.hpp
+++ b/hotspot/src/share/vm/ci/ciClassList.hpp
@@ -77,12 +77,14 @@ class ciTypeArrayKlassKlass;
// Everyone gives access to ciObjectFactory
#define CI_PACKAGE_ACCESS \
-friend class ciObjectFactory;
+friend class ciObjectFactory; \
+friend class VMStructs;
// These are the packages that have access to ciEnv
// Any more access must be given explicitly.
#define CI_PACKAGE_ACCESS_TO \
friend class ciObjectFactory; \
+friend class VMStructs; \
friend class ciCallSite; \
friend class ciConstantPoolCache; \
friend class ciField; \
diff --git a/hotspot/src/share/vm/ci/ciConstant.hpp b/hotspot/src/share/vm/ci/ciConstant.hpp
index f217faa..8cdc893 100644
--- a/hotspot/src/share/vm/ci/ciConstant.hpp
+++ b/hotspot/src/share/vm/ci/ciConstant.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -32,6 +32,7 @@
//
// This class represents a constant value.
class ciConstant VALUE_OBJ_CLASS_SPEC {
+ friend class VMStructs;
private:
friend class ciEnv;
friend class ciField;
@@ -46,9 +47,6 @@ private:
ciObject* _object;
} _value;
- // Implementation of the print method.
- void print_impl(outputStream* st);
-
public:
ciConstant() {
diff --git a/hotspot/src/share/vm/ci/ciEnv.cpp b/hotspot/src/share/vm/ci/ciEnv.cpp
index 58f1aa0..82492a0 100644
--- a/hotspot/src/share/vm/ci/ciEnv.cpp
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp
@@ -884,42 +884,63 @@ bool ciEnv::system_dictionary_modification_counter_changed() {
}
// ------------------------------------------------------------------
-// ciEnv::check_for_system_dictionary_modification
-// Check for changes to the system dictionary during compilation
-// class loads, evolution, breakpoints
-void ciEnv::check_for_system_dictionary_modification(ciMethod* target) {
+// ciEnv::validate_compile_task_dependencies
+//
+// Check for changes during compilation (e.g. class loads, evolution,
+// breakpoints, call site invalidation).
+void ciEnv::validate_compile_task_dependencies(ciMethod* target) {
if (failing()) return; // no need for further checks
- // Dependencies must be checked when the system dictionary changes.
- // If logging is enabled all violated dependences will be recorded in
- // the log. In debug mode check dependencies even if the system
- // dictionary hasn't changed to verify that no invalid dependencies
- // were inserted. Any violated dependences in this case are dumped to
- // the tty.
+ // First, check non-klass dependencies as we might return early and
+ // not check klass dependencies if the system dictionary
+ // modification counter hasn't changed (see below).
+ for (Dependencies::DepStream deps(dependencies()); deps.next(); ) {
+ if (deps.is_klass_type()) continue; // skip klass dependencies
+ klassOop witness = deps.check_dependency();
+ if (witness != NULL) {
+ record_failure("invalid non-klass dependency");
+ return;
+ }
+ }
+ // Klass dependencies must be checked when the system dictionary
+ // changes. If logging is enabled all violated dependences will be
+ // recorded in the log. In debug mode check dependencies even if
+ // the system dictionary hasn't changed to verify that no invalid
+ // dependencies were inserted. Any violated dependences in this
+ // case are dumped to the tty.
bool counter_changed = system_dictionary_modification_counter_changed();
- bool test_deps = counter_changed;
- DEBUG_ONLY(test_deps = true);
- if (!test_deps) return;
-
- bool print_failures = false;
- DEBUG_ONLY(print_failures = !counter_changed);
-
- bool keep_going = (print_failures || xtty != NULL);
- int violated = 0;
+ bool verify_deps = trueInDebug;
+ if (!counter_changed && !verify_deps) return;
+ int klass_violations = 0;
for (Dependencies::DepStream deps(dependencies()); deps.next(); ) {
+ if (!deps.is_klass_type()) continue; // skip non-klass dependencies
klassOop witness = deps.check_dependency();
if (witness != NULL) {
- ++violated;
- if (print_failures) deps.print_dependency(witness, /*verbose=*/ true);
- // If there's no log and we're not sanity-checking, we're done.
- if (!keep_going) break;
+ klass_violations++;
+ if (!counter_changed) {
+ // Dependence failed but counter didn't change. Log a message
+ // describing what failed and allow the assert at the end to
+ // trigger.
+ deps.print_dependency(witness);
+ } else if (xtty == NULL) {
+ // If we're not logging then a single violation is sufficient,
+ // otherwise we want to log all the dependences which were
+ // violated.
+ break;
+ }
}
}
- if (violated != 0) {
+ if (klass_violations != 0) {
+#ifdef ASSERT
+ if (!counter_changed && !PrintCompilation) {
+ // Print out the compile task that failed
+ _task->print_line();
+ }
+#endif
assert(counter_changed, "failed dependencies, but counter didn't change");
record_failure("concurrent class loading");
}
@@ -938,7 +959,6 @@ void ciEnv::register_method(ciMethod* target,
ImplicitExceptionTable* inc_table,
AbstractCompiler* compiler,
int comp_level,
- bool has_debug_info,
bool has_unsafe_access) {
VM_ENTRY_MARK;
nmethod* nm = NULL;
@@ -978,8 +998,8 @@ void ciEnv::register_method(ciMethod* target,
// Encode the dependencies now, so we can check them right away.
dependencies()->encode_content_bytes();
- // Check for {class loads, evolution, breakpoints} during compilation
- check_for_system_dictionary_modification(target);
+ // Check for {class loads, evolution, breakpoints, ...} during compilation
+ validate_compile_task_dependencies(target);
}
methodHandle method(THREAD, target->get_methodOop());
@@ -1033,7 +1053,6 @@ void ciEnv::register_method(ciMethod* target,
CompileBroker::handle_full_code_cache();
}
} else {
- NOT_PRODUCT(nm->set_has_debug_info(has_debug_info); )
nm->set_has_unsafe_access(has_unsafe_access);
// Record successful registration.
diff --git a/hotspot/src/share/vm/ci/ciEnv.hpp b/hotspot/src/share/vm/ci/ciEnv.hpp
index fb6647c..f5242ca 100644
--- a/hotspot/src/share/vm/ci/ciEnv.hpp
+++ b/hotspot/src/share/vm/ci/ciEnv.hpp
@@ -247,9 +247,9 @@ private:
// Is this thread currently in the VM state?
static bool is_in_vm();
- // Helper routine for determining the validity of a compilation
- // with respect to concurrent class loading.
- void check_for_system_dictionary_modification(ciMethod* target);
+ // Helper routine for determining the validity of a compilation with
+ // respect to method dependencies (e.g. concurrent class loading).
+ void validate_compile_task_dependencies(ciMethod* target);
public:
enum {
@@ -317,8 +317,7 @@ public:
ImplicitExceptionTable* inc_table,
AbstractCompiler* compiler,
int comp_level,
- bool has_debug_info = true,
- bool has_unsafe_access = false);
+ bool has_unsafe_access);
// Access to certain well known ciObjects.
diff --git a/hotspot/src/share/vm/ci/ciField.hpp b/hotspot/src/share/vm/ci/ciField.hpp
index 6406dde..bd65abe 100644
--- a/hotspot/src/share/vm/ci/ciField.hpp
+++ b/hotspot/src/share/vm/ci/ciField.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 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
@@ -64,9 +64,6 @@ private:
// shared constructor code
void initialize_from(fieldDescriptor* fd);
- // The implementation of the print method.
- void print_impl(outputStream* st);
-
public:
ciFlags flags() { return _flags; }
@@ -178,6 +175,13 @@ public:
bool is_volatile () { return flags().is_volatile(); }
bool is_transient () { return flags().is_transient(); }
+ bool is_call_site_target() {
+ ciInstanceKlass* callsite_klass = CURRENT_ENV->CallSite_klass();
+ if (callsite_klass == NULL)
+ return false;
+ return (holder()->is_subclass_of(callsite_klass) && (name() == ciSymbol::target_name()));
+ }
+
// Debugging output
void print();
void print_name_on(outputStream* st);
diff --git a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp b/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
index 35ee2b8..f10b92f 100644
--- a/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
+++ b/hotspot/src/share/vm/ci/ciInstanceKlass.cpp
@@ -31,6 +31,7 @@
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
+#include "oops/fieldStreams.hpp"
#include "runtime/fieldDescriptor.hpp"
// ciInstanceKlass
@@ -412,7 +413,7 @@ GrowableArray<ciField*>* ciInstanceKlass::non_static_fields() {
VM_ENTRY_MARK;
ciEnv* curEnv = ciEnv::current();
instanceKlass* ik = get_instanceKlass();
- int max_n_fields = ik->fields()->length()/instanceKlass::next_offset;
+ int max_n_fields = ik->java_fields_count();
Arena* arena = curEnv->arena();
_non_static_fields =
@@ -476,23 +477,6 @@ int ciInstanceKlass::compute_nonstatic_fields() {
// Now sort them by offset, ascending.
// (In principle, they could mix with superclass fields.)
fields->sort(sort_field_by_offset);
-#ifdef ASSERT
- int last_offset = instanceOopDesc::base_offset_in_bytes();
- for (int i = 0; i < fields->length(); i++) {
- ciField* field = fields->at(i);
- int offset = field->offset_in_bytes();
- int size = (field->_type == NULL) ? heapOopSize : field->size_in_bytes();
- assert(last_offset <= offset, err_msg("no field overlap: %d <= %d", last_offset, offset));
- if (last_offset > (int)sizeof(oopDesc))
- assert((offset - last_offset) < BytesPerLong, "no big holes");
- // Note: Two consecutive T_BYTE fields will be separated by wordSize-1
- // padding bytes if one of them is declared by a superclass.
- // This is a minor inefficiency classFileParser.cpp.
- last_offset = offset + size;
- }
- assert(last_offset <= (int)instanceOopDesc::base_offset_in_bytes() + fsize, "no overflow");
-#endif
-
_nonstatic_fields = fields;
return flen;
}
@@ -505,33 +489,29 @@ ciInstanceKlass::compute_nonstatic_fields_impl(GrowableArray<ciField*>*
int flen = 0;
GrowableArray<ciField*>* fields = NULL;
instanceKlass* k = get_instanceKlass();
- typeArrayOop fields_array = k->fields();
- for (int pass = 0; pass <= 1; pass++) {
- for (int i = 0, alen = fields_array->length(); i < alen; i += instanceKlass::next_offset) {
- fieldDescriptor fd;
- fd.initialize(k->as_klassOop(), i);
- if (fd.is_static()) continue;
- if (pass == 0) {
- flen += 1;
- } else {
- ciField* field = new (arena) ciField(&fd);
- fields->append(field);
- }
- }
+ for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_static()) continue;
+ flen += 1;
+ }
- // Between passes, allocate the array:
- if (pass == 0) {
- if (flen == 0) {
- return NULL; // return nothing if none are locally declared
- }
- if (super_fields != NULL) {
- flen += super_fields->length();
- }
- fields = new (arena) GrowableArray<ciField*>(arena, flen, 0, NULL);
- if (super_fields != NULL) {
- fields->appendAll(super_fields);
- }
- }
+ // allocate the array:
+ if (flen == 0) {
+ return NULL; // return nothing if none are locally declared
+ }
+ if (super_fields != NULL) {
+ flen += super_fields->length();
+ }
+ fields = new (arena) GrowableArray<ciField*>(arena, flen, 0, NULL);
+ if (super_fields != NULL) {
+ fields->appendAll(super_fields);
+ }
+
+ for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_static()) continue;
+ fieldDescriptor fd;
+ fd.initialize(k->as_klassOop(), fs.index());
+ ciField* field = new (arena) ciField(&fd);
+ fields->append(field);
}
assert(fields->length() == flen, "sanity");
return fields;
diff --git a/hotspot/src/share/vm/ci/ciMethod.cpp b/hotspot/src/share/vm/ci/ciMethod.cpp
index 89fb4aa..a985d5e 100644
--- a/hotspot/src/share/vm/ci/ciMethod.cpp
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp
@@ -1017,6 +1017,34 @@ int ciMethod::highest_osr_comp_level() {
}
// ------------------------------------------------------------------
+// ciMethod::code_size_for_inlining
+//
+// Code size for inlining decisions.
+//
+// Don't fully count method handle adapters against inlining budgets:
+// the metric we use here is the number of call sites in the adapter
+// as they are probably the instructions which generate some code.
+int ciMethod::code_size_for_inlining() {
+ check_is_loaded();
+
+ // Method handle adapters
+ if (is_method_handle_adapter()) {
+ // Count call sites
+ int call_site_count = 0;
+ ciBytecodeStream iter(this);
+ while (iter.next() != ciBytecodeStream::EOBC()) {
+ if (Bytecodes::is_invoke(iter.cur_bc())) {
+ call_site_count++;
+ }
+ }
+ return call_site_count;
+ }
+
+ // Normal method
+ return code_size();
+}
+
+// ------------------------------------------------------------------
// ciMethod::instructions_size
//
// This is a rough metric for "fat" methods, compared before inlining
diff --git a/hotspot/src/share/vm/ci/ciMethod.hpp b/hotspot/src/share/vm/ci/ciMethod.hpp
index feab1e6..db71752 100644
--- a/hotspot/src/share/vm/ci/ciMethod.hpp
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp
@@ -157,6 +157,9 @@ class ciMethod : public ciObject {
int interpreter_invocation_count() const { check_is_loaded(); return _interpreter_invocation_count; }
int interpreter_throwout_count() const { check_is_loaded(); return _interpreter_throwout_count; }
+ // Code size for inlining decisions.
+ int code_size_for_inlining();
+
int comp_level();
int highest_osr_comp_level();
diff --git a/hotspot/src/share/vm/ci/ciMethodHandle.cpp b/hotspot/src/share/vm/ci/ciMethodHandle.cpp
index 0e73abc..b4c9161 100644
--- a/hotspot/src/share/vm/ci/ciMethodHandle.cpp
+++ b/hotspot/src/share/vm/ci/ciMethodHandle.cpp
@@ -37,7 +37,7 @@
// ciMethodHandle::get_adapter
//
// Return an adapter for this MethodHandle.
-ciMethod* ciMethodHandle::get_adapter_impl(bool is_invokedynamic) const {
+ciMethod* ciMethodHandle::get_adapter_impl(bool is_invokedynamic) {
VM_ENTRY_MARK;
Handle h(get_oop());
methodHandle callee(_callee->get_methodOop());
@@ -73,7 +73,7 @@ ciMethod* ciMethodHandle::get_adapter_impl(bool is_invokedynamic) const {
// ciMethodHandle::get_adapter
//
// Return an adapter for this MethodHandle.
-ciMethod* ciMethodHandle::get_adapter(bool is_invokedynamic) const {
+ciMethod* ciMethodHandle::get_adapter(bool is_invokedynamic) {
ciMethod* result = get_adapter_impl(is_invokedynamic);
if (result) {
// Fake up the MDO maturity.
@@ -86,11 +86,22 @@ ciMethod* ciMethodHandle::get_adapter(bool is_invokedynamic) const {
}
+#ifndef PRODUCT
// ------------------------------------------------------------------
-// ciMethodHandle::print_impl
+// ciMethodHandle::print_chain_impl
//
// Implementation of the print method.
-void ciMethodHandle::print_impl(outputStream* st) {
- st->print(" type=");
- get_oop()->print();
+void ciMethodHandle::print_chain_impl(outputStream* st) {
+ ASSERT_IN_VM;
+ MethodHandleChain::print(get_oop());
}
+
+
+// ------------------------------------------------------------------
+// ciMethodHandle::print_chain
+//
+// Implementation of the print_chain method.
+void ciMethodHandle::print_chain(outputStream* st) {
+ GUARDED_VM_ENTRY(print_chain_impl(st););
+}
+#endif
diff --git a/hotspot/src/share/vm/ci/ciMethodHandle.hpp b/hotspot/src/share/vm/ci/ciMethodHandle.hpp
index b8919fe..e19d053 100644
--- a/hotspot/src/share/vm/ci/ciMethodHandle.hpp
+++ b/hotspot/src/share/vm/ci/ciMethodHandle.hpp
@@ -37,19 +37,23 @@ private:
ciMethod* _callee;
ciMethod* _caller;
ciCallProfile _profile;
+ ciMethod* _method_handle_adapter;
+ ciMethod* _invokedynamic_adapter;
// Return an adapter for this MethodHandle.
- ciMethod* get_adapter_impl(bool is_invokedynamic) const;
- ciMethod* get_adapter( bool is_invokedynamic) const;
+ ciMethod* get_adapter_impl(bool is_invokedynamic);
+ ciMethod* get_adapter( bool is_invokedynamic);
protected:
- void print_impl(outputStream* st);
+ void print_chain_impl(outputStream* st) PRODUCT_RETURN;
public:
ciMethodHandle(instanceHandle h_i) :
ciInstance(h_i),
_callee(NULL),
- _caller(NULL)
+ _caller(NULL),
+ _method_handle_adapter(NULL),
+ _invokedynamic_adapter(NULL)
{}
// What kind of ciObject is this?
@@ -60,10 +64,22 @@ public:
void set_call_profile(ciCallProfile profile) { _profile = profile; }
// Return an adapter for a MethodHandle call.
- ciMethod* get_method_handle_adapter() const { return get_adapter(false); }
+ ciMethod* get_method_handle_adapter() {
+ if (_method_handle_adapter == NULL) {
+ _method_handle_adapter = get_adapter(false);
+ }
+ return _method_handle_adapter;
+ }
// Return an adapter for an invokedynamic call.
- ciMethod* get_invokedynamic_adapter() const { return get_adapter(true); }
+ ciMethod* get_invokedynamic_adapter() {
+ if (_invokedynamic_adapter == NULL) {
+ _invokedynamic_adapter = get_adapter(true);
+ }
+ return _invokedynamic_adapter;
+ }
+
+ void print_chain(outputStream* st = tty) PRODUCT_RETURN;
};
#endif // SHARE_VM_CI_CIMETHODHANDLE_HPP
diff --git a/hotspot/src/share/vm/ci/ciObject.cpp b/hotspot/src/share/vm/ci/ciObject.cpp
index b7dd1e5..0f96f5b 100644
--- a/hotspot/src/share/vm/ci/ciObject.cpp
+++ b/hotspot/src/share/vm/ci/ciObject.cpp
@@ -194,16 +194,26 @@ bool ciObject::can_be_constant() {
// ciObject::should_be_constant()
bool ciObject::should_be_constant() {
if (ScavengeRootsInCode >= 2) return true; // force everybody to be a constant
- if (!JavaObjectsInPerm && !is_null_object()) {
+ if (is_null_object()) return true;
+
+ ciEnv* env = CURRENT_ENV;
+ if (!JavaObjectsInPerm) {
// We want Strings and Classes to be embeddable by default since
// they used to be in the perm world. Not all Strings used to be
// embeddable but there's no easy way to distinguish the interned
// from the regulars ones so just treat them all that way.
- ciEnv* env = CURRENT_ENV;
if (klass() == env->String_klass() || klass() == env->Class_klass()) {
return true;
}
}
+ if (EnableInvokeDynamic &&
+ (klass()->is_subclass_of(env->MethodHandle_klass()) ||
+ klass()->is_subclass_of(env->CallSite_klass()))) {
+ assert(ScavengeRootsInCode >= 1, "must be");
+ // We want to treat these aggressively.
+ return true;
+ }
+
return handle() == NULL || is_perm();
}
diff --git a/hotspot/src/share/vm/ci/ciObjectFactory.hpp b/hotspot/src/share/vm/ci/ciObjectFactory.hpp
index 12185f2..6222b9f 100644
--- a/hotspot/src/share/vm/ci/ciObjectFactory.hpp
+++ b/hotspot/src/share/vm/ci/ciObjectFactory.hpp
@@ -36,6 +36,9 @@
// which ensures that for each oop, at most one ciObject is created.
// This invariant allows efficient implementation of ciObject.
class ciObjectFactory : public ResourceObj {
+ friend class VMStructs;
+ friend class ciEnv;
+
private:
static volatile bool _initialized;
static GrowableArray<ciObject*>* _shared_ci_objects;
diff --git a/hotspot/src/share/vm/ci/ciStreams.hpp b/hotspot/src/share/vm/ci/ciStreams.hpp
index 7ad6ef0..b03642c 100644
--- a/hotspot/src/share/vm/ci/ciStreams.hpp
+++ b/hotspot/src/share/vm/ci/ciStreams.hpp
@@ -129,7 +129,8 @@ public:
// Return current ByteCode and increment PC to next bytecode, skipping all
// intermediate constants. Returns EOBC at end.
// Expected usage:
- // while( (bc = iter.next()) != EOBC() ) { ... }
+ // ciBytecodeStream iter(m);
+ // while (iter.next() != ciBytecodeStream::EOBC()) { ... }
Bytecodes::Code next() {
_bc_start = _pc; // Capture start of bc
if( _pc >= _end ) return EOBC(); // End-Of-Bytecodes
diff --git a/hotspot/src/share/vm/classfile/classFileParser.cpp b/hotspot/src/share/vm/classfile/classFileParser.cpp
index 4c664bd..b28b8ad 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp
@@ -36,6 +36,7 @@
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
#include "oops/constantPoolOop.hpp"
+#include "oops/fieldStreams.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/klass.inline.hpp"
@@ -991,42 +992,98 @@ enum FieldAllocationType {
STATIC_BYTE, // Boolean, Byte, char
STATIC_SHORT, // shorts
STATIC_WORD, // ints
- STATIC_DOUBLE, // long or double
- STATIC_ALIGNED_DOUBLE,// aligned long or double
+ STATIC_DOUBLE, // aligned long or double
NONSTATIC_OOP,
NONSTATIC_BYTE,
NONSTATIC_SHORT,
NONSTATIC_WORD,
NONSTATIC_DOUBLE,
- NONSTATIC_ALIGNED_DOUBLE
+ MAX_FIELD_ALLOCATION_TYPE,
+ BAD_ALLOCATION_TYPE = -1
};
+static FieldAllocationType _basic_type_to_atype[2 * (T_CONFLICT + 1)] = {
+ BAD_ALLOCATION_TYPE, // 0
+ BAD_ALLOCATION_TYPE, // 1
+ BAD_ALLOCATION_TYPE, // 2
+ BAD_ALLOCATION_TYPE, // 3
+ NONSTATIC_BYTE , // T_BOOLEAN = 4,
+ NONSTATIC_SHORT, // T_CHAR = 5,
+ NONSTATIC_WORD, // T_FLOAT = 6,
+ NONSTATIC_DOUBLE, // T_DOUBLE = 7,
+ NONSTATIC_BYTE, // T_BYTE = 8,
+ NONSTATIC_SHORT, // T_SHORT = 9,
+ NONSTATIC_WORD, // T_INT = 10,
+ NONSTATIC_DOUBLE, // T_LONG = 11,
+ NONSTATIC_OOP, // T_OBJECT = 12,
+ NONSTATIC_OOP, // T_ARRAY = 13,
+ BAD_ALLOCATION_TYPE, // T_VOID = 14,
+ BAD_ALLOCATION_TYPE, // T_ADDRESS = 15,
+ BAD_ALLOCATION_TYPE, // T_NARROWOOP= 16,
+ BAD_ALLOCATION_TYPE, // T_CONFLICT = 17,
+ BAD_ALLOCATION_TYPE, // 0
+ BAD_ALLOCATION_TYPE, // 1
+ BAD_ALLOCATION_TYPE, // 2
+ BAD_ALLOCATION_TYPE, // 3
+ STATIC_BYTE , // T_BOOLEAN = 4,
+ STATIC_SHORT, // T_CHAR = 5,
+ STATIC_WORD, // T_FLOAT = 6,
+ STATIC_DOUBLE, // T_DOUBLE = 7,
+ STATIC_BYTE, // T_BYTE = 8,
+ STATIC_SHORT, // T_SHORT = 9,
+ STATIC_WORD, // T_INT = 10,
+ STATIC_DOUBLE, // T_LONG = 11,
+ STATIC_OOP, // T_OBJECT = 12,
+ STATIC_OOP, // T_ARRAY = 13,
+ BAD_ALLOCATION_TYPE, // T_VOID = 14,
+ BAD_ALLOCATION_TYPE, // T_ADDRESS = 15,
+ BAD_ALLOCATION_TYPE, // T_NARROWOOP= 16,
+ BAD_ALLOCATION_TYPE, // T_CONFLICT = 17,
+};
+
+static FieldAllocationType basic_type_to_atype(bool is_static, BasicType type) {
+ assert(type >= T_BOOLEAN && type < T_VOID, "only allowable values");
+ FieldAllocationType result = _basic_type_to_atype[type + (is_static ? (T_CONFLICT + 1) : 0)];
+ assert(result != BAD_ALLOCATION_TYPE, "bad type");
+ return result;
+}
+
+class FieldAllocationCount: public ResourceObj {
+ public:
+ unsigned int count[MAX_FIELD_ALLOCATION_TYPE];
-struct FieldAllocationCount {
- unsigned int static_oop_count;
- unsigned int static_byte_count;
- unsigned int static_short_count;
- unsigned int static_word_count;
- unsigned int static_double_count;
- unsigned int nonstatic_oop_count;
- unsigned int nonstatic_byte_count;
- unsigned int nonstatic_short_count;
- unsigned int nonstatic_word_count;
- unsigned int nonstatic_double_count;
+ FieldAllocationCount() {
+ for (int i = 0; i < MAX_FIELD_ALLOCATION_TYPE; i++) {
+ count[i] = 0;
+ }
+ }
+
+ FieldAllocationType update(bool is_static, BasicType type) {
+ FieldAllocationType atype = basic_type_to_atype(is_static, type);
+ count[atype]++;
+ return atype;
+ }
};
-typeArrayHandle ClassFileParser::parse_fields(constantPoolHandle cp, bool is_interface,
- struct FieldAllocationCount *fac,
- objArrayHandle* fields_annotations, TRAPS) {
+
+typeArrayHandle ClassFileParser::parse_fields(Symbol* class_name,
+ constantPoolHandle cp, bool is_interface,
+ FieldAllocationCount *fac,
+ objArrayHandle* fields_annotations,
+ int* java_fields_count_ptr, TRAPS) {
ClassFileStream* cfs = stream();
typeArrayHandle nullHandle;
cfs->guarantee_more(2, CHECK_(nullHandle)); // length
u2 length = cfs->get_u2_fast();
+ *java_fields_count_ptr = length;
+
+ int num_injected = 0;
+ InjectedField* injected = JavaClasses::get_injected(class_name, &num_injected);
+
// Tuples of shorts [access, name index, sig index, initial value index, byte offset, generic signature index]
- typeArrayOop new_fields = oopFactory::new_permanent_shortArray(length*instanceKlass::next_offset, CHECK_(nullHandle));
+ typeArrayOop new_fields = oopFactory::new_permanent_shortArray((length + num_injected) * FieldInfo::field_slots, CHECK_(nullHandle));
typeArrayHandle fields(THREAD, new_fields);
- int index = 0;
typeArrayHandle field_annotations;
for (int n = 0; n < length; n++) {
cfs->guarantee_more(8, CHECK_(nullHandle)); // access_flags, name_index, descriptor_index, attributes_count
@@ -1077,93 +1134,77 @@ typeArrayHandle ClassFileParser::parse_fields(constantPoolHandle cp, bool is_int
}
}
- fields->short_at_put(index++, access_flags.as_short());
- fields->short_at_put(index++, name_index);
- fields->short_at_put(index++, signature_index);
- fields->short_at_put(index++, constantvalue_index);
+ FieldInfo* field = FieldInfo::from_field_array(fields(), n);
+ field->initialize(access_flags.as_short(),
+ name_index,
+ signature_index,
+ constantvalue_index,
+ generic_signature_index,
+ 0);
- // Remember how many oops we encountered and compute allocation type
BasicType type = cp->basic_type_for_signature_at(signature_index);
- FieldAllocationType atype;
- if ( is_static ) {
- switch ( type ) {
- case T_BOOLEAN:
- case T_BYTE:
- fac->static_byte_count++;
- atype = STATIC_BYTE;
- break;
- case T_LONG:
- case T_DOUBLE:
- if (Universe::field_type_should_be_aligned(type)) {
- atype = STATIC_ALIGNED_DOUBLE;
- } else {
- atype = STATIC_DOUBLE;
- }
- fac->static_double_count++;
- break;
- case T_CHAR:
- case T_SHORT:
- fac->static_short_count++;
- atype = STATIC_SHORT;
- break;
- case T_FLOAT:
- case T_INT:
- fac->static_word_count++;
- atype = STATIC_WORD;
- break;
- case T_ARRAY:
- case T_OBJECT:
- fac->static_oop_count++;
- atype = STATIC_OOP;
- break;
- case T_ADDRESS:
- case T_VOID:
- default:
- assert(0, "bad field type");
- }
- } else {
- switch ( type ) {
- case T_BOOLEAN:
- case T_BYTE:
- fac->nonstatic_byte_count++;
- atype = NONSTATIC_BYTE;
- break;
- case T_LONG:
- case T_DOUBLE:
- if (Universe::field_type_should_be_aligned(type)) {
- atype = NONSTATIC_ALIGNED_DOUBLE;
- } else {
- atype = NONSTATIC_DOUBLE;
+
+ // Remember how many oops we encountered and compute allocation type
+ FieldAllocationType atype = fac->update(is_static, type);
+
+ // The correct offset is computed later (all oop fields will be located together)
+ // We temporarily store the allocation type in the offset field
+ field->set_offset(atype);
+ }
+
+ if (num_injected != 0) {
+ int index = length;
+ for (int n = 0; n < num_injected; n++) {
+ // Check for duplicates
+ if (injected[n].may_be_java) {
+ Symbol* name = injected[n].name();
+ Symbol* signature = injected[n].signature();
+ bool duplicate = false;
+ for (int i = 0; i < length; i++) {
+ FieldInfo* f = FieldInfo::from_field_array(fields(), i);
+ if (name == cp->symbol_at(f->name_index()) &&
+ signature == cp->symbol_at(f->signature_index())) {
+ // Symbol is desclared in Java so skip this one
+ duplicate = true;
+ break;
}
- fac->nonstatic_double_count++;
- break;
- case T_CHAR:
- case T_SHORT:
- fac->nonstatic_short_count++;
- atype = NONSTATIC_SHORT;
- break;
- case T_FLOAT:
- case T_INT:
- fac->nonstatic_word_count++;
- atype = NONSTATIC_WORD;
- break;
- case T_ARRAY:
- case T_OBJECT:
- fac->nonstatic_oop_count++;
- atype = NONSTATIC_OOP;
- break;
- case T_ADDRESS:
- case T_VOID:
- default:
- assert(0, "bad field type");
+ }
+ if (duplicate) {
+ // These will be removed from the field array at the end
+ continue;
+ }
}
+
+ // Injected field
+ FieldInfo* field = FieldInfo::from_field_array(fields(), index);
+ field->initialize(JVM_ACC_FIELD_INTERNAL,
+ injected[n].name_index,
+ injected[n].signature_index,
+ 0,
+ 0,
+ 0);
+
+ BasicType type = FieldType::basic_type(injected[n].signature());
+
+ // Remember how many oops we encountered and compute allocation type
+ FieldAllocationType atype = fac->update(false, type);
+
+ // The correct offset is computed later (all oop fields will be located together)
+ // We temporarily store the allocation type in the offset field
+ field->set_offset(atype);
+ index++;
}
- // The correct offset is computed later (all oop fields will be located together)
- // We temporarily store the allocation type in the offset field
- fields->short_at_put(index++, atype);
- fields->short_at_put(index++, 0); // Clear out high word of byte offset
- fields->short_at_put(index++, generic_signature_index);
+ if (index < length + num_injected) {
+ // sometimes injected fields already exist in the Java source so
+ // the fields array could be too long. In that case trim the
+ // fields array.
+ new_fields = oopFactory::new_permanent_shortArray(index * FieldInfo::field_slots, CHECK_(nullHandle));
+ for (int i = 0; i < index * FieldInfo::field_slots; i++) {
+ new_fields->short_at_put(i, fields->short_at(i));
+ }
+ fields = new_fields;
+ }
}
if (_need_verify && length > 1) {
@@ -1175,11 +1216,9 @@ typeArrayHandle ClassFileParser::parse_fields(constantPoolHandle cp, bool is_int
bool dup = false;
{
debug_only(No_Safepoint_Verifier nsv;)
- for (int i = 0; i < length*instanceKlass::next_offset; i += instanceKlass::next_offset) {
- int name_index = fields->ushort_at(i + instanceKlass::name_index_offset);
- Symbol* name = cp->symbol_at(name_index);
- int sig_index = fields->ushort_at(i + instanceKlass::signature_index_offset);
- Symbol* sig = cp->symbol_at(sig_index);
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
+ Symbol* name = fs.name();
+ Symbol* sig = fs.signature();
// If no duplicates, add name/signature in hashtable names_and_sigs.
if (!put_after_lookup(name, sig, names_and_sigs)) {
dup = true;
@@ -2592,227 +2631,6 @@ typeArrayHandle ClassFileParser::assemble_annotations(u1* runtime_visible_annota
}
-void ClassFileParser::java_lang_ref_Reference_fix_pre(typeArrayHandle* fields_ptr,
- constantPoolHandle cp, FieldAllocationCount *fac_ptr, TRAPS) {
- // This code is for compatibility with earlier jdk's that do not
- // have the "discovered" field in java.lang.ref.Reference. For 1.5
- // the check for the "discovered" field should issue a warning if
- // the field is not found. For 1.6 this code should be issue a
- // fatal error if the "discovered" field is not found.
- //
- // Increment fac.nonstatic_oop_count so that the start of the
- // next type of non-static oops leaves room for the fake oop.
- // Do not increment next_nonstatic_oop_offset so that the
- // fake oop is place after the java.lang.ref.Reference oop
- // fields.
- //
- // Check the fields in java.lang.ref.Reference for the "discovered"
- // field. If it is not present, artifically create a field for it.
- // This allows this VM to run on early JDK where the field is not
- // present.
- int reference_sig_index = 0;
- int reference_name_index = 0;
- int reference_index = 0;
- int extra = java_lang_ref_Reference::number_of_fake_oop_fields;
- const int n = (*fields_ptr)()->length();
- for (int i = 0; i < n; i += instanceKlass::next_offset ) {
- int name_index =
- (*fields_ptr)()->ushort_at(i + instanceKlass::name_index_offset);
- int sig_index =
- (*fields_ptr)()->ushort_at(i + instanceKlass::signature_index_offset);
- Symbol* f_name = cp->symbol_at(name_index);
- Symbol* f_sig = cp->symbol_at(sig_index);
- if (f_sig == vmSymbols::reference_signature() && reference_index == 0) {
- // Save the index for reference signature for later use.
- // The fake discovered field does not entries in the
- // constant pool so the index for its signature cannot
- // be extracted from the constant pool. It will need
- // later, however. It's signature is vmSymbols::reference_signature()
- // so same an index for that signature.
- reference_sig_index = sig_index;
- reference_name_index = name_index;
- reference_index = i;
- }
- if (f_name == vmSymbols::reference_discovered_name() &&
- f_sig == vmSymbols::reference_signature()) {
- // The values below are fake but will force extra
- // non-static oop fields and a corresponding non-static
- // oop map block to be allocated.
- extra = 0;
- break;
- }
- }
- if (extra != 0) {
- fac_ptr->nonstatic_oop_count += extra;
- // Add the additional entry to "fields" so that the klass
- // contains the "discoverd" field and the field will be initialized
- // in instances of the object.
- int fields_with_fix_length = (*fields_ptr)()->length() +
- instanceKlass::next_offset;
- typeArrayOop ff = oopFactory::new_permanent_shortArray(
- fields_with_fix_length, CHECK);
- typeArrayHandle fields_with_fix(THREAD, ff);
-
- // Take everything from the original but the length.
- for (int idx = 0; idx < (*fields_ptr)->length(); idx++) {
- fields_with_fix->ushort_at_put(idx, (*fields_ptr)->ushort_at(idx));
- }
-
- // Add the fake field at the end.
- int i = (*fields_ptr)->length();
- // There is no name index for the fake "discovered" field nor
- // signature but a signature is needed so that the field will
- // be properly initialized. Use one found for
- // one of the other reference fields. Be sure the index for the
- // name is 0. In fieldDescriptor::initialize() the index of the
- // name is checked. That check is by passed for the last nonstatic
- // oop field in a java.lang.ref.Reference which is assumed to be
- // this artificial "discovered" field. An assertion checks that
- // the name index is 0.
- assert(reference_index != 0, "Missing signature for reference");
-
- int j;
- for (j = 0; j < instanceKlass::next_offset; j++) {
- fields_with_fix->ushort_at_put(i + j,
- (*fields_ptr)->ushort_at(reference_index +j));
- }
- // Clear the public access flag and set the private access flag.
- short flags;
- flags =
- fields_with_fix->ushort_at(i + instanceKlass::access_flags_offset);
- assert(!(flags & JVM_RECOGNIZED_FIELD_MODIFIERS), "Unexpected access flags set");
- flags = flags & (~JVM_ACC_PUBLIC);
- flags = flags | JVM_ACC_PRIVATE;
- AccessFlags access_flags;
- access_flags.set_flags(flags);
- assert(!access_flags.is_public(), "Failed to clear public flag");
- assert(access_flags.is_private(), "Failed to set private flag");
- fields_with_fix->ushort_at_put(i + instanceKlass::access_flags_offset,
- flags);
-
- assert(fields_with_fix->ushort_at(i + instanceKlass::name_index_offset)
- == reference_name_index, "The fake reference name is incorrect");
- assert(fields_with_fix->ushort_at(i + instanceKlass::signature_index_offset)
- == reference_sig_index, "The fake reference signature is incorrect");
- // The type of the field is stored in the low_offset entry during
- // parsing.
- assert(fields_with_fix->ushort_at(i + instanceKlass::low_offset) ==
- NONSTATIC_OOP, "The fake reference type is incorrect");
-
- // "fields" is allocated in the permanent generation. Disgard
- // it and let it be collected.
- (*fields_ptr) = fields_with_fix;
- }
- return;
-}
-
-
-void ClassFileParser::java_lang_Class_fix_pre(int* nonstatic_field_size,
- FieldAllocationCount *fac_ptr) {
- // Add fake fields for java.lang.Class instances
- //
- // This is not particularly nice. We should consider adding a
- // private transient object field at the Java level to
- // java.lang.Class. Alternatively we could add a subclass of
- // instanceKlass which provides an accessor and size computer for
- // this field, but that appears to be more code than this hack.
- //
- // NOTE that we wedge these in at the beginning rather than the
- // end of the object because the Class layout changed between JDK
- // 1.3 and JDK 1.4 with the new reflection implementation; some
- // nonstatic oop fields were added at the Java level. The offsets
- // of these fake fields can't change between these two JDK
- // versions because when the offsets are computed at bootstrap
- // time we don't know yet which version of the JDK we're running in.
-
- // The values below are fake but will force three non-static oop fields and
- // a corresponding non-static oop map block to be allocated.
- const int extra = java_lang_Class::number_of_fake_oop_fields;
- fac_ptr->nonstatic_oop_count += extra;
-
- // Reserve some leading space for fake ints
- *nonstatic_field_size += align_size_up(java_lang_Class::hc_number_of_fake_int_fields * BytesPerInt, heapOopSize) / heapOopSize;
-}
-
-
-void ClassFileParser::java_lang_Class_fix_post(int* next_nonstatic_oop_offset_ptr) {
- // Cause the extra fake fields in java.lang.Class to show up before
- // the Java fields for layout compatibility between 1.3 and 1.4
- // Incrementing next_nonstatic_oop_offset here advances the
- // location where the real java fields are placed.
- const int extra = java_lang_Class::number_of_fake_oop_fields;
- (*next_nonstatic_oop_offset_ptr) += (extra * heapOopSize);
-}
-
-
-// Force MethodHandle.vmentry to be an unmanaged pointer.
-// There is no way for a classfile to express this, so we must help it.
-void ClassFileParser::java_lang_invoke_MethodHandle_fix_pre(constantPoolHandle cp,
- typeArrayHandle fields,
- FieldAllocationCount *fac_ptr,
- TRAPS) {
- // Add fake fields for java.lang.invoke.MethodHandle instances
- //
- // This is not particularly nice, but since there is no way to express
- // a native wordSize field in Java, we must do it at this level.
-
- if (!EnableInvokeDynamic) return;
-
- int word_sig_index = 0;
- const int cp_size = cp->length();
- for (int index = 1; index < cp_size; index++) {
- if (cp->tag_at(index).is_utf8() &&
- cp->symbol_at(index) == vmSymbols::machine_word_signature()) {
- word_sig_index = index;
- break;
- }
- }
-
- if (word_sig_index == 0)
- THROW_MSG(vmSymbols::java_lang_VirtualMachineError(),
- "missing I or J signature (for vmentry) in java.lang.invoke.MethodHandle");
-
- // Find vmentry field and change the signature.
- bool found_vmentry = false;
- for (int i = 0; i < fields->length(); i += instanceKlass::next_offset) {
- int name_index = fields->ushort_at(i + instanceKlass::name_index_offset);
- int sig_index = fields->ushort_at(i + instanceKlass::signature_index_offset);
- int acc_flags = fields->ushort_at(i + instanceKlass::access_flags_offset);
- Symbol* f_name = cp->symbol_at(name_index);
- Symbol* f_sig = cp->symbol_at(sig_index);
- if (f_name == vmSymbols::vmentry_name() && (acc_flags & JVM_ACC_STATIC) == 0) {
- if (f_sig == vmSymbols::machine_word_signature()) {
- // If the signature of vmentry is already changed, we're done.
- found_vmentry = true;
- break;
- }
- else if (f_sig == vmSymbols::byte_signature()) {
- // Adjust the field type from byte to an unmanaged pointer.
- assert(fac_ptr->nonstatic_byte_count > 0, "");
- fac_ptr->nonstatic_byte_count -= 1;
-
- fields->ushort_at_put(i + instanceKlass::signature_index_offset, word_sig_index);
- assert(wordSize == longSize || wordSize == jintSize, "ILP32 or LP64");
- if (wordSize == longSize) fac_ptr->nonstatic_double_count += 1;
- else fac_ptr->nonstatic_word_count += 1;
-
- FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i + instanceKlass::low_offset);
- assert(atype == NONSTATIC_BYTE, "");
- FieldAllocationType new_atype = (wordSize == longSize) ? NONSTATIC_DOUBLE : NONSTATIC_WORD;
- fields->ushort_at_put(i + instanceKlass::low_offset, new_atype);
-
- found_vmentry = true;
- break;
- }
- }
- }
-
- if (!found_vmentry)
- THROW_MSG(vmSymbols::java_lang_VirtualMachineError(),
- "missing vmentry byte field in java.lang.invoke.MethodHandle");
-}
-
-
instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
Handle class_loader,
Handle protection_domain,
@@ -3025,10 +2843,13 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
local_interfaces = parse_interfaces(cp, itfs_len, class_loader, protection_domain, _class_name, CHECK_(nullHandle));
}
+ int java_fields_count = 0;
// Fields (offsets are filled in later)
- struct FieldAllocationCount fac = {0,0,0,0,0,0,0,0,0,0};
+ FieldAllocationCount fac;
objArrayHandle fields_annotations;
- typeArrayHandle fields = parse_fields(cp, access_flags.is_interface(), &fac, &fields_annotations, CHECK_(nullHandle));
+ typeArrayHandle fields = parse_fields(class_name, cp, access_flags.is_interface(), &fac, &fields_annotations,
+ &java_fields_count,
+ CHECK_(nullHandle));
// Methods
bool has_final_method = false;
AccessFlags promoted_flags;
@@ -3146,51 +2967,33 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
// Calculate the starting byte offsets
next_static_oop_offset = instanceMirrorKlass::offset_of_static_fields();
next_static_double_offset = next_static_oop_offset +
- (fac.static_oop_count * heapOopSize);
- if ( fac.static_double_count &&
+ (fac.count[STATIC_OOP] * heapOopSize);
+ if ( fac.count[STATIC_DOUBLE] &&
(Universe::field_type_should_be_aligned(T_DOUBLE) ||
Universe::field_type_should_be_aligned(T_LONG)) ) {
next_static_double_offset = align_size_up(next_static_double_offset, BytesPerLong);
}
next_static_word_offset = next_static_double_offset +
- (fac.static_double_count * BytesPerLong);
+ (fac.count[STATIC_DOUBLE] * BytesPerLong);
next_static_short_offset = next_static_word_offset +
- (fac.static_word_count * BytesPerInt);
+ (fac.count[STATIC_WORD] * BytesPerInt);
next_static_byte_offset = next_static_short_offset +
- (fac.static_short_count * BytesPerShort);
+ (fac.count[STATIC_SHORT] * BytesPerShort);
next_static_type_offset = align_size_up((next_static_byte_offset +
- fac.static_byte_count ), wordSize );
+ fac.count[STATIC_BYTE] ), wordSize );
static_field_size = (next_static_type_offset -
next_static_oop_offset) / wordSize;
- // Add fake fields for java.lang.Class instances (also see below)
- if (class_name == vmSymbols::java_lang_Class() && class_loader.is_null()) {
- java_lang_Class_fix_pre(&nonstatic_field_size, &fac);
- }
-
first_nonstatic_field_offset = instanceOopDesc::base_offset_in_bytes() +
nonstatic_field_size * heapOopSize;
next_nonstatic_field_offset = first_nonstatic_field_offset;
- // adjust the vmentry field declaration in java.lang.invoke.MethodHandle
- if (EnableInvokeDynamic && class_name == vmSymbols::java_lang_invoke_MethodHandle() && class_loader.is_null()) {
- java_lang_invoke_MethodHandle_fix_pre(cp, fields, &fac, CHECK_(nullHandle));
- }
-
- // Add a fake "discovered" field if it is not present
- // for compatibility with earlier jdk's.
- if (class_name == vmSymbols::java_lang_ref_Reference()
- && class_loader.is_null()) {
- java_lang_ref_Reference_fix_pre(&fields, cp, &fac, CHECK_(nullHandle));
- }
- // end of "discovered" field compactibility fix
-
- unsigned int nonstatic_double_count = fac.nonstatic_double_count;
- unsigned int nonstatic_word_count = fac.nonstatic_word_count;
- unsigned int nonstatic_short_count = fac.nonstatic_short_count;
- unsigned int nonstatic_byte_count = fac.nonstatic_byte_count;
- unsigned int nonstatic_oop_count = fac.nonstatic_oop_count;
+ unsigned int nonstatic_double_count = fac.count[NONSTATIC_DOUBLE];
+ unsigned int nonstatic_word_count = fac.count[NONSTATIC_WORD];
+ unsigned int nonstatic_short_count = fac.count[NONSTATIC_SHORT];
+ unsigned int nonstatic_byte_count = fac.count[NONSTATIC_BYTE];
+ unsigned int nonstatic_oop_count = fac.count[NONSTATIC_OOP];
bool super_has_nonstatic_fields =
(super_klass() != NULL && super_klass->has_nonstatic_fields());
@@ -3210,20 +3013,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
nonstatic_oop_counts = NEW_RESOURCE_ARRAY_IN_THREAD(
THREAD, unsigned int, nonstatic_oop_count + 1);
- // Add fake fields for java.lang.Class instances (also see above).
- // FieldsAllocationStyle and CompactFields values will be reset to default.
- if(class_name == vmSymbols::java_lang_Class() && class_loader.is_null()) {
- java_lang_Class_fix_post(&next_nonstatic_field_offset);
- nonstatic_oop_offsets[0] = first_nonstatic_field_offset;
- const uint fake_oop_count = (next_nonstatic_field_offset -
- first_nonstatic_field_offset) / heapOopSize;
- nonstatic_oop_counts[0] = fake_oop_count;
- nonstatic_oop_map_count = 1;
- nonstatic_oop_count -= fake_oop_count;
- first_nonstatic_oop_offset = first_nonstatic_field_offset;
- } else {
- first_nonstatic_oop_offset = 0; // will be set for first oop field
- }
+ first_nonstatic_oop_offset = 0; // will be set for first oop field
#ifndef PRODUCT
if( PrintCompactFieldsSavings ) {
@@ -3378,10 +3168,9 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
// Iterate over fields again and compute correct offsets.
// The field allocation type was temporarily stored in the offset slot.
// oop fields are located before non-oop fields (static and non-static).
- int len = fields->length();
- for (int i = 0; i < len; i += instanceKlass::next_offset) {
+ for (AllFieldStream fs(fields, cp); !fs.done(); fs.next()) {
int real_offset;
- FieldAllocationType atype = (FieldAllocationType) fields->ushort_at(i + instanceKlass::low_offset);
+ FieldAllocationType atype = (FieldAllocationType) fs.offset();
switch (atype) {
case STATIC_OOP:
real_offset = next_static_oop_offset;
@@ -3399,7 +3188,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
real_offset = next_static_word_offset;
next_static_word_offset += BytesPerInt;
break;
- case STATIC_ALIGNED_DOUBLE:
case STATIC_DOUBLE:
real_offset = next_static_double_offset;
next_static_double_offset += BytesPerLong;
@@ -3461,7 +3249,6 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
next_nonstatic_word_offset += BytesPerInt;
}
break;
- case NONSTATIC_ALIGNED_DOUBLE:
case NONSTATIC_DOUBLE:
real_offset = next_nonstatic_double_offset;
next_nonstatic_double_offset += BytesPerLong;
@@ -3469,8 +3256,7 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
default:
ShouldNotReachHere();
}
- fields->short_at_put(i + instanceKlass::low_offset, extract_low_short_from_int(real_offset));
- fields->short_at_put(i + instanceKlass::high_offset, extract_high_short_from_int(real_offset));
+ fs.set_offset(real_offset);
}
// Size of instances
@@ -3517,12 +3303,12 @@ instanceKlassHandle ClassFileParser::parseClassFile(Symbol* name,
this_klass->set_class_loader(class_loader());
this_klass->set_nonstatic_field_size(nonstatic_field_size);
this_klass->set_has_nonstatic_fields(has_nonstatic_fields);
- this_klass->set_static_oop_field_count(fac.static_oop_count);
+ this_klass->set_static_oop_field_count(fac.count[STATIC_OOP]);
cp->set_pool_holder(this_klass());
error_handler.set_in_error(false); // turn off error handler for cp
this_klass->set_constants(cp());
this_klass->set_local_interfaces(local_interfaces());
- this_klass->set_fields(fields());
+ this_klass->set_fields(fields(), java_fields_count);
this_klass->set_methods(methods());
if (has_final_method) {
this_klass->set_has_final_method();
diff --git a/hotspot/src/share/vm/classfile/classFileParser.hpp b/hotspot/src/share/vm/classfile/classFileParser.hpp
index 97ae755..8e0db56 100644
--- a/hotspot/src/share/vm/classfile/classFileParser.hpp
+++ b/hotspot/src/share/vm/classfile/classFileParser.hpp
@@ -33,6 +33,9 @@
#include "utilities/accessFlags.hpp"
class TempNewSymbol;
+class FieldAllocationCount;
+
+
// Parser for for .class files
//
// The bytes describing the class file structure is read from a Stream object
@@ -84,9 +87,11 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
bool* is_synthetic_addr,
u2* generic_signature_index_addr,
typeArrayHandle* field_annotations, TRAPS);
- typeArrayHandle parse_fields(constantPoolHandle cp, bool is_interface,
- struct FieldAllocationCount *fac,
- objArrayHandle* fields_annotations, TRAPS);
+ typeArrayHandle parse_fields(Symbol* class_name,
+ constantPoolHandle cp, bool is_interface,
+ FieldAllocationCount *fac,
+ objArrayHandle* fields_annotations,
+ int* java_fields_count_ptr, TRAPS);
// Method parsing
methodHandle parse_method(constantPoolHandle cp, bool is_interface,
@@ -150,25 +155,6 @@ class ClassFileParser VALUE_OBJ_CLASS_SPEC {
objArrayHandle compute_transitive_interfaces(instanceKlassHandle super,
objArrayHandle local_ifs, TRAPS);
- // Special handling for certain classes.
- // Add the "discovered" field to java.lang.ref.Reference if
- // it does not exist.
- void java_lang_ref_Reference_fix_pre(typeArrayHandle* fields_ptr,
- constantPoolHandle cp,
- FieldAllocationCount *fac_ptr, TRAPS);
- // Adjust the field allocation counts for java.lang.Class to add
- // fake fields.
- void java_lang_Class_fix_pre(int* nonstatic_field_size,
- FieldAllocationCount *fac_ptr);
- // Adjust the next_nonstatic_oop_offset to place the fake fields
- // before any Java fields.
- void java_lang_Class_fix_post(int* next_nonstatic_oop_offset);
- // Adjust the field allocation counts for java.lang.invoke.MethodHandle to add
- // a fake address (void*) field.
- void java_lang_invoke_MethodHandle_fix_pre(constantPoolHandle cp,
- typeArrayHandle fields,
- FieldAllocationCount *fac_ptr, TRAPS);
-
// Format checker methods
void classfile_parse_error(const char* msg, TRAPS);
void classfile_parse_error(const char* msg, int index, TRAPS);
diff --git a/hotspot/src/share/vm/classfile/classLoader.cpp b/hotspot/src/share/vm/classfile/classLoader.cpp
index 7c1bb11..47b5898 100644
--- a/hotspot/src/share/vm/classfile/classLoader.cpp
+++ b/hotspot/src/share/vm/classfile/classLoader.cpp
@@ -68,6 +68,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// Entry points in zip.dll for loading zip/jar file entries
@@ -1356,13 +1359,13 @@ void ClassLoader::compile_the_world_in(char* name, Handle loader, TRAPS) {
_codecache_sweep_counter = 0;
}
// Force compilation
- CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_initial_compile,
+ CompileBroker::compile_method(m, InvocationEntryBci, CompilationPolicy::policy()->initial_compile_level(),
methodHandle(), 0, "CTW", THREAD);
if (HAS_PENDING_EXCEPTION) {
clear_pending_exception_if_not_oom(CHECK);
tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_counter, m->name()->as_C_string());
}
- if (TieredCompilation) {
+ if (TieredCompilation && TieredStopAtLevel >= CompLevel_full_optimization) {
// Clobber the first compile and force second tier compilation
nmethod* nm = m->code();
if (nm != NULL) {
diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp
index 684e96d..385899a 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.cpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.cpp
@@ -28,10 +28,12 @@
#include "classfile/vmSymbols.hpp"
#include "code/debugInfo.hpp"
#include "code/pcDesc.hpp"
+#include "compiler/compilerOracle.hpp"
#include "interpreter/interpreter.hpp"
#include "memory/oopFactory.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.inline.hpp"
+#include "oops/fieldStreams.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/klass.hpp"
@@ -56,6 +58,52 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
+
+#define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \
+ klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum);
+
+#define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \
+ { SystemDictionary::WK_KLASS_ENUM_NAME(klass), vmSymbols::VM_SYMBOL_ENUM_NAME(name##_name), vmSymbols::VM_SYMBOL_ENUM_NAME(signature), may_be_java },
+
+InjectedField JavaClasses::_injected_fields[] = {
+ ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD)
+};
+
+int JavaClasses::compute_injected_offset(InjectedFieldID id) {
+ return _injected_fields[id].compute_offset();
+}
+
+
+InjectedField* JavaClasses::get_injected(Symbol* class_name, int* field_count) {
+ *field_count = 0;
+
+ vmSymbols::SID sid = vmSymbols::find_sid(class_name);
+ if (sid == vmSymbols::NO_SID) {
+ // Only well known classes can inject fields
+ return NULL;
+ }
+
+ int count = 0;
+ int start = -1;
+
+#define LOOKUP_INJECTED_FIELD(klass, name, signature, may_be_java) \
+ if (sid == vmSymbols::VM_SYMBOL_ENUM_NAME(klass)) { \
+ count++; \
+ if (start == -1) start = klass##_##name##_enum; \
+ }
+ ALL_INJECTED_FIELDS(LOOKUP_INJECTED_FIELD);
+#undef LOOKUP_INJECTED_FIELD
+
+ if (start != -1) {
+ *field_count = count;
+ return _injected_fields + start;
+ }
+ return NULL;
+}
+
static bool find_field(instanceKlass* ik,
Symbol* name_symbol, Symbol* signature_symbol,
@@ -427,24 +475,19 @@ static void initialize_static_field(fieldDescriptor* fd, TRAPS) {
}
-// During bootstrap, java.lang.Class wasn't loaded so static field
-// offsets were computed without the size added it. Go back and
-// update all the static field offsets to included the size.
-static void fixup_static_field(fieldDescriptor* fd, TRAPS) {
- if (fd->is_static()) {
- int real_offset = fd->offset() + instanceMirrorKlass::offset_of_static_fields();
- typeArrayOop fields = instanceKlass::cast(fd->field_holder())->fields();
- fields->short_at_put(fd->index() + instanceKlass::low_offset, extract_low_short_from_int(real_offset));
- fields->short_at_put(fd->index() + instanceKlass::high_offset, extract_high_short_from_int(real_offset));
- }
-}
-
void java_lang_Class::fixup_mirror(KlassHandle k, TRAPS) {
assert(instanceMirrorKlass::offset_of_static_fields() != 0, "must have been computed already");
if (k->oop_is_instance()) {
- // Fixup the offsets
- instanceKlass::cast(k())->do_local_static_fields(&fixup_static_field, CHECK);
+ // During bootstrap, java.lang.Class wasn't loaded so static field
+ // offsets were computed without the size added it. Go back and
+ // update all the static field offsets to included the size.
+ for (JavaFieldStream fs(instanceKlass::cast(k())); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_static()) {
+ int real_offset = fs.offset() + instanceMirrorKlass::offset_of_static_fields();
+ fs.set_offset(real_offset);
+ }
+ }
}
create_mirror(k, CHECK);
}
@@ -461,7 +504,7 @@ oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) {
// Allocate mirror (java.lang.Class instance)
Handle mirror = instanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK_0);
// Setup indirections
- mirror->obj_field_put(klass_offset, k());
+ mirror->obj_field_put(_klass_offset, k());
k->set_java_mirror(mirror());
instanceMirrorKlass* mk = instanceMirrorKlass::cast(mirror->klass());
@@ -503,25 +546,22 @@ oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) {
int java_lang_Class::oop_size(oop java_class) {
- assert(oop_size_offset != 0, "must be set");
- return java_class->int_field(oop_size_offset);
+ assert(_oop_size_offset != 0, "must be set");
+ return java_class->int_field(_oop_size_offset);
}
void java_lang_Class::set_oop_size(oop java_class, int size) {
- assert(oop_size_offset != 0, "must be set");
- java_class->int_field_put(oop_size_offset, size);
+ assert(_oop_size_offset != 0, "must be set");
+ java_class->int_field_put(_oop_size_offset, size);
}
int java_lang_Class::static_oop_field_count(oop java_class) {
- assert(static_oop_field_count_offset != 0, "must be set");
- return java_class->int_field(static_oop_field_count_offset);
+ assert(_static_oop_field_count_offset != 0, "must be set");
+ return java_class->int_field(_static_oop_field_count_offset);
}
void java_lang_Class::set_static_oop_field_count(oop java_class, int size) {
- assert(static_oop_field_count_offset != 0, "must be set");
- java_class->int_field_put(static_oop_field_count_offset, size);
+ assert(_static_oop_field_count_offset != 0, "must be set");
+ java_class->int_field_put(_static_oop_field_count_offset, size);
}
-
-
-
oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) {
// This should be improved by adding a field at the Java level or by
// introducing a new VM klass (see comment in ClassFileParser)
@@ -541,7 +581,7 @@ oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, Basic
klassOop java_lang_Class::as_klassOop(oop java_class) {
//%note memory_2
assert(java_lang_Class::is_instance(java_class), "must be a Class object");
- klassOop k = klassOop(java_class->obj_field(klass_offset));
+ klassOop k = klassOop(java_class->obj_field(_klass_offset));
assert(k == NULL || k->is_klass(), "type check");
return k;
}
@@ -597,7 +637,7 @@ Symbol* java_lang_Class::as_signature(oop java_class, bool intern_if_not_found,
klassOop java_lang_Class::array_klass(oop java_class) {
- klassOop k = klassOop(java_class->obj_field(array_klass_offset));
+ klassOop k = klassOop(java_class->obj_field(_array_klass_offset));
assert(k == NULL || k->is_klass() && Klass::cast(k)->oop_is_javaArray(), "should be array klass");
return k;
}
@@ -605,12 +645,12 @@ klassOop java_lang_Class::array_klass(oop java_class) {
void java_lang_Class::set_array_klass(oop java_class, klassOop klass) {
assert(klass->is_klass() && Klass::cast(klass)->oop_is_javaArray(), "should be array klass");
- java_class->obj_field_put(array_klass_offset, klass);
+ java_class->obj_field_put(_array_klass_offset, klass);
}
methodOop java_lang_Class::resolved_constructor(oop java_class) {
- oop constructor = java_class->obj_field(resolved_constructor_offset);
+ oop constructor = java_class->obj_field(_resolved_constructor_offset);
assert(constructor == NULL || constructor->is_method(), "should be method");
return methodOop(constructor);
}
@@ -618,21 +658,21 @@ methodOop java_lang_Class::resolved_constructor(oop java_class) {
void java_lang_Class::set_resolved_constructor(oop java_class, methodOop constructor) {
assert(constructor->is_method(), "should be method");
- java_class->obj_field_put(resolved_constructor_offset, constructor);
+ java_class->obj_field_put(_resolved_constructor_offset, constructor);
}
bool java_lang_Class::is_primitive(oop java_class) {
// should assert:
//assert(java_lang_Class::is_instance(java_class), "must be a Class object");
- klassOop k = klassOop(java_class->obj_field(klass_offset));
+ klassOop k = klassOop(java_class->obj_field(_klass_offset));
return k == NULL;
}
BasicType java_lang_Class::primitive_type(oop java_class) {
assert(java_lang_Class::is_primitive(java_class), "just checking");
- klassOop ak = klassOop(java_class->obj_field(array_klass_offset));
+ klassOop ak = klassOop(java_class->obj_field(_array_klass_offset));
BasicType type = T_VOID;
if (ak != NULL) {
// Note: create_basic_type_mirror above initializes ak to a non-null value.
@@ -667,34 +707,18 @@ oop java_lang_Class::primitive_mirror(BasicType t) {
bool java_lang_Class::offsets_computed = false;
int java_lang_Class::classRedefinedCount_offset = -1;
-int java_lang_Class::parallelCapable_offset = -1;
void java_lang_Class::compute_offsets() {
assert(!offsets_computed, "offsets should be initialized only once");
offsets_computed = true;
- klassOop k = SystemDictionary::Class_klass();
+ klassOop klass_oop = SystemDictionary::Class_klass();
// The classRedefinedCount field is only present starting in 1.5,
// so don't go fatal.
compute_optional_offset(classRedefinedCount_offset,
- k, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature());
+ klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature());
- // The field indicating parallelCapable (parallelLockMap) is only present starting in 7,
- klassOop k1 = SystemDictionary::ClassLoader_klass();
- compute_optional_offset(parallelCapable_offset,
- k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature());
-}
-
-// For class loader classes, parallelCapable defined
-// based on non-null field
-// Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it
-bool java_lang_Class::parallelCapable(oop class_loader) {
- if (!JDK_Version::is_gte_jdk17x_version()
- || parallelCapable_offset == -1) {
- // Default for backward compatibility is false
- return false;
- }
- return (class_loader->obj_field(parallelCapable_offset) != NULL);
+ CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
}
int java_lang_Class::classRedefinedCount(oop the_class_mirror) {
@@ -1019,6 +1043,16 @@ void java_lang_ThreadGroup::compute_offsets() {
compute_offset(_ngroups_offset, k, vmSymbols::ngroups_name(), vmSymbols::int_signature());
}
+oop java_lang_Throwable::unassigned_stacktrace() {
+ instanceKlass* ik = instanceKlass::cast(SystemDictionary::Throwable_klass());
+ address addr = ik->static_field_addr(static_unassigned_stacktrace_offset);
+ if (UseCompressedOops) {
+ return oopDesc::load_decode_heap_oop((narrowOop *)addr);
+ } else {
+ return oopDesc::load_decode_heap_oop((oop*)addr);
+ }
+}
+
oop java_lang_Throwable::backtrace(oop throwable) {
return throwable->obj_field_acquire(backtrace_offset);
}
@@ -1044,9 +1078,13 @@ void java_lang_Throwable::set_message(oop throwable, oop value) {
}
+void java_lang_Throwable::set_stacktrace(oop throwable, oop st_element_array) {
+ throwable->obj_field_put(stackTrace_offset, st_element_array);
+}
+
void java_lang_Throwable::clear_stacktrace(oop throwable) {
assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4");
- throwable->obj_field_put(stackTrace_offset, NULL);
+ set_stacktrace(throwable, NULL);
}
@@ -1110,7 +1148,7 @@ char* java_lang_Throwable::print_stack_element_to_buffer(methodOop method, int b
}
nmethod* nm = method->code();
if (WizardMode && nm != NULL) {
- sprintf(buf + (int)strlen(buf), "(nmethod " PTR_FORMAT ")", (intptr_t)nm);
+ sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm);
}
}
@@ -1340,6 +1378,7 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle met
if (JDK_Version::is_gte_jdk14x_version()) {
// New since 1.4, clear lazily constructed Java level stacktrace if
// refilling occurs
+ // This is unnecessary in 1.7+ but harmless
clear_stacktrace(throwable());
}
@@ -1541,6 +1580,15 @@ void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle t
// Bail-out for deep stacks
if (chunk_count >= max_chunks) break;
}
+
+ // For Java 7+ we support the Throwable immutability protocol defined for Java 7. This support
+ // was missing in 7u0 so in 7u0 there is a workaround in the Throwable class. That workaround
+ // can be removed in a JDK using this JVM version
+ if (JDK_Version::is_gte_jdk17x_version()) {
+ java_lang_Throwable::set_stacktrace(throwable(), java_lang_Throwable::unassigned_stacktrace());
+ assert(java_lang_Throwable::unassigned_stacktrace() != NULL, "not initialized");
+ }
+
}
@@ -2283,7 +2331,6 @@ void java_lang_ref_SoftReference::set_clock(jlong value) {
int java_lang_invoke_MethodHandle::_type_offset;
int java_lang_invoke_MethodHandle::_vmtarget_offset;
int java_lang_invoke_MethodHandle::_vmentry_offset;
-int java_lang_invoke_MethodHandle::_vmslots_offset;
int java_lang_invoke_MemberName::_clazz_offset;
int java_lang_invoke_MemberName::_name_offset;
@@ -2299,36 +2346,33 @@ int java_lang_invoke_BoundMethodHandle::_vmargslot_offset;
int java_lang_invoke_AdapterMethodHandle::_conversion_offset;
+int java_lang_invoke_CountingMethodHandle::_vmcount_offset;
+
void java_lang_invoke_MethodHandle::compute_offsets() {
- klassOop k = SystemDictionary::MethodHandle_klass();
- if (k != NULL && EnableInvokeDynamic) {
+ klassOop klass_oop = SystemDictionary::MethodHandle_klass();
+ if (klass_oop != NULL && EnableInvokeDynamic) {
bool allow_super = false;
- compute_offset(_type_offset, k, vmSymbols::type_name(), vmSymbols::java_lang_invoke_MethodType_signature(), allow_super);
- compute_offset(_vmtarget_offset, k, vmSymbols::vmtarget_name(), vmSymbols::object_signature(), allow_super);
- compute_offset(_vmentry_offset, k, vmSymbols::vmentry_name(), vmSymbols::machine_word_signature(), allow_super);
-
- // Note: MH.vmslots (if it is present) is a hoisted copy of MH.type.form.vmslots.
- // It is optional pending experiments to keep or toss.
- compute_optional_offset(_vmslots_offset, k, vmSymbols::vmslots_name(), vmSymbols::int_signature(), allow_super);
+ compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::java_lang_invoke_MethodType_signature(), allow_super);
+ METHODHANDLE_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
}
}
void java_lang_invoke_MemberName::compute_offsets() {
- klassOop k = SystemDictionary::MemberName_klass();
- if (k != NULL && EnableInvokeDynamic) {
- compute_offset(_clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature());
- compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature());
- compute_offset(_type_offset, k, vmSymbols::type_name(), vmSymbols::object_signature());
- compute_offset(_flags_offset, k, vmSymbols::flags_name(), vmSymbols::int_signature());
- compute_offset(_vmtarget_offset, k, vmSymbols::vmtarget_name(), vmSymbols::object_signature());
- compute_offset(_vmindex_offset, k, vmSymbols::vmindex_name(), vmSymbols::int_signature());
+ klassOop klass_oop = SystemDictionary::MemberName_klass();
+ if (klass_oop != NULL && EnableInvokeDynamic) {
+ compute_offset(_clazz_offset, klass_oop, vmSymbols::clazz_name(), vmSymbols::class_signature());
+ compute_offset(_name_offset, klass_oop, vmSymbols::name_name(), vmSymbols::string_signature());
+ compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::object_signature());
+ compute_offset(_flags_offset, klass_oop, vmSymbols::flags_name(), vmSymbols::int_signature());
+ compute_offset(_vmindex_offset, klass_oop, vmSymbols::vmindex_name(), vmSymbols::int_signature());
+ MEMBERNAME_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
}
}
void java_lang_invoke_DirectMethodHandle::compute_offsets() {
klassOop k = SystemDictionary::DirectMethodHandle_klass();
if (k != NULL && EnableInvokeDynamic) {
- compute_offset(_vmindex_offset, k, vmSymbols::vmindex_name(), vmSymbols::int_signature(), true);
+ DIRECTMETHODHANDLE_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
}
}
@@ -2347,39 +2391,34 @@ void java_lang_invoke_AdapterMethodHandle::compute_offsets() {
}
}
-oop java_lang_invoke_MethodHandle::type(oop mh) {
- return mh->obj_field(_type_offset);
+void java_lang_invoke_CountingMethodHandle::compute_offsets() {
+ klassOop k = SystemDictionary::CountingMethodHandle_klass();
+ if (k != NULL && EnableInvokeDynamic) {
+ compute_offset(_vmcount_offset, k, vmSymbols::vmcount_name(), vmSymbols::int_signature(), true);
+ }
}
-void java_lang_invoke_MethodHandle::set_type(oop mh, oop mtype) {
- mh->obj_field_put(_type_offset, mtype);
+int java_lang_invoke_CountingMethodHandle::vmcount(oop mh) {
+ assert(is_instance(mh), "CMH only");
+ return mh->int_field(_vmcount_offset);
}
-int java_lang_invoke_MethodHandle::vmslots(oop mh) {
- int vmslots_offset = _vmslots_offset;
- if (vmslots_offset != 0) {
-#ifdef ASSERT
- int x = mh->int_field(vmslots_offset);
- int y = compute_vmslots(mh);
- assert(x == y, "correct hoisted value");
-#endif
- return mh->int_field(vmslots_offset);
- } else {
- return compute_vmslots(mh);
- }
+void java_lang_invoke_CountingMethodHandle::set_vmcount(oop mh, int count) {
+ assert(is_instance(mh), "CMH only");
+ mh->int_field_put(_vmcount_offset, count);
}
-// if MH.vmslots exists, hoist into it the value of type.form.vmslots
-void java_lang_invoke_MethodHandle::init_vmslots(oop mh) {
- int vmslots_offset = _vmslots_offset;
- if (vmslots_offset != 0) {
- mh->int_field_put(vmslots_offset, compute_vmslots(mh));
- }
+oop java_lang_invoke_MethodHandle::type(oop mh) {
+ return mh->obj_field(_type_offset);
+}
+
+void java_lang_invoke_MethodHandle::set_type(oop mh, oop mtype) {
+ mh->obj_field_put(_type_offset, mtype);
}
// fetch type.form.vmslots, which is the number of JVM stack slots
// required to carry the arguments of this MH
-int java_lang_invoke_MethodHandle::compute_vmslots(oop mh) {
+int java_lang_invoke_MethodHandle::vmslots(oop mh) {
oop mtype = type(mh);
if (mtype == NULL) return 0; // Java code would get NPE
oop form = java_lang_invoke_MethodType::form(mtype);
@@ -2599,6 +2638,7 @@ void java_lang_invoke_MethodTypeForm::compute_offsets() {
compute_optional_offset(_erasedType_offset, k, vmSymbols::erasedType_name(), vmSymbols::java_lang_invoke_MethodType_signature(), true);
compute_optional_offset(_genericInvoker_offset, k, vmSymbols::genericInvoker_name(), vmSymbols::java_lang_invoke_MethodHandle_signature(), true);
if (_genericInvoker_offset == 0) _genericInvoker_offset = -1; // set to explicit "empty" value
+ METHODTYPEFORM_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET);
}
}
@@ -2650,14 +2690,17 @@ void java_lang_invoke_CallSite::compute_offsets() {
if (k != NULL) {
compute_offset(_target_offset, k, vmSymbols::target_name(), vmSymbols::java_lang_invoke_MethodHandle_signature());
}
-}
-
-oop java_lang_invoke_CallSite::target(oop site) {
- return site->obj_field(_target_offset);
-}
-void java_lang_invoke_CallSite::set_target(oop site, oop target) {
- site->obj_field_put(_target_offset, target);
+ // Disallow compilation of CallSite.setTargetNormal and CallSite.setTargetVolatile
+ // (For C2: keep this until we have throttling logic for uncommon traps.)
+ if (k != NULL) {
+ instanceKlass* ik = instanceKlass::cast(k);
+ methodOop m_normal = ik->lookup_method(vmSymbols::setTargetNormal_name(), vmSymbols::setTarget_signature());
+ methodOop m_volatile = ik->lookup_method(vmSymbols::setTargetVolatile_name(), vmSymbols::setTarget_signature());
+ guarantee(m_normal != NULL && m_volatile != NULL, "must exist");
+ m_normal->set_not_compilable_quietly();
+ m_volatile->set_not_compilable_quietly();
+ }
}
@@ -2704,6 +2747,18 @@ oop java_security_AccessControlContext::create(objArrayHandle context, bool isPr
// Support for java_lang_ClassLoader
+bool java_lang_ClassLoader::offsets_computed = false;
+int java_lang_ClassLoader::parallelCapable_offset = -1;
+
+void java_lang_ClassLoader::compute_offsets() {
+ assert(!offsets_computed, "offsets should be initialized only once");
+ offsets_computed = true;
+
+ // The field indicating parallelCapable (parallelLockMap) is only present starting in 7,
+ klassOop k1 = SystemDictionary::ClassLoader_klass();
+ compute_optional_offset(parallelCapable_offset,
+ k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature());
+}
oop java_lang_ClassLoader::parent(oop loader) {
assert(loader->is_oop(), "loader must be oop");
@@ -2711,6 +2766,18 @@ oop java_lang_ClassLoader::parent(oop loader) {
}
+// For class loader classes, parallelCapable defined
+// based on non-null field
+// Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it
+bool java_lang_ClassLoader::parallelCapable(oop class_loader) {
+ if (!JDK_Version::is_gte_jdk17x_version()
+ || parallelCapable_offset == -1) {
+ // Default for backward compatibility is false
+ return false;
+ }
+ return (class_loader->obj_field(parallelCapable_offset) != NULL);
+}
+
bool java_lang_ClassLoader::is_trusted_loader(oop loader) {
// Fix for 4474172; see evaluation for more details
loader = non_reflection_class_loader(loader);
@@ -2760,16 +2827,16 @@ int java_lang_String::value_offset;
int java_lang_String::offset_offset;
int java_lang_String::count_offset;
int java_lang_String::hash_offset;
-int java_lang_Class::klass_offset;
-int java_lang_Class::array_klass_offset;
-int java_lang_Class::resolved_constructor_offset;
-int java_lang_Class::number_of_fake_oop_fields;
-int java_lang_Class::oop_size_offset;
-int java_lang_Class::static_oop_field_count_offset;
+int java_lang_Class::_klass_offset;
+int java_lang_Class::_array_klass_offset;
+int java_lang_Class::_resolved_constructor_offset;
+int java_lang_Class::_oop_size_offset;
+int java_lang_Class::_static_oop_field_count_offset;
int java_lang_Throwable::backtrace_offset;
int java_lang_Throwable::detailMessage_offset;
int java_lang_Throwable::cause_offset;
int java_lang_Throwable::stackTrace_offset;
+int java_lang_Throwable::static_unassigned_stacktrace_offset;
int java_lang_reflect_AccessibleObject::override_offset;
int java_lang_reflect_Method::clazz_offset;
int java_lang_reflect_Method::name_offset;
@@ -2877,20 +2944,20 @@ int java_nio_Buffer::limit_offset() {
void java_nio_Buffer::compute_offsets() {
- klassOop k = SystemDictionary::java_nio_Buffer_klass();
+ klassOop k = SystemDictionary::nio_Buffer_klass();
assert(k != NULL, "must be loaded in 1.4+");
compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature());
}
// Support for intrinsification of sun.misc.AtomicLongCSImpl.attemptUpdate
int sun_misc_AtomicLongCSImpl::value_offset() {
- assert(SystemDictionary::sun_misc_AtomicLongCSImpl_klass() != NULL, "can't call this");
+ assert(SystemDictionary::AtomicLongCSImpl_klass() != NULL, "can't call this");
return _value_offset;
}
void sun_misc_AtomicLongCSImpl::compute_offsets() {
- klassOop k = SystemDictionary::sun_misc_AtomicLongCSImpl_klass();
+ klassOop k = SystemDictionary::AtomicLongCSImpl_klass();
// If this class is not present, its value field offset won't be referenced.
if (k != NULL) {
compute_offset(_value_offset, k, vmSymbols::value_name(), vmSymbols::long_signature());
@@ -2925,28 +2992,12 @@ void JavaClasses::compute_hard_coded_offsets() {
java_lang_String::count_offset = java_lang_String::offset_offset + sizeof (jint);
java_lang_String::hash_offset = java_lang_String::count_offset + sizeof (jint);
- {
- // Do the Class Class
- int offset = header;
- java_lang_Class::oop_size_offset = header;
- offset += BytesPerInt;
- java_lang_Class::static_oop_field_count_offset = offset;
- offset = align_size_up(offset + BytesPerInt, x);
- java_lang_Class::klass_offset = offset;
- offset += x;
- java_lang_Class::array_klass_offset = offset;
- offset += x;
- java_lang_Class::resolved_constructor_offset = offset;
- }
-
- // This is NOT an offset
- java_lang_Class::number_of_fake_oop_fields = java_lang_Class::hc_number_of_fake_oop_fields;
-
// Throwable Class
java_lang_Throwable::backtrace_offset = java_lang_Throwable::hc_backtrace_offset * x + header;
java_lang_Throwable::detailMessage_offset = java_lang_Throwable::hc_detailMessage_offset * x + header;
java_lang_Throwable::cause_offset = java_lang_Throwable::hc_cause_offset * x + header;
java_lang_Throwable::stackTrace_offset = java_lang_Throwable::hc_stackTrace_offset * x + header;
+ java_lang_Throwable::static_unassigned_stacktrace_offset = java_lang_Throwable::hc_static_unassigned_stacktrace_offset * x;
// java_lang_boxing_object
java_lang_boxing_object::value_offset = java_lang_boxing_object::hc_value_offset + header;
@@ -2992,8 +3043,8 @@ void JavaClasses::compute_hard_coded_offsets() {
// Compute non-hard-coded field offsets of all the classes in this file
void JavaClasses::compute_offsets() {
-
- java_lang_Class::compute_offsets();
+ // java_lang_Class::compute_offsets was called earlier in bootstrap
+ java_lang_ClassLoader::compute_offsets();
java_lang_Thread::compute_offsets();
java_lang_ThreadGroup::compute_offsets();
if (EnableInvokeDynamic) {
@@ -3005,6 +3056,7 @@ void JavaClasses::compute_offsets() {
java_lang_invoke_MethodType::compute_offsets();
java_lang_invoke_MethodTypeForm::compute_offsets();
java_lang_invoke_CallSite::compute_offsets();
+ java_lang_invoke_CountingMethodHandle::compute_offsets();
}
java_security_AccessControlContext::compute_offsets();
// Initialize reflection classes. The layouts of these classes
@@ -3217,6 +3269,23 @@ void JavaClasses::check_offsets() {
#endif // PRODUCT
+int InjectedField::compute_offset() {
+ klassOop klass_oop = klass();
+ for (AllFieldStream fs(instanceKlass::cast(klass_oop)); !fs.done(); fs.next()) {
+ if (!may_be_java && !fs.access_flags().is_internal()) {
+ // Only look at injected fields
+ continue;
+ }
+ if (fs.name() == name() && fs.signature() == signature()) {
+ return fs.offset();
+ }
+ }
+ ResourceMark rm;
+ tty->print_cr("Invalid layout of %s at %s", instanceKlass::cast(klass_oop)->external_name(), name()->as_C_string());
+ fatal("Invalid layout of preloaded class");
+ return -1;
+}
+
void javaClasses_init() {
JavaClasses::compute_offsets();
JavaClasses::check_offsets();
diff --git a/hotspot/src/share/vm/classfile/javaClasses.hpp b/hotspot/src/share/vm/classfile/javaClasses.hpp
index 02c0ce9..fca9897 100644
--- a/hotspot/src/share/vm/classfile/javaClasses.hpp
+++ b/hotspot/src/share/vm/classfile/javaClasses.hpp
@@ -156,30 +156,32 @@ class java_lang_String : AllStatic {
// Interface to java.lang.Class objects
+#define CLASS_INJECTED_FIELDS(macro) \
+ macro(java_lang_Class, klass, object_signature, false) \
+ macro(java_lang_Class, resolved_constructor, object_signature, false) \
+ macro(java_lang_Class, array_klass, object_signature, false) \
+ macro(java_lang_Class, oop_size, int_signature, false) \
+ macro(java_lang_Class, static_oop_field_count, int_signature, false)
+
class java_lang_Class : AllStatic {
- friend class VMStructs;
+ friend class VMStructs;
+
private:
// The fake offsets are added by the class loader when java.lang.Class is loaded
- enum {
- hc_number_of_fake_oop_fields = 3,
- hc_number_of_fake_int_fields = 2
- };
+ static int _klass_offset;
+ static int _resolved_constructor_offset;
+ static int _array_klass_offset;
- static int klass_offset;
- static int resolved_constructor_offset;
- static int array_klass_offset;
- static int number_of_fake_oop_fields;
+ static int _oop_size_offset;
+ static int _static_oop_field_count_offset;
- static int oop_size_offset;
- static int static_oop_field_count_offset;
-
- static void compute_offsets();
static bool offsets_computed;
static int classRedefinedCount_offset;
- static int parallelCapable_offset;
public:
+ static void compute_offsets();
+
// Instance creation
static oop create_mirror(KlassHandle k, TRAPS);
static void fixup_mirror(KlassHandle k, TRAPS);
@@ -209,14 +211,12 @@ class java_lang_Class : AllStatic {
static klassOop array_klass(oop java_class);
static void set_array_klass(oop java_class, klassOop klass);
// compiler support for class operations
- static int klass_offset_in_bytes() { return klass_offset; }
- static int resolved_constructor_offset_in_bytes() { return resolved_constructor_offset; }
- static int array_klass_offset_in_bytes() { return array_klass_offset; }
+ static int klass_offset_in_bytes() { return _klass_offset; }
+ static int resolved_constructor_offset_in_bytes() { return _resolved_constructor_offset; }
+ static int array_klass_offset_in_bytes() { return _array_klass_offset; }
// Support for classRedefinedCount field
static int classRedefinedCount(oop the_class_mirror);
static void set_classRedefinedCount(oop the_class_mirror, int value);
- // Support for parallelCapable field
- static bool parallelCapable(oop the_class_mirror);
static int oop_size(oop java_class);
static void set_oop_size(oop java_class, int size);
@@ -393,6 +393,9 @@ class java_lang_Throwable: AllStatic {
hc_cause_offset = 2, // New since 1.4
hc_stackTrace_offset = 3 // New since 1.4
};
+ enum {
+ hc_static_unassigned_stacktrace_offset = 0 // New since 1.7
+ };
// Trace constants
enum {
trace_methods_offset = 0,
@@ -406,6 +409,7 @@ class java_lang_Throwable: AllStatic {
static int detailMessage_offset;
static int cause_offset;
static int stackTrace_offset;
+ static int static_unassigned_stacktrace_offset;
// Printing
static char* print_stack_element_to_buffer(methodOop method, int bci);
@@ -414,6 +418,9 @@ class java_lang_Throwable: AllStatic {
static void clear_stacktrace(oop throwable);
// No stack trace available
static const char* no_stack_trace_message();
+ // Stacktrace (post JDK 1.7.0 to allow immutability protocol to be followed)
+ static void set_stacktrace(oop throwable, oop st_element_array);
+ static oop unassigned_stacktrace();
public:
// Backtrace
@@ -438,7 +445,6 @@ class java_lang_Throwable: AllStatic {
static void allocate_backtrace(Handle throwable, TRAPS);
// Fill in current stack trace for throwable with preallocated backtrace (no GC)
static void fill_in_stack_trace_of_preallocated_backtrace(Handle throwable);
-
// Fill in current stack trace, can cause GC
static void fill_in_stack_trace(Handle throwable, methodHandle method, TRAPS);
static void fill_in_stack_trace(Handle throwable, methodHandle method = methodHandle());
@@ -765,7 +771,7 @@ class java_lang_ref_Reference: AllStatic {
ref->obj_field_put(referent_offset, value);
}
static void set_referent_raw(oop ref, oop value) {
- ref->obj_field_raw_put(referent_offset, value);
+ ref->obj_field_put_raw(referent_offset, value);
}
static HeapWord* referent_addr(oop ref) {
return ref->obj_field_addr<HeapWord>(referent_offset);
@@ -777,7 +783,7 @@ class java_lang_ref_Reference: AllStatic {
ref->obj_field_put(next_offset, value);
}
static void set_next_raw(oop ref, oop value) {
- ref->obj_field_raw_put(next_offset, value);
+ ref->obj_field_put_raw(next_offset, value);
}
static HeapWord* next_addr(oop ref) {
return ref->obj_field_addr<HeapWord>(next_offset);
@@ -789,7 +795,7 @@ class java_lang_ref_Reference: AllStatic {
ref->obj_field_put(discovered_offset, value);
}
static void set_discovered_raw(oop ref, oop value) {
- ref->obj_field_raw_put(discovered_offset, value);
+ ref->obj_field_put_raw(discovered_offset, value);
}
static HeapWord* discovered_addr(oop ref) {
return ref->obj_field_addr<HeapWord>(discovered_offset);
@@ -828,16 +834,19 @@ class java_lang_ref_SoftReference: public java_lang_ref_Reference {
// Interface to java.lang.invoke.MethodHandle objects
+#define METHODHANDLE_INJECTED_FIELDS(macro) \
+ macro(java_lang_invoke_MethodHandle, vmentry, intptr_signature, false) \
+ macro(java_lang_invoke_MethodHandle, vmtarget, object_signature, true)
+
class MethodHandleEntry;
class java_lang_invoke_MethodHandle: AllStatic {
friend class JavaClasses;
private:
- static int _vmentry_offset; // assembly code trampoline for MH
- static int _vmtarget_offset; // class-specific target reference
+ static int _vmentry_offset; // assembly code trampoline for MH
+ static int _vmtarget_offset; // class-specific target reference
static int _type_offset; // the MethodType of this MH
- static int _vmslots_offset; // OPTIONAL hoisted type.form.vmslots
static void compute_offsets();
@@ -853,8 +862,6 @@ class java_lang_invoke_MethodHandle: AllStatic {
static void set_vmentry(oop mh, MethodHandleEntry* data);
static int vmslots(oop mh);
- static void init_vmslots(oop mh);
- static int compute_vmslots(oop mh);
// Testers
static bool is_subclass(klassOop klass) {
@@ -868,14 +875,15 @@ class java_lang_invoke_MethodHandle: AllStatic {
static int type_offset_in_bytes() { return _type_offset; }
static int vmtarget_offset_in_bytes() { return _vmtarget_offset; }
static int vmentry_offset_in_bytes() { return _vmentry_offset; }
- static int vmslots_offset_in_bytes() { return _vmslots_offset; }
};
+#define DIRECTMETHODHANDLE_INJECTED_FIELDS(macro) \
+ macro(java_lang_invoke_DirectMethodHandle, vmindex, int_signature, true)
+
class java_lang_invoke_DirectMethodHandle: public java_lang_invoke_MethodHandle {
friend class JavaClasses;
private:
- // _vmtarget_offset; // method or class or interface
static int _vmindex_offset; // negative or vtable idx or itable idx
static void compute_offsets();
@@ -975,9 +983,40 @@ class java_lang_invoke_AdapterMethodHandle: public java_lang_invoke_BoundMethodH
};
+// A simple class that maintains an invocation count
+class java_lang_invoke_CountingMethodHandle: public java_lang_invoke_MethodHandle {
+ friend class JavaClasses;
+
+ private:
+ static int _vmcount_offset;
+ static void compute_offsets();
+
+ public:
+ // Accessors
+ static int vmcount(oop mh);
+ static void set_vmcount(oop mh, int count);
+
+ // Testers
+ static bool is_subclass(klassOop klass) {
+ return SystemDictionary::CountingMethodHandle_klass() != NULL &&
+ Klass::cast(klass)->is_subclass_of(SystemDictionary::CountingMethodHandle_klass());
+ }
+ static bool is_instance(oop obj) {
+ return obj != NULL && is_subclass(obj->klass());
+ }
+
+ // Accessors for code generation:
+ static int vmcount_offset_in_bytes() { return _vmcount_offset; }
+};
+
+
+
// Interface to java.lang.invoke.MemberName objects
// (These are a private interface for Java code to query the class hierarchy.)
+#define MEMBERNAME_INJECTED_FIELDS(macro) \
+ macro(java_lang_invoke_MemberName, vmtarget, object_signature, true)
+
class java_lang_invoke_MemberName: AllStatic {
friend class JavaClasses;
@@ -1087,6 +1126,10 @@ class java_lang_invoke_MethodType: AllStatic {
static int form_offset_in_bytes() { return _form_offset; }
};
+#define METHODTYPEFORM_INJECTED_FIELDS(macro) \
+ macro(java_lang_invoke_MethodTypeForm, vmslots, int_signature, true) \
+ macro(java_lang_invoke_MethodTypeForm, vmlayout, object_signature, true)
+
class java_lang_invoke_MethodTypeForm: AllStatic {
friend class JavaClasses;
@@ -1101,6 +1144,8 @@ class java_lang_invoke_MethodTypeForm: AllStatic {
public:
// Accessors
static int vmslots(oop mtform);
+ static void set_vmslots(oop mtform, int vmslots);
+
static oop erasedType(oop mtform);
static oop genericInvoker(oop mtform);
@@ -1122,21 +1167,16 @@ class java_lang_invoke_CallSite: AllStatic {
private:
static int _target_offset;
- static int _caller_method_offset;
- static int _caller_bci_offset;
static void compute_offsets();
public:
// Accessors
- static oop target(oop site);
- static void set_target(oop site, oop target);
+ static oop target( oop site) { return site->obj_field( _target_offset); }
+ static void set_target( oop site, oop target) { site->obj_field_put( _target_offset, target); }
- static oop caller_method(oop site);
- static void set_caller_method(oop site, oop ref);
-
- static jint caller_bci(oop site);
- static void set_caller_bci(oop site, jint bci);
+ static volatile oop target_volatile(oop site) { return site->obj_field_volatile( _target_offset); }
+ static void set_target_volatile(oop site, oop target) { site->obj_field_put_volatile(_target_offset, target); }
// Testers
static bool is_subclass(klassOop klass) {
@@ -1148,8 +1188,6 @@ public:
// Accessors for code generation:
static int target_offset_in_bytes() { return _target_offset; }
- static int caller_method_offset_in_bytes() { return _caller_method_offset; }
- static int caller_bci_offset_in_bytes() { return _caller_bci_offset; }
};
@@ -1180,11 +1218,18 @@ class java_lang_ClassLoader : AllStatic {
hc_parent_offset = 0
};
+ static bool offsets_computed;
static int parent_offset;
+ static int parallelCapable_offset;
+
+ static void compute_offsets();
public:
static oop parent(oop loader);
+ // Support for parallelCapable field
+ static bool parallelCapable(oop the_class_mirror);
+
static bool is_trusted_loader(oop loader);
// Fix for 4474172
@@ -1306,17 +1351,71 @@ class java_util_concurrent_locks_AbstractOwnableSynchronizer : AllStatic {
static oop get_owner_threadObj(oop obj);
};
+// Use to declare fields that need to be injected into Java classes
+// for the JVM to use. The name_index and signature_index are
+// declared in vmSymbols. The may_be_java flag is used to declare
+// fields that might already exist in Java but should be injected if
+// they don't. Otherwise the field is unconditionally injected and
+// the JVM uses the injected one. This is to ensure that name
+// collisions don't occur. In general may_be_java should be false
+// unless there's a good reason.
+
+class InjectedField {
+ public:
+ const SystemDictionary::WKID klass_id;
+ const vmSymbols::SID name_index;
+ const vmSymbols::SID signature_index;
+ const bool may_be_java;
+
+
+ klassOop klass() const { return SystemDictionary::well_known_klass(klass_id); }
+ Symbol* name() const { return lookup_symbol(name_index); }
+ Symbol* signature() const { return lookup_symbol(signature_index); }
+
+ int compute_offset();
+
+ // Find the Symbol for this index
+ static Symbol* lookup_symbol(int symbol_index) {
+ return vmSymbols::symbol_at((vmSymbols::SID)symbol_index);
+ }
+};
+
+#define DECLARE_INJECTED_FIELD_ENUM(klass, name, signature, may_be_java) \
+ klass##_##name##_enum,
+
+#define ALL_INJECTED_FIELDS(macro) \
+ CLASS_INJECTED_FIELDS(macro) \
+ METHODHANDLE_INJECTED_FIELDS(macro) \
+ DIRECTMETHODHANDLE_INJECTED_FIELDS(macro) \
+ MEMBERNAME_INJECTED_FIELDS(macro) \
+ METHODTYPEFORM_INJECTED_FIELDS(macro)
+
// Interface to hard-coded offset checking
class JavaClasses : AllStatic {
private:
+
+ static InjectedField _injected_fields[];
+
static bool check_offset(const char *klass_name, int offset, const char *field_name, const char* field_sig) PRODUCT_RETURN0;
static bool check_static_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) PRODUCT_RETURN0;
static bool check_constant(const char *klass_name, int constant, const char *field_name, const char* field_sig) PRODUCT_RETURN0;
+
public:
+ enum InjectedFieldID {
+ ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD_ENUM)
+ MAX_enum
+ };
+
+ static int compute_injected_offset(InjectedFieldID id);
+
static void compute_hard_coded_offsets();
static void compute_offsets();
static void check_offsets() PRODUCT_RETURN;
+
+ static InjectedField* get_injected(Symbol* class_name, int* field_count);
};
+#undef DECLARE_INJECTED_FIELD_ENUM
+
#endif // SHARE_VM_CLASSFILE_JAVACLASSES_HPP
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.cpp b/hotspot/src/share/vm/classfile/systemDictionary.cpp
index 892adb1..1591b79 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp
@@ -125,13 +125,13 @@ bool SystemDictionary::is_internal_format(Symbol* class_name) {
bool SystemDictionary::is_parallelCapable(Handle class_loader) {
if (UnsyncloadClass || class_loader.is_null()) return true;
if (AlwaysLockClassLoader) return false;
- return java_lang_Class::parallelCapable(class_loader());
+ return java_lang_ClassLoader::parallelCapable(class_loader());
}
// ----------------------------------------------------------------------------
// ParallelDefineClass flag does not apply to bootclass loader
bool SystemDictionary::is_parallelDefine(Handle class_loader) {
if (class_loader.is_null()) return false;
- if (AllowParallelDefineClass && java_lang_Class::parallelCapable(class_loader())) {
+ if (AllowParallelDefineClass && java_lang_ClassLoader::parallelCapable(class_loader())) {
return true;
}
return false;
@@ -1290,7 +1290,7 @@ static instanceKlassHandle download_and_retry_class_load(
Symbol* class_name,
TRAPS) {
- klassOop dlm = SystemDictionary::sun_jkernel_DownloadManager_klass();
+ klassOop dlm = SystemDictionary::DownloadManager_klass();
instanceKlassHandle nk;
// If download manager class isn't loaded just return.
@@ -1953,7 +1953,7 @@ void SystemDictionary::initialize_preloaded_classes(TRAPS) {
// first do Object, String, Class
initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
- debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass)));
+ java_lang_Class::compute_offsets();
// Fixup mirrors for classes loaded before java.lang.Class.
// These calls iterate over the objects currently in the perm gen
@@ -1978,7 +1978,7 @@ void SystemDictionary::initialize_preloaded_classes(TRAPS) {
// JSR 292 classes
WKID jsr292_group_start = WK_KLASS_ENUM_NAME(MethodHandle_klass);
- WKID jsr292_group_end = WK_KLASS_ENUM_NAME(CallSite_klass);
+ WKID jsr292_group_end = WK_KLASS_ENUM_NAME(VolatileCallSite_klass);
initialize_wk_klasses_until(jsr292_group_start, scan, CHECK);
if (EnableInvokeDynamic) {
initialize_wk_klasses_through(jsr292_group_end, scan, CHECK);
@@ -2001,7 +2001,7 @@ void SystemDictionary::initialize_preloaded_classes(TRAPS) {
//_box_klasses[T_ARRAY] = WK_KLASS(object_klass);
#ifdef KERNEL
- if (sun_jkernel_DownloadManager_klass() == NULL) {
+ if (DownloadManager_klass() == NULL) {
warning("Cannot find sun/jkernel/DownloadManager");
}
#endif // KERNEL
@@ -2736,7 +2736,7 @@ class ClassStatistics: AllStatic {
class_size += ik->local_interfaces()->size();
class_size += ik->transitive_interfaces()->size();
// We do not have to count implementors, since we only store one!
- class_size += ik->fields()->size();
+ class_size += ik->all_fields_count() * FieldInfo::field_slots;
}
}
diff --git a/hotspot/src/share/vm/classfile/systemDictionary.hpp b/hotspot/src/share/vm/classfile/systemDictionary.hpp
index dff9f07..528ecaf 100644
--- a/hotspot/src/share/vm/classfile/systemDictionary.hpp
+++ b/hotspot/src/share/vm/classfile/systemDictionary.hpp
@@ -133,29 +133,33 @@ class SymbolPropertyTable;
template(reflect_Method_klass, java_lang_reflect_Method, Pre) \
template(reflect_Constructor_klass, java_lang_reflect_Constructor, Pre) \
\
- /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \
- /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \
- /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \
- template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \
- template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
- template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
- template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \
- template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \
- template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
+ /* NOTE: needed too early in bootstrapping process to have checks based on JDK version */ \
+ /* Universe::is_gte_jdk14x_version() is not set up by this point. */ \
+ /* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \
+ template(reflect_MagicAccessorImpl_klass, sun_reflect_MagicAccessorImpl, Opt) \
+ template(reflect_MethodAccessorImpl_klass, sun_reflect_MethodAccessorImpl, Opt_Only_JDK14NewRef) \
+ template(reflect_ConstructorAccessorImpl_klass, sun_reflect_ConstructorAccessorImpl, Opt_Only_JDK14NewRef) \
+ template(reflect_DelegatingClassLoader_klass, sun_reflect_DelegatingClassLoader, Opt) \
+ template(reflect_ConstantPool_klass, sun_reflect_ConstantPool, Opt_Only_JDK15) \
+ template(reflect_UnsafeStaticFieldAccessorImpl_klass, sun_reflect_UnsafeStaticFieldAccessorImpl, Opt_Only_JDK15) \
\
/* support for dynamic typing; it's OK if these are NULL in earlier JDKs */ \
- template(MethodHandle_klass, java_lang_invoke_MethodHandle, Pre_JSR292) \
- template(MemberName_klass, java_lang_invoke_MemberName, Pre_JSR292) \
- template(MethodHandleNatives_klass, java_lang_invoke_MethodHandleNatives, Pre_JSR292) \
- template(AdapterMethodHandle_klass, java_lang_invoke_AdapterMethodHandle, Pre_JSR292) \
- template(BoundMethodHandle_klass, java_lang_invoke_BoundMethodHandle, Pre_JSR292) \
- template(DirectMethodHandle_klass, java_lang_invoke_DirectMethodHandle, Pre_JSR292) \
- template(MethodType_klass, java_lang_invoke_MethodType, Pre_JSR292) \
- template(MethodTypeForm_klass, java_lang_invoke_MethodTypeForm, Pre_JSR292) \
- template(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_JSR292) \
+ template(MethodHandle_klass, java_lang_invoke_MethodHandle, Pre_JSR292) \
+ template(MemberName_klass, java_lang_invoke_MemberName, Pre_JSR292) \
+ template(MethodHandleNatives_klass, java_lang_invoke_MethodHandleNatives, Pre_JSR292) \
+ template(AdapterMethodHandle_klass, java_lang_invoke_AdapterMethodHandle, Pre_JSR292) \
+ template(BoundMethodHandle_klass, java_lang_invoke_BoundMethodHandle, Pre_JSR292) \
+ template(DirectMethodHandle_klass, java_lang_invoke_DirectMethodHandle, Pre_JSR292) \
+ template(MethodType_klass, java_lang_invoke_MethodType, Pre_JSR292) \
+ template(MethodTypeForm_klass, java_lang_invoke_MethodTypeForm, Pre_JSR292) \
+ template(BootstrapMethodError_klass, java_lang_BootstrapMethodError, Pre_JSR292) \
template(WrongMethodTypeException_klass, java_lang_invoke_WrongMethodTypeException, Pre_JSR292) \
- template(CallSite_klass, java_lang_invoke_CallSite, Pre_JSR292) \
- /* Note: MethodHandle must be first, and CallSite last in group */ \
+ template(CallSite_klass, java_lang_invoke_CallSite, Pre_JSR292) \
+ template(CountingMethodHandle_klass, java_lang_invoke_CountingMethodHandle, Opt) \
+ template(ConstantCallSite_klass, java_lang_invoke_ConstantCallSite, Pre_JSR292) \
+ template(MutableCallSite_klass, java_lang_invoke_MutableCallSite, Pre_JSR292) \
+ template(VolatileCallSite_klass, java_lang_invoke_VolatileCallSite, Pre_JSR292) \
+ /* Note: MethodHandle must be first, and VolatileCallSite last in group */ \
\
template(StringBuffer_klass, java_lang_StringBuffer, Pre) \
template(StringBuilder_klass, java_lang_StringBuilder, Pre) \
@@ -164,14 +168,14 @@ class SymbolPropertyTable;
template(StackTraceElement_klass, java_lang_StackTraceElement, Opt) \
/* Universe::is_gte_jdk14x_version() is not set up by this point. */ \
/* It's okay if this turns out to be NULL in non-1.4 JDKs. */ \
- template(java_nio_Buffer_klass, java_nio_Buffer, Opt) \
+ template(nio_Buffer_klass, java_nio_Buffer, Opt) \
\
/* If this class isn't present, it won't be referenced. */ \
- template(sun_misc_AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl, Opt) \
+ template(AtomicLongCSImpl_klass, sun_misc_AtomicLongCSImpl, Opt) \
\
- template(sun_jkernel_DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \
+ template(DownloadManager_klass, sun_jkernel_DownloadManager, Opt_Kernel) \
\
- template(sun_misc_PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt) \
+ template(PostVMInitHook_klass, sun_misc_PostVMInitHook, Opt) \
\
/* Preload boxing klasses */ \
template(Boolean_klass, java_lang_Boolean, Pre) \
@@ -195,7 +199,7 @@ class SystemDictionary : AllStatic {
enum WKID {
NO_WKID = 0,
- #define WK_KLASS_ENUM(name, ignore_s, ignore_o) WK_KLASS_ENUM_NAME(name),
+ #define WK_KLASS_ENUM(name, symbol, ignore_o) WK_KLASS_ENUM_NAME(name), WK_KLASS_ENUM_NAME(symbol) = WK_KLASS_ENUM_NAME(name),
WK_KLASSES_DO(WK_KLASS_ENUM)
#undef WK_KLASS_ENUM
@@ -422,11 +426,16 @@ public:
}
public:
- #define WK_KLASS_DECLARE(name, ignore_symbol, option) \
+ #define WK_KLASS_DECLARE(name, symbol, option) \
static klassOop name() { return check_klass_##option(_well_known_klasses[WK_KLASS_ENUM_NAME(name)]); }
WK_KLASSES_DO(WK_KLASS_DECLARE);
#undef WK_KLASS_DECLARE
+ static klassOop well_known_klass(WKID id) {
+ assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
+ return _well_known_klasses[id];
+ }
+
// Local definition for direct access to the private array:
#define WK_KLASS(name) _well_known_klasses[SystemDictionary::WK_KLASS_ENUM_NAME(name)]
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 3e367d2..16652e5 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -218,6 +218,7 @@
template(returnType_name, "returnType") \
template(signature_name, "signature") \
template(slot_name, "slot") \
+ template(selectAlternative_name, "selectAlternative") \
\
/* Support for annotations (JDK 1.5 and above) */ \
\
@@ -233,6 +234,9 @@
template(java_lang_invoke_InvokeDynamic, "java/lang/invoke/InvokeDynamic") \
template(java_lang_invoke_Linkage, "java/lang/invoke/Linkage") \
template(java_lang_invoke_CallSite, "java/lang/invoke/CallSite") \
+ template(java_lang_invoke_ConstantCallSite, "java/lang/invoke/ConstantCallSite") \
+ template(java_lang_invoke_MutableCallSite, "java/lang/invoke/MutableCallSite") \
+ template(java_lang_invoke_VolatileCallSite, "java/lang/invoke/VolatileCallSite") \
template(java_lang_invoke_MethodHandle, "java/lang/invoke/MethodHandle") \
template(java_lang_invoke_MethodType, "java/lang/invoke/MethodType") \
template(java_lang_invoke_WrongMethodTypeException, "java/lang/invoke/WrongMethodTypeException") \
@@ -243,9 +247,11 @@
template(java_lang_invoke_MethodTypeForm_signature, "Ljava/lang/invoke/MethodTypeForm;") \
template(java_lang_invoke_MemberName, "java/lang/invoke/MemberName") \
template(java_lang_invoke_MethodHandleNatives, "java/lang/invoke/MethodHandleNatives") \
+ template(java_lang_invoke_MethodHandleImpl, "java/lang/invoke/MethodHandleImpl") \
template(java_lang_invoke_AdapterMethodHandle, "java/lang/invoke/AdapterMethodHandle") \
template(java_lang_invoke_BoundMethodHandle, "java/lang/invoke/BoundMethodHandle") \
template(java_lang_invoke_DirectMethodHandle, "java/lang/invoke/DirectMethodHandle") \
+ template(java_lang_invoke_CountingMethodHandle, "java/lang/invoke/CountingMethodHandle") \
/* internal up-calls made only by the JVM, via class sun.invoke.MethodHandleNatives: */ \
template(findMethodHandleType_name, "findMethodHandleType") \
template(findMethodHandleType_signature, "(Ljava/lang/Class;[Ljava/lang/Class;)Ljava/lang/invoke/MethodType;") \
@@ -255,8 +261,12 @@
template(linkMethodHandleConstant_signature, "(Ljava/lang/Class;ILjava/lang/Class;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/invoke/MethodHandle;") \
template(makeDynamicCallSite_name, "makeDynamicCallSite") \
template(makeDynamicCallSite_signature, "(Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;Ljava/lang/invoke/MemberName;I)Ljava/lang/invoke/CallSite;") \
- NOT_LP64( do_alias(machine_word_signature, int_signature) ) \
- LP64_ONLY( do_alias(machine_word_signature, long_signature) ) \
+ template(setTargetNormal_name, "setTargetNormal") \
+ template(setTargetVolatile_name, "setTargetVolatile") \
+ template(setTarget_signature, "(Ljava/lang/invoke/MethodHandle;)V") \
+ NOT_LP64( do_alias(intptr_signature, int_signature) ) \
+ LP64_ONLY( do_alias(intptr_signature, long_signature) ) \
+ template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \
\
/* common method and field names */ \
template(object_initializer_name, "<init>") \
@@ -341,6 +351,7 @@
template(vmmethod_name, "vmmethod") \
template(vmtarget_name, "vmtarget") \
template(vmentry_name, "vmentry") \
+ template(vmcount_name, "vmcount") \
template(vmslots_name, "vmslots") \
template(vmlayout_name, "vmlayout") \
template(vmindex_name, "vmindex") \
@@ -354,6 +365,11 @@
template(erasedType_name, "erasedType") \
template(genericInvoker_name, "genericInvoker") \
template(append_name, "append") \
+ template(klass_name, "klass") \
+ template(resolved_constructor_name, "resolved_constructor") \
+ template(array_klass_name, "array_klass") \
+ template(oop_size_name, "oop_size") \
+ template(static_oop_field_count_name, "static_oop_field_count") \
\
/* non-intrinsic name/signature pairs: */ \
template(register_method_name, "register") \
@@ -904,6 +920,8 @@
do_intrinsic(_invokeVarargs, java_lang_invoke_MethodHandle, invokeVarargs_name, object_array_object_signature, F_R) \
do_intrinsic(_invokeDynamic, java_lang_invoke_InvokeDynamic, star_name, object_array_object_signature, F_SN) \
\
+ do_intrinsic(_selectAlternative, java_lang_invoke_MethodHandleImpl, selectAlternative_name, selectAlternative_signature, F_S) \
+ \
/* unboxing methods: */ \
do_intrinsic(_booleanValue, java_lang_Boolean, booleanValue_name, void_boolean_signature, F_R) \
do_name( booleanValue_name, "booleanValue") \
@@ -949,7 +967,8 @@
// Class vmSymbols
class vmSymbols: AllStatic {
- friend class vmIntrinsics;
+ friend class vmIntrinsics;
+ friend class VMStructs;
public:
// enum for figuring positions and size of array holding Symbol*s
enum SID {
diff --git a/hotspot/src/share/vm/code/dependencies.cpp b/hotspot/src/share/vm/code/dependencies.cpp
index c152965..0a19acf 100644
--- a/hotspot/src/share/vm/code/dependencies.cpp
+++ b/hotspot/src/share/vm/code/dependencies.cpp
@@ -113,6 +113,11 @@ void Dependencies::assert_has_no_finalizable_subclasses(ciKlass* ctxk) {
assert_common_1(no_finalizable_subclasses, ctxk);
}
+void Dependencies::assert_call_site_target_value(ciCallSite* call_site, ciMethodHandle* method_handle) {
+ check_ctxk(call_site->klass());
+ assert_common_2(call_site_target_value, call_site, method_handle);
+}
+
// Helper function. If we are adding a new dep. under ctxk2,
// try to find an old dep. under a broader* ctxk1. If there is
//
@@ -130,7 +135,7 @@ bool Dependencies::maybe_merge_ctxk(GrowableArray<ciObject*>* deps,
}
}
-void Dependencies::assert_common_1(Dependencies::DepType dept, ciObject* x) {
+void Dependencies::assert_common_1(DepType dept, ciObject* x) {
assert(dep_args(dept) == 1, "sanity");
log_dependency(dept, x);
GrowableArray<ciObject*>* deps = _deps[dept];
@@ -143,21 +148,37 @@ void Dependencies::assert_common_1(Dependencies::DepType dept, ciObject* x) {
}
}
-void Dependencies::assert_common_2(Dependencies::DepType dept,
- ciKlass* ctxk, ciObject* x) {
- assert(dep_context_arg(dept) == 0, "sanity");
+void Dependencies::assert_common_2(DepType dept,
+ ciObject* x0, ciObject* x1) {
assert(dep_args(dept) == 2, "sanity");
- log_dependency(dept, ctxk, x);
+ log_dependency(dept, x0, x1);
GrowableArray<ciObject*>* deps = _deps[dept];
// see if the same (or a similar) dep is already recorded
- if (note_dep_seen(dept, x)) {
- // look in this bucket for redundant assertions
- const int stride = 2;
- for (int i = deps->length(); (i -= stride) >= 0; ) {
- ciObject* x1 = deps->at(i+1);
- if (x == x1) { // same subject; check the context
- if (maybe_merge_ctxk(deps, i+0, ctxk)) {
+ bool has_ctxk = has_explicit_context_arg(dept);
+ if (has_ctxk) {
+ assert(dep_context_arg(dept) == 0, "sanity");
+ if (note_dep_seen(dept, x1)) {
+ // look in this bucket for redundant assertions
+ const int stride = 2;
+ for (int i = deps->length(); (i -= stride) >= 0; ) {
+ ciObject* y1 = deps->at(i+1);
+ if (x1 == y1) { // same subject; check the context
+ if (maybe_merge_ctxk(deps, i+0, x0->as_klass())) {
+ return;
+ }
+ }
+ }
+ }
+ } else {
+ assert(dep_implicit_context_arg(dept) == 0, "sanity");
+ if (note_dep_seen(dept, x0) && note_dep_seen(dept, x1)) {
+ // look in this bucket for redundant assertions
+ const int stride = 2;
+ for (int i = deps->length(); (i -= stride) >= 0; ) {
+ ciObject* y0 = deps->at(i+0);
+ ciObject* y1 = deps->at(i+1);
+ if (x0 == y0 && x1 == y1) {
return;
}
}
@@ -165,11 +186,11 @@ void Dependencies::assert_common_2(Dependencies::DepType dept,
}
// append the assertion in the correct bucket:
- deps->append(ctxk);
- deps->append(x);
+ deps->append(x0);
+ deps->append(x1);
}
-void Dependencies::assert_common_3(Dependencies::DepType dept,
+void Dependencies::assert_common_3(DepType dept,
ciKlass* ctxk, ciObject* x, ciObject* x2) {
assert(dep_context_arg(dept) == 0, "sanity");
assert(dep_args(dept) == 3, "sanity");
@@ -341,7 +362,8 @@ const char* Dependencies::_dep_name[TYPE_LIMIT] = {
"unique_concrete_method",
"abstract_with_exclusive_concrete_subtypes_2",
"exclusive_concrete_methods_2",
- "no_finalizable_subclasses"
+ "no_finalizable_subclasses",
+ "call_site_target_value"
};
int Dependencies::_dep_args[TYPE_LIMIT] = {
@@ -354,7 +376,8 @@ int Dependencies::_dep_args[TYPE_LIMIT] = {
2, // unique_concrete_method ctxk, m
3, // unique_concrete_subtypes_2 ctxk, k1, k2
3, // unique_concrete_methods_2 ctxk, m1, m2
- 1 // no_finalizable_subclasses ctxk
+ 1, // no_finalizable_subclasses ctxk
+ 2 // call_site_target_value call_site, method_handle
};
const char* Dependencies::dep_name(Dependencies::DepType dept) {
@@ -367,6 +390,10 @@ int Dependencies::dep_args(Dependencies::DepType dept) {
return _dep_args[dept];
}
+void Dependencies::check_valid_dependency_type(DepType dept) {
+ guarantee(FIRST_TYPE <= dept && dept < TYPE_LIMIT, err_msg("invalid dependency type: %d", (int) dept));
+}
+
// for the sake of the compiler log, print out current dependencies:
void Dependencies::log_all_dependencies() {
if (log() == NULL) return;
@@ -572,8 +599,7 @@ bool Dependencies::DepStream::next() {
code_byte -= ctxk_bit;
DepType dept = (DepType)code_byte;
_type = dept;
- guarantee((dept - FIRST_TYPE) < (TYPE_LIMIT - FIRST_TYPE),
- "bad dependency type tag");
+ Dependencies::check_valid_dependency_type(dept);
int stride = _dep_args[dept];
assert(stride == dep_args(dept), "sanity");
int skipj = -1;
@@ -601,18 +627,35 @@ oop Dependencies::DepStream::argument(int i) {
klassOop Dependencies::DepStream::context_type() {
assert(must_be_in_vm(), "raw oops here");
- int ctxkj = dep_context_arg(_type); // -1 if no context arg
- if (ctxkj < 0) {
- return NULL; // for example, evol_method
- } else {
- oop k = recorded_oop_at(_xi[ctxkj]);
- if (k != NULL) { // context type was not compressed away
+
+ // Most dependencies have an explicit context type argument.
+ {
+ int ctxkj = dep_context_arg(_type); // -1 if no explicit context arg
+ if (ctxkj >= 0) {
+ oop k = argument(ctxkj);
+ if (k != NULL) { // context type was not compressed away
+ assert(k->is_klass(), "type check");
+ return (klassOop) k;
+ }
+ // recompute "default" context type
+ return ctxk_encoded_as_null(_type, argument(ctxkj+1));
+ }
+ }
+
+ // Some dependencies are using the klass of the first object
+ // argument as implicit context type (e.g. call_site_target_value).
+ {
+ int ctxkj = dep_implicit_context_arg(_type);
+ if (ctxkj >= 0) {
+ oop k = argument(ctxkj)->klass();
assert(k->is_klass(), "type check");
return (klassOop) k;
- } else { // recompute "default" context type
- return ctxk_encoded_as_null(_type, recorded_oop_at(_xi[ctxkj+1]));
}
}
+
+ // And some dependencies don't have a context type at all,
+ // e.g. evol_method.
+ return NULL;
}
/// Checking dependencies:
@@ -800,11 +843,11 @@ class ClassHierarchyWalker {
bool participants_hide_witnesses,
bool top_level_call = true);
// the spot-checking version:
- klassOop find_witness_in(DepChange& changes,
+ klassOop find_witness_in(KlassDepChange& changes,
klassOop context_type,
bool participants_hide_witnesses);
public:
- klassOop find_witness_subtype(klassOop context_type, DepChange* changes = NULL) {
+ klassOop find_witness_subtype(klassOop context_type, KlassDepChange* changes = NULL) {
assert(doing_subtype_search(), "must set up a subtype search");
// When looking for unexpected concrete types,
// do not look beneath expected ones.
@@ -817,7 +860,7 @@ class ClassHierarchyWalker {
return find_witness_anywhere(context_type, participants_hide_witnesses);
}
}
- klassOop find_witness_definer(klassOop context_type, DepChange* changes = NULL) {
+ klassOop find_witness_definer(klassOop context_type, KlassDepChange* changes = NULL) {
assert(!doing_subtype_search(), "must set up a method definer search");
// When looking for unexpected concrete methods,
// look beneath expected ones, to see if there are overrides.
@@ -878,7 +921,7 @@ static bool count_find_witness_calls() {
#endif //PRODUCT
-klassOop ClassHierarchyWalker::find_witness_in(DepChange& changes,
+klassOop ClassHierarchyWalker::find_witness_in(KlassDepChange& changes,
klassOop context_type,
bool participants_hide_witnesses) {
assert(changes.involves_context(context_type), "irrelevant dependency");
@@ -1137,7 +1180,7 @@ klassOop Dependencies::check_leaf_type(klassOop ctxk) {
// when dealing with the types of actual instances.
klassOop Dependencies::check_abstract_with_unique_concrete_subtype(klassOop ctxk,
klassOop conck,
- DepChange* changes) {
+ KlassDepChange* changes) {
ClassHierarchyWalker wf(conck);
return wf.find_witness_subtype(ctxk, changes);
}
@@ -1146,7 +1189,7 @@ klassOop Dependencies::check_abstract_with_unique_concrete_subtype(klassOop ctxk
// instantiatable. This can allow the compiler to make some paths go
// dead, if they are gated by a test of the type.
klassOop Dependencies::check_abstract_with_no_concrete_subtype(klassOop ctxk,
- DepChange* changes) {
+ KlassDepChange* changes) {
// Find any concrete subtype, with no participants:
ClassHierarchyWalker wf;
return wf.find_witness_subtype(ctxk, changes);
@@ -1156,7 +1199,7 @@ klassOop Dependencies::check_abstract_with_no_concrete_subtype(klassOop ctxk,
// If a concrete class has no concrete subtypes, it can always be
// exactly typed. This allows the use of a cheaper type test.
klassOop Dependencies::check_concrete_with_no_concrete_subtype(klassOop ctxk,
- DepChange* changes) {
+ KlassDepChange* changes) {
// Find any concrete subtype, with only the ctxk as participant:
ClassHierarchyWalker wf(ctxk);
return wf.find_witness_subtype(ctxk, changes);
@@ -1217,7 +1260,7 @@ klassOop Dependencies::check_abstract_with_exclusive_concrete_subtypes(
klassOop ctxk,
klassOop k1,
klassOop k2,
- DepChange* changes) {
+ KlassDepChange* changes) {
ClassHierarchyWalker wf;
wf.add_participant(k1);
wf.add_participant(k2);
@@ -1278,7 +1321,7 @@ int Dependencies::find_exclusive_concrete_subtypes(klassOop ctxk,
// If a class (or interface) has a unique concrete method uniqm, return NULL.
// Otherwise, return a class that contains an interfering method.
klassOop Dependencies::check_unique_concrete_method(klassOop ctxk, methodOop uniqm,
- DepChange* changes) {
+ KlassDepChange* changes) {
// Here is a missing optimization: If uniqm->is_final(),
// we don't really need to search beneath it for overrides.
// This is probably not important, since we don't use dependencies
@@ -1321,7 +1364,7 @@ methodOop Dependencies::find_unique_concrete_method(klassOop ctxk, methodOop m)
klassOop Dependencies::check_exclusive_concrete_methods(klassOop ctxk,
methodOop m1,
methodOop m2,
- DepChange* changes) {
+ KlassDepChange* changes) {
ClassHierarchyWalker wf(m1);
wf.add_participant(m1->method_holder());
wf.add_participant(m2->method_holder());
@@ -1383,7 +1426,7 @@ int Dependencies::find_exclusive_concrete_methods(klassOop ctxk,
}
-klassOop Dependencies::check_has_no_finalizable_subclasses(klassOop ctxk, DepChange* changes) {
+klassOop Dependencies::check_has_no_finalizable_subclasses(klassOop ctxk, KlassDepChange* changes) {
Klass* search_at = ctxk->klass_part();
if (changes != NULL)
search_at = changes->new_type()->klass_part(); // just look at the new bit
@@ -1395,8 +1438,38 @@ klassOop Dependencies::check_has_no_finalizable_subclasses(klassOop ctxk, DepCha
}
-klassOop Dependencies::DepStream::check_dependency_impl(DepChange* changes) {
+klassOop Dependencies::check_call_site_target_value(oop call_site, oop method_handle, CallSiteDepChange* changes) {
+ assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "sanity");
+ assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "sanity");
+ if (changes == NULL) {
+ // Validate all CallSites
+ if (java_lang_invoke_CallSite::target(call_site) != method_handle)
+ return call_site->klass(); // assertion failed
+ } else {
+ // Validate the given CallSite
+ if (call_site == changes->call_site() && java_lang_invoke_CallSite::target(call_site) != changes->method_handle()) {
+ assert(method_handle != changes->method_handle(), "must be");
+ return call_site->klass(); // assertion failed
+ }
+ }
+ return NULL; // assertion still valid
+}
+
+
+void Dependencies::DepStream::trace_and_log_witness(klassOop witness) {
+ if (witness != NULL) {
+ if (TraceDependencies) {
+ print_dependency(witness, /*verbose=*/ true);
+ }
+ // The following is a no-op unless logging is enabled:
+ log_dependency(witness);
+ }
+}
+
+
+klassOop Dependencies::DepStream::check_klass_dependency(KlassDepChange* changes) {
assert_locked_or_safepoint(Compile_lock);
+ Dependencies::check_valid_dependency_type(type());
klassOop witness = NULL;
switch (type()) {
@@ -1407,95 +1480,103 @@ klassOop Dependencies::DepStream::check_dependency_impl(DepChange* changes) {
witness = check_leaf_type(context_type());
break;
case abstract_with_unique_concrete_subtype:
- witness = check_abstract_with_unique_concrete_subtype(context_type(),
- type_argument(1),
- changes);
+ witness = check_abstract_with_unique_concrete_subtype(context_type(), type_argument(1), changes);
break;
case abstract_with_no_concrete_subtype:
- witness = check_abstract_with_no_concrete_subtype(context_type(),
- changes);
+ witness = check_abstract_with_no_concrete_subtype(context_type(), changes);
break;
case concrete_with_no_concrete_subtype:
- witness = check_concrete_with_no_concrete_subtype(context_type(),
- changes);
+ witness = check_concrete_with_no_concrete_subtype(context_type(), changes);
break;
case unique_concrete_method:
- witness = check_unique_concrete_method(context_type(),
- method_argument(1),
- changes);
+ witness = check_unique_concrete_method(context_type(), method_argument(1), changes);
break;
case abstract_with_exclusive_concrete_subtypes_2:
- witness = check_abstract_with_exclusive_concrete_subtypes(context_type(),
- type_argument(1),
- type_argument(2),
- changes);
+ witness = check_abstract_with_exclusive_concrete_subtypes(context_type(), type_argument(1), type_argument(2), changes);
break;
case exclusive_concrete_methods_2:
- witness = check_exclusive_concrete_methods(context_type(),
- method_argument(1),
- method_argument(2),
- changes);
+ witness = check_exclusive_concrete_methods(context_type(), method_argument(1), method_argument(2), changes);
break;
case no_finalizable_subclasses:
- witness = check_has_no_finalizable_subclasses(context_type(),
- changes);
+ witness = check_has_no_finalizable_subclasses(context_type(), changes);
break;
- default:
+ default:
witness = NULL;
- ShouldNotReachHere();
break;
}
- if (witness != NULL) {
- if (TraceDependencies) {
- print_dependency(witness, /*verbose=*/ true);
- }
- // The following is a no-op unless logging is enabled:
- log_dependency(witness);
- }
+ trace_and_log_witness(witness);
return witness;
}
-klassOop Dependencies::DepStream::spot_check_dependency_at(DepChange& changes) {
- if (!changes.involves_context(context_type()))
- // irrelevant dependency; skip it
- return NULL;
+klassOop Dependencies::DepStream::check_call_site_dependency(CallSiteDepChange* changes) {
+ assert_locked_or_safepoint(Compile_lock);
+ Dependencies::check_valid_dependency_type(type());
- return check_dependency_impl(&changes);
+ klassOop witness = NULL;
+ switch (type()) {
+ case call_site_target_value:
+ witness = check_call_site_target_value(argument(0), argument(1), changes);
+ break;
+ default:
+ witness = NULL;
+ break;
+ }
+ trace_and_log_witness(witness);
+ return witness;
}
-void DepChange::initialize() {
- // entire transaction must be under this lock:
- assert_lock_strong(Compile_lock);
+klassOop Dependencies::DepStream::spot_check_dependency_at(DepChange& changes) {
+ // Handle klass dependency
+ if (changes.is_klass_change() && changes.as_klass_change()->involves_context(context_type()))
+ return check_klass_dependency(changes.as_klass_change());
- // Mark all dependee and all its superclasses
- // Mark transitive interfaces
- for (ContextStream str(*this); str.next(); ) {
- klassOop d = str.klass();
- assert(!instanceKlass::cast(d)->is_marked_dependent(), "checking");
- instanceKlass::cast(d)->set_is_marked_dependent(true);
- }
+ // Handle CallSite dependency
+ if (changes.is_call_site_change())
+ return check_call_site_dependency(changes.as_call_site_change());
+
+ // irrelevant dependency; skip it
+ return NULL;
}
-DepChange::~DepChange() {
- // Unmark all dependee and all its superclasses
- // Unmark transitive interfaces
+
+void DepChange::print() {
+ int nsup = 0, nint = 0;
for (ContextStream str(*this); str.next(); ) {
- klassOop d = str.klass();
- instanceKlass::cast(d)->set_is_marked_dependent(false);
+ klassOop k = str.klass();
+ switch (str.change_type()) {
+ case Change_new_type:
+ tty->print_cr(" dependee = %s", instanceKlass::cast(k)->external_name());
+ break;
+ case Change_new_sub:
+ if (!WizardMode) {
+ ++nsup;
+ } else {
+ tty->print_cr(" context super = %s", instanceKlass::cast(k)->external_name());
+ }
+ break;
+ case Change_new_impl:
+ if (!WizardMode) {
+ ++nint;
+ } else {
+ tty->print_cr(" context interface = %s", instanceKlass::cast(k)->external_name());
+ }
+ break;
+ }
+ }
+ if (nsup + nint != 0) {
+ tty->print_cr(" context supers = %d, interfaces = %d", nsup, nint);
}
}
-bool DepChange::involves_context(klassOop k) {
- if (k == NULL || !Klass::cast(k)->oop_is_instance()) {
- return false;
- }
- instanceKlass* ik = instanceKlass::cast(k);
- bool is_contained = ik->is_marked_dependent();
- assert(is_contained == Klass::cast(new_type())->is_subtype_of(k),
- "correct marking of potential context types");
- return is_contained;
+void DepChange::ContextStream::start() {
+ klassOop new_type = _changes.is_klass_change() ? _changes.as_klass_change()->new_type() : (klassOop) NULL;
+ _change_type = (new_type == NULL ? NO_CHANGE : Start_Klass);
+ _klass = new_type;
+ _ti_base = NULL;
+ _ti_index = 0;
+ _ti_limit = 0;
}
bool DepChange::ContextStream::next() {
@@ -1534,35 +1615,39 @@ bool DepChange::ContextStream::next() {
return false;
}
-void DepChange::print() {
- int nsup = 0, nint = 0;
+void KlassDepChange::initialize() {
+ // entire transaction must be under this lock:
+ assert_lock_strong(Compile_lock);
+
+ // Mark all dependee and all its superclasses
+ // Mark transitive interfaces
for (ContextStream str(*this); str.next(); ) {
- klassOop k = str.klass();
- switch (str.change_type()) {
- case Change_new_type:
- tty->print_cr(" dependee = %s", instanceKlass::cast(k)->external_name());
- break;
- case Change_new_sub:
- if (!WizardMode) {
- ++nsup;
- } else {
- tty->print_cr(" context super = %s", instanceKlass::cast(k)->external_name());
- }
- break;
- case Change_new_impl:
- if (!WizardMode) {
- ++nint;
- } else {
- tty->print_cr(" context interface = %s", instanceKlass::cast(k)->external_name());
- }
- break;
- }
+ klassOop d = str.klass();
+ assert(!instanceKlass::cast(d)->is_marked_dependent(), "checking");
+ instanceKlass::cast(d)->set_is_marked_dependent(true);
}
- if (nsup + nint != 0) {
- tty->print_cr(" context supers = %d, interfaces = %d", nsup, nint);
+}
+
+KlassDepChange::~KlassDepChange() {
+ // Unmark all dependee and all its superclasses
+ // Unmark transitive interfaces
+ for (ContextStream str(*this); str.next(); ) {
+ klassOop d = str.klass();
+ instanceKlass::cast(d)->set_is_marked_dependent(false);
}
}
+bool KlassDepChange::involves_context(klassOop k) {
+ if (k == NULL || !Klass::cast(k)->oop_is_instance()) {
+ return false;
+ }
+ instanceKlass* ik = instanceKlass::cast(k);
+ bool is_contained = ik->is_marked_dependent();
+ assert(is_contained == Klass::cast(new_type())->is_subtype_of(k),
+ "correct marking of potential context types");
+ return is_contained;
+}
+
#ifndef PRODUCT
void Dependencies::print_statistics() {
if (deps_find_witness_print != 0) {
diff --git a/hotspot/src/share/vm/code/dependencies.hpp b/hotspot/src/share/vm/code/dependencies.hpp
index 770e7f7..2b8b2af 100644
--- a/hotspot/src/share/vm/code/dependencies.hpp
+++ b/hotspot/src/share/vm/code/dependencies.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 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
@@ -25,18 +25,21 @@
#ifndef SHARE_VM_CODE_DEPENDENCIES_HPP
#define SHARE_VM_CODE_DEPENDENCIES_HPP
+#include "ci/ciCallSite.hpp"
#include "ci/ciKlass.hpp"
+#include "ci/ciMethodHandle.hpp"
+#include "classfile/systemDictionary.hpp"
#include "code/compressedStream.hpp"
#include "code/nmethod.hpp"
#include "utilities/growableArray.hpp"
//** Dependencies represent assertions (approximate invariants) within
-// the class hierarchy. An example is an assertion that a given
-// method is not overridden; another example is that a type has only
-// one concrete subtype. Compiled code which relies on such
-// assertions must be discarded if they are overturned by changes in
-// the class hierarchy. We can think of these assertions as
-// approximate invariants, because we expect them to be overturned
+// the runtime system, e.g. class hierarchy changes. An example is an
+// assertion that a given method is not overridden; another example is
+// that a type has only one concrete subtype. Compiled code which
+// relies on such assertions must be discarded if they are overturned
+// by changes in the runtime system. We can think of these assertions
+// as approximate invariants, because we expect them to be overturned
// very infrequently. We are willing to perform expensive recovery
// operations when they are overturned. The benefit, of course, is
// performing optimistic optimizations (!) on the object code.
@@ -52,6 +55,8 @@ class OopRecorder;
class xmlStream;
class CompileLog;
class DepChange;
+class KlassDepChange;
+class CallSiteDepChange;
class No_Safepoint_Verifier;
class Dependencies: public ResourceObj {
@@ -152,15 +157,23 @@ class Dependencies: public ResourceObj {
// subclasses require finalization registration.
no_finalizable_subclasses,
+ // This dependency asserts when the CallSite.target value changed.
+ call_site_target_value,
+
TYPE_LIMIT
};
enum {
LG2_TYPE_LIMIT = 4, // assert(TYPE_LIMIT <= (1<<LG2_TYPE_LIMIT))
// handy categorizations of dependency types:
- all_types = ((1<<TYPE_LIMIT)-1) & ((-1)<<FIRST_TYPE),
- non_ctxk_types = (1<<evol_method),
- ctxk_types = all_types & ~non_ctxk_types,
+ all_types = ((1 << TYPE_LIMIT) - 1) & ((-1) << FIRST_TYPE),
+
+ non_klass_types = (1 << call_site_target_value),
+ klass_types = all_types & ~non_klass_types,
+
+ non_ctxk_types = (1 << evol_method),
+ implicit_ctxk_types = (1 << call_site_target_value),
+ explicit_ctxk_types = all_types & ~(non_ctxk_types | implicit_ctxk_types),
max_arg_count = 3, // current maximum number of arguments (incl. ctxk)
@@ -176,9 +189,16 @@ class Dependencies: public ResourceObj {
static const char* dep_name(DepType dept);
static int dep_args(DepType dept);
- static int dep_context_arg(DepType dept) {
- return dept_in_mask(dept, ctxk_types)? 0: -1;
- }
+
+ static bool is_klass_type( DepType dept) { return dept_in_mask(dept, klass_types ); }
+
+ static bool has_explicit_context_arg(DepType dept) { return dept_in_mask(dept, explicit_ctxk_types); }
+ static bool has_implicit_context_arg(DepType dept) { return dept_in_mask(dept, implicit_ctxk_types); }
+
+ static int dep_context_arg(DepType dept) { return has_explicit_context_arg(dept) ? 0 : -1; }
+ static int dep_implicit_context_arg(DepType dept) { return has_implicit_context_arg(dept) ? 0 : -1; }
+
+ static void check_valid_dependency_type(DepType dept);
private:
// State for writing a new set of dependencies:
@@ -241,8 +261,8 @@ class Dependencies: public ResourceObj {
}
void assert_common_1(DepType dept, ciObject* x);
- void assert_common_2(DepType dept, ciKlass* ctxk, ciObject* x);
- void assert_common_3(DepType dept, ciKlass* ctxk, ciObject* x, ciObject* x2);
+ void assert_common_2(DepType dept, ciObject* x0, ciObject* x1);
+ void assert_common_3(DepType dept, ciKlass* ctxk, ciObject* x1, ciObject* x2);
public:
// Adding assertions to a new dependency set at compile time:
@@ -255,6 +275,7 @@ class Dependencies: public ResourceObj {
void assert_abstract_with_exclusive_concrete_subtypes(ciKlass* ctxk, ciKlass* k1, ciKlass* k2);
void assert_exclusive_concrete_methods(ciKlass* ctxk, ciMethod* m1, ciMethod* m2);
void assert_has_no_finalizable_subclasses(ciKlass* ctxk);
+ void assert_call_site_target_value(ciCallSite* call_site, ciMethodHandle* method_handle);
// Define whether a given method or type is concrete.
// These methods define the term "concrete" as used in this module.
@@ -296,19 +317,19 @@ class Dependencies: public ResourceObj {
static klassOop check_evol_method(methodOop m);
static klassOop check_leaf_type(klassOop ctxk);
static klassOop check_abstract_with_unique_concrete_subtype(klassOop ctxk, klassOop conck,
- DepChange* changes = NULL);
+ KlassDepChange* changes = NULL);
static klassOop check_abstract_with_no_concrete_subtype(klassOop ctxk,
- DepChange* changes = NULL);
+ KlassDepChange* changes = NULL);
static klassOop check_concrete_with_no_concrete_subtype(klassOop ctxk,
- DepChange* changes = NULL);
+ KlassDepChange* changes = NULL);
static klassOop check_unique_concrete_method(klassOop ctxk, methodOop uniqm,
- DepChange* changes = NULL);
+ KlassDepChange* changes = NULL);
static klassOop check_abstract_with_exclusive_concrete_subtypes(klassOop ctxk, klassOop k1, klassOop k2,
- DepChange* changes = NULL);
+ KlassDepChange* changes = NULL);
static klassOop check_exclusive_concrete_methods(klassOop ctxk, methodOop m1, methodOop m2,
- DepChange* changes = NULL);
- static klassOop check_has_no_finalizable_subclasses(klassOop ctxk,
- DepChange* changes = NULL);
+ KlassDepChange* changes = NULL);
+ static klassOop check_has_no_finalizable_subclasses(klassOop ctxk, KlassDepChange* changes = NULL);
+ static klassOop check_call_site_target_value(oop call_site, oop method_handle, CallSiteDepChange* changes = NULL);
// A returned klassOop is NULL if the dependency assertion is still
// valid. A non-NULL klassOop is a 'witness' to the assertion
// failure, a point in the class hierarchy where the assertion has
@@ -415,7 +436,10 @@ class Dependencies: public ResourceObj {
inline oop recorded_oop_at(int i);
// => _code? _code->oop_at(i): *_deps->_oop_recorder->handle_at(i)
- klassOop check_dependency_impl(DepChange* changes);
+ klassOop check_klass_dependency(KlassDepChange* changes);
+ klassOop check_call_site_dependency(CallSiteDepChange* changes);
+
+ void trace_and_log_witness(klassOop witness);
public:
DepStream(Dependencies* deps)
@@ -442,6 +466,8 @@ class Dependencies: public ResourceObj {
oop argument(int i); // => recorded_oop_at(argument_index(i))
klassOop context_type();
+ bool is_klass_type() { return Dependencies::is_klass_type(type()); }
+
methodOop method_argument(int i) {
oop x = argument(i);
assert(x->is_method(), "type");
@@ -453,10 +479,13 @@ class Dependencies: public ResourceObj {
return (klassOop) x;
}
- // The point of the whole exercise: Is this dep is still OK?
+ // The point of the whole exercise: Is this dep still OK?
klassOop check_dependency() {
- return check_dependency_impl(NULL);
+ klassOop result = check_klass_dependency(NULL);
+ if (result != NULL) return result;
+ return check_call_site_dependency(NULL);
}
+
// A lighter version: Checks only around recent changes in a class
// hierarchy. (See Universe::flush_dependents_on.)
klassOop spot_check_dependency_at(DepChange& changes);
@@ -472,13 +501,27 @@ class Dependencies: public ResourceObj {
static void print_statistics() PRODUCT_RETURN;
};
-// A class hierarchy change coming through the VM (under the Compile_lock).
-// The change is structured as a single new type with any number of supers
-// and implemented interface types. Other than the new type, any of the
-// super types can be context types for a relevant dependency, which the
-// new type could invalidate.
+
+// Every particular DepChange is a sub-class of this class.
class DepChange : public StackObj {
public:
+ // What kind of DepChange is this?
+ virtual bool is_klass_change() const { return false; }
+ virtual bool is_call_site_change() const { return false; }
+
+ // Subclass casting with assertions.
+ KlassDepChange* as_klass_change() {
+ assert(is_klass_change(), "bad cast");
+ return (KlassDepChange*) this;
+ }
+ CallSiteDepChange* as_call_site_change() {
+ assert(is_call_site_change(), "bad cast");
+ return (CallSiteDepChange*) this;
+ }
+
+ void print();
+
+ public:
enum ChangeType {
NO_CHANGE = 0, // an uninvolved klass
Change_new_type, // a newly loaded type
@@ -488,28 +531,6 @@ class DepChange : public StackObj {
Start_Klass = CHANGE_LIMIT // internal indicator for ContextStream
};
- private:
- // each change set is rooted in exactly one new type (at present):
- KlassHandle _new_type;
-
- void initialize();
-
- public:
- // notes the new type, marks it and all its super-types
- DepChange(KlassHandle new_type)
- : _new_type(new_type)
- {
- initialize();
- }
-
- // cleans up the marks
- ~DepChange();
-
- klassOop new_type() { return _new_type(); }
-
- // involves_context(k) is true if k is new_type or any of the super types
- bool involves_context(klassOop k);
-
// Usage:
// for (DepChange::ContextStream str(changes); str.next(); ) {
// klassOop k = str.klass();
@@ -530,14 +551,7 @@ class DepChange : public StackObj {
int _ti_limit;
// start at the beginning:
- void start() {
- klassOop new_type = _changes.new_type();
- _change_type = (new_type == NULL ? NO_CHANGE: Start_Klass);
- _klass = new_type;
- _ti_base = NULL;
- _ti_index = 0;
- _ti_limit = 0;
- }
+ void start();
public:
ContextStream(DepChange& changes)
@@ -555,8 +569,62 @@ class DepChange : public StackObj {
klassOop klass() { return _klass; }
};
friend class DepChange::ContextStream;
+};
- void print();
+
+// A class hierarchy change coming through the VM (under the Compile_lock).
+// The change is structured as a single new type with any number of supers
+// and implemented interface types. Other than the new type, any of the
+// super types can be context types for a relevant dependency, which the
+// new type could invalidate.
+class KlassDepChange : public DepChange {
+ private:
+ // each change set is rooted in exactly one new type (at present):
+ KlassHandle _new_type;
+
+ void initialize();
+
+ public:
+ // notes the new type, marks it and all its super-types
+ KlassDepChange(KlassHandle new_type)
+ : _new_type(new_type)
+ {
+ initialize();
+ }
+
+ // cleans up the marks
+ ~KlassDepChange();
+
+ // What kind of DepChange is this?
+ virtual bool is_klass_change() const { return true; }
+
+ klassOop new_type() { return _new_type(); }
+
+ // involves_context(k) is true if k is new_type or any of the super types
+ bool involves_context(klassOop k);
+};
+
+
+// A CallSite has changed its target.
+class CallSiteDepChange : public DepChange {
+ private:
+ Handle _call_site;
+ Handle _method_handle;
+
+ public:
+ CallSiteDepChange(Handle call_site, Handle method_handle)
+ : _call_site(call_site),
+ _method_handle(method_handle)
+ {
+ assert(_call_site() ->is_a(SystemDictionary::CallSite_klass()), "must be");
+ assert(_method_handle()->is_a(SystemDictionary::MethodHandle_klass()), "must be");
+ }
+
+ // What kind of DepChange is this?
+ virtual bool is_call_site_change() const { return true; }
+
+ oop call_site() const { return _call_site(); }
+ oop method_handle() const { return _method_handle(); }
};
#endif // SHARE_VM_CODE_DEPENDENCIES_HPP
diff --git a/hotspot/src/share/vm/code/nmethod.cpp b/hotspot/src/share/vm/code/nmethod.cpp
index 2908560..f375bdc 100644
--- a/hotspot/src/share/vm/code/nmethod.cpp
+++ b/hotspot/src/share/vm/code/nmethod.cpp
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "code/codeCache.hpp"
#include "code/compiledIC.hpp"
+#include "code/dependencies.hpp"
#include "code/nmethod.hpp"
#include "code/scopeDesc.hpp"
#include "compiler/abstractCompiler.hpp"
@@ -450,7 +451,6 @@ void nmethod::init_defaults() {
_stack_traversal_mark = 0;
_unload_reported = false; // jvmti state
- NOT_PRODUCT(_has_debug_info = false);
#ifdef ASSERT
_oops_are_stale = false;
#endif
diff --git a/hotspot/src/share/vm/code/nmethod.hpp b/hotspot/src/share/vm/code/nmethod.hpp
index ae90de6..47c5a28 100644
--- a/hotspot/src/share/vm/code/nmethod.hpp
+++ b/hotspot/src/share/vm/code/nmethod.hpp
@@ -191,8 +191,6 @@ class nmethod : public CodeBlob {
jbyte _scavenge_root_state;
- NOT_PRODUCT(bool _has_debug_info; )
-
// Nmethod Flushing lock. If non-zero, then the nmethod is not removed
// and is not made into a zombie. However, once the nmethod is made into
// a zombie, it will be locked one final time if CompiledMethodUnload
@@ -329,11 +327,6 @@ class nmethod : public CodeBlob {
methodOop method() const { return _method; }
AbstractCompiler* compiler() const { return _compiler; }
-#ifndef PRODUCT
- bool has_debug_info() const { return _has_debug_info; }
- void set_has_debug_info(bool f) { _has_debug_info = false; }
-#endif // NOT PRODUCT
-
// type info
bool is_nmethod() const { return true; }
bool is_java_method() const { return !method()->is_native(); }
diff --git a/hotspot/src/share/vm/code/pcDesc.cpp b/hotspot/src/share/vm/code/pcDesc.cpp
index d6c3751..7ba2546 100644
--- a/hotspot/src/share/vm/code/pcDesc.cpp
+++ b/hotspot/src/share/vm/code/pcDesc.cpp
@@ -30,11 +30,10 @@
#include "memory/resourceArea.hpp"
PcDesc::PcDesc(int pc_offset, int scope_decode_offset, int obj_decode_offset) {
- assert(sizeof(PcDescFlags) <= 4, "occupies more than a word");
_pc_offset = pc_offset;
_scope_decode_offset = scope_decode_offset;
_obj_decode_offset = obj_decode_offset;
- _flags.word = 0;
+ _flags = 0;
}
address PcDesc::real_pc(const nmethod* code) const {
@@ -44,7 +43,7 @@ address PcDesc::real_pc(const nmethod* code) const {
void PcDesc::print(nmethod* code) {
#ifndef PRODUCT
ResourceMark rm;
- tty->print_cr("PcDesc(pc=0x%lx offset=%x bits=%x):", real_pc(code), pc_offset(), _flags.bits);
+ tty->print_cr("PcDesc(pc=0x%lx offset=%x bits=%x):", real_pc(code), pc_offset(), _flags);
if (scope_decode_offset() == DebugInformationRecorder::serialized_null) {
return;
diff --git a/hotspot/src/share/vm/code/pcDesc.hpp b/hotspot/src/share/vm/code/pcDesc.hpp
index 99a6e4c..83ec921 100644
--- a/hotspot/src/share/vm/code/pcDesc.hpp
+++ b/hotspot/src/share/vm/code/pcDesc.hpp
@@ -39,15 +39,17 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
int _scope_decode_offset; // offset for scope in nmethod
int _obj_decode_offset;
- union PcDescFlags {
- int word;
- struct {
- unsigned int reexecute: 1;
- unsigned int is_method_handle_invoke: 1;
- unsigned int return_oop: 1;
- } bits;
- bool operator ==(const PcDescFlags& other) { return word == other.word; }
- } _flags;
+ enum {
+ PCDESC_reexecute = 1 << 0,
+ PCDESC_is_method_handle_invoke = 1 << 1,
+ PCDESC_return_oop = 1 << 2
+ };
+
+ int _flags;
+
+ void set_flag(int mask, bool z) {
+ _flags = z ? (_flags | mask) : (_flags & ~mask);
+ }
public:
int pc_offset() const { return _pc_offset; }
@@ -69,8 +71,8 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
};
// Flags
- bool should_reexecute() const { return _flags.bits.reexecute; }
- void set_should_reexecute(bool z) { _flags.bits.reexecute = z; }
+ bool should_reexecute() const { return (_flags & PCDESC_reexecute) != 0; }
+ void set_should_reexecute(bool z) { set_flag(PCDESC_reexecute, z); }
// Does pd refer to the same information as pd?
bool is_same_info(const PcDesc* pd) {
@@ -79,11 +81,11 @@ class PcDesc VALUE_OBJ_CLASS_SPEC {
_flags == pd->_flags;
}
- bool is_method_handle_invoke() const { return _flags.bits.is_method_handle_invoke; }
- void set_is_method_handle_invoke(bool z) { _flags.bits.is_method_handle_invoke = z; }
+ bool is_method_handle_invoke() const { return (_flags & PCDESC_is_method_handle_invoke) != 0; }
+ void set_is_method_handle_invoke(bool z) { set_flag(PCDESC_is_method_handle_invoke, z); }
- bool return_oop() const { return _flags.bits.return_oop; }
- void set_return_oop(bool z) { _flags.bits.return_oop = z; }
+ bool return_oop() const { return (_flags & PCDESC_return_oop) != 0; }
+ void set_return_oop(bool z) { set_flag(PCDESC_return_oop, z); }
// Returns the real pc
address real_pc(const nmethod* code) const;
diff --git a/hotspot/src/share/vm/code/stubs.hpp b/hotspot/src/share/vm/code/stubs.hpp
index ed5380f..328ad8b 100644
--- a/hotspot/src/share/vm/code/stubs.hpp
+++ b/hotspot/src/share/vm/code/stubs.hpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// The classes in this file provide a simple framework for the
// management of little pieces of machine code - or stubs -
diff --git a/hotspot/src/share/vm/compiler/compileBroker.hpp b/hotspot/src/share/vm/compiler/compileBroker.hpp
index eb571ee..7abc37e 100644
--- a/hotspot/src/share/vm/compiler/compileBroker.hpp
+++ b/hotspot/src/share/vm/compiler/compileBroker.hpp
@@ -37,6 +37,8 @@ class nmethodLocker;
// An entry in the compile queue. It represents a pending or current
// compilation.
class CompileTask : public CHeapObj {
+ friend class VMStructs;
+
private:
Monitor* _lock;
uint _compile_id;
diff --git a/hotspot/src/share/vm/compiler/disassembler.hpp b/hotspot/src/share/vm/compiler/disassembler.hpp
index 3761540..a70b8cc 100644
--- a/hotspot/src/share/vm/compiler/disassembler.hpp
+++ b/hotspot/src/share/vm/compiler/disassembler.hpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
class decode_env;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
index 5bee77e..5edd8cc 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer;
elapsedTimer CMSAdaptiveSizePolicy::_STW_timer;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
index cbe5953..0566f38 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp
@@ -50,6 +50,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
//
// ConcurrentMarkSweepPolicy methods
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
index 9a2fb02..c5bd4ca 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
@@ -2025,9 +2025,6 @@ void CMSCollector::do_compaction_work(bool clear_all_soft_refs) {
_intra_sweep_estimate.padded_average());
}
- {
- TraceCMSMemoryManagerStats tmms(gch->gc_cause());
- }
GenMarkSweep::invoke_at_safepoint(_cmsGen->level(),
ref_processor(), clear_all_soft_refs);
#ifdef ASSERT
@@ -9345,15 +9342,3 @@ TraceCMSMemoryManagerStats::TraceCMSMemoryManagerStats(CMSCollector::CollectorSt
}
}
-// when bailing out of cms in concurrent mode failure
-TraceCMSMemoryManagerStats::TraceCMSMemoryManagerStats(GCCause::Cause cause): TraceMemoryManagerStats() {
- initialize(true /* fullGC */ ,
- cause /* cause of the GC */,
- true /* recordGCBeginTime */,
- true /* recordPreGCUsage */,
- true /* recordPeakUsage */,
- true /* recordPostGCusage */,
- true /* recordAccumulatedGCTime */,
- true /* recordGCEndTime */,
- true /* countCollection */ );
-}
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
index 89b44e8..4406774 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp
@@ -1900,7 +1900,6 @@ class TraceCMSMemoryManagerStats : public TraceMemoryManagerStats {
public:
TraceCMSMemoryManagerStats(CMSCollector::CollectorState phase, GCCause::Cause cause);
- TraceCMSMemoryManagerStats(GCCause::Cause cause);
};
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp
index a299c32..63e5cb4 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
class ConcurrentMarkSweepGeneration;
class CMSCollector;
diff --git a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp
index 1c1b3ff..1870c1f 100644
--- a/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp
+++ b/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef PRODUCT
Mutex* FreeBlockDictionary::par_lock() const {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
index 7e18ec6..73d578d 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/collectionSetChooser.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -26,6 +26,7 @@
#include "gc_implementation/g1/collectionSetChooser.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc_implementation/g1/g1ErgoVerbose.hpp"
#include "memory/space.inline.hpp"
CSetChooserCache::CSetChooserCache() {
@@ -358,6 +359,9 @@ CollectionSetChooser::getNextMarkedRegion(double time_remaining,
if (_cache.is_empty()) {
assert(_curMarkedIndex == _numMarkedRegions,
"if cache is empty, list should also be empty");
+ ergo_verbose0(ErgoCSetConstruction,
+ "stop adding old regions to CSet",
+ ergo_format_reason("cache is empty"));
return NULL;
}
@@ -368,10 +372,23 @@ CollectionSetChooser::getNextMarkedRegion(double time_remaining,
if (g1p->adaptive_young_list_length()) {
if (time_remaining - predicted_time < 0.0) {
g1h->check_if_region_is_too_expensive(predicted_time);
+ ergo_verbose2(ErgoCSetConstruction,
+ "stop adding old regions to CSet",
+ ergo_format_reason("predicted old region time higher than remaining time")
+ ergo_format_ms("predicted old region time")
+ ergo_format_ms("remaining time"),
+ predicted_time, time_remaining);
return NULL;
}
} else {
- if (predicted_time > 2.0 * avg_prediction) {
+ double threshold = 2.0 * avg_prediction;
+ if (predicted_time > threshold) {
+ ergo_verbose2(ErgoCSetConstruction,
+ "stop adding old regions to CSet",
+ ergo_format_reason("predicted old region time higher than threshold")
+ ergo_format_ms("predicted old region time")
+ ergo_format_ms("threshold"),
+ predicted_time, threshold);
return NULL;
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
index 2e87ca7..ee9a1b6 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentG1RefineThread.cpp
@@ -91,7 +91,7 @@ void ConcurrentG1RefineThread::sample_young_list_rs_lengths() {
}
}
- g1p->check_prediction_validity();
+ g1p->revise_young_list_target_length_if_necessary();
}
}
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
index add683c..3679002 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
@@ -28,6 +28,7 @@
#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc_implementation/g1/g1ErgoVerbose.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
#include "gc_implementation/g1/g1RemSet.hpp"
#include "gc_implementation/g1/heapRegionRemSet.hpp"
@@ -801,39 +802,6 @@ void ConcurrentMark::checkpointRootsInitialPre() {
reset();
}
-class CMMarkRootsClosure: public OopsInGenClosure {
-private:
- ConcurrentMark* _cm;
- G1CollectedHeap* _g1h;
- bool _do_barrier;
-
-public:
- CMMarkRootsClosure(ConcurrentMark* cm,
- G1CollectedHeap* g1h,
- bool do_barrier) : _cm(cm), _g1h(g1h),
- _do_barrier(do_barrier) { }
-
- virtual void do_oop(narrowOop* p) { do_oop_work(p); }
- virtual void do_oop( oop* p) { do_oop_work(p); }
-
- template <class T> void do_oop_work(T* p) {
- T heap_oop = oopDesc::load_heap_oop(p);
- if (!oopDesc::is_null(heap_oop)) {
- oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
- assert(obj->is_oop() || obj->mark() == NULL,
- "expected an oop, possibly with mark word displaced");
- HeapWord* addr = (HeapWord*)obj;
- if (_g1h->is_in_g1_reserved(addr)) {
- _cm->grayRoot(obj);
- }
- }
- if (_do_barrier) {
- assert(!_g1h->is_in_g1_reserved(p),
- "Should be called on external roots");
- do_barrier(p);
- }
- }
-};
void ConcurrentMark::checkpointRootsInitialPost() {
G1CollectedHeap* g1h = G1CollectedHeap::heap();
@@ -868,50 +836,6 @@ void ConcurrentMark::checkpointRootsInitialPost() {
// during it. No need to call it here.
}
-// Checkpoint the roots into this generation from outside
-// this generation. [Note this initial checkpoint need only
-// be approximate -- we'll do a catch up phase subsequently.]
-void ConcurrentMark::checkpointRootsInitial() {
- assert(SafepointSynchronize::is_at_safepoint(), "world should be stopped");
- G1CollectedHeap* g1h = G1CollectedHeap::heap();
-
- double start = os::elapsedTime();
-
- G1CollectorPolicy* g1p = G1CollectedHeap::heap()->g1_policy();
- g1p->record_concurrent_mark_init_start();
- checkpointRootsInitialPre();
-
- // YSR: when concurrent precleaning is in place, we'll
- // need to clear the cached card table here
-
- ResourceMark rm;
- HandleMark hm;
-
- g1h->ensure_parsability(false);
- g1h->perm_gen()->save_marks();
-
- CMMarkRootsClosure notOlder(this, g1h, false);
- CMMarkRootsClosure older(this, g1h, true);
-
- g1h->set_marking_started();
- g1h->rem_set()->prepare_for_younger_refs_iterate(false);
-
- g1h->process_strong_roots(true, // activate StrongRootsScope
- false, // fake perm gen collection
- SharedHeap::SO_AllClasses,
- ¬Older, // Regular roots
- NULL, // do not visit active blobs
- &older // Perm Gen Roots
- );
- checkpointRootsInitialPost();
-
- // Statistics.
- double end = os::elapsedTime();
- _init_times.add((end - start) * 1000.0);
-
- g1p->record_concurrent_mark_init_end();
-}
-
/*
* Notice that in the next two methods, we actually leave the STS
* during the barrier sync and join it immediately afterwards. If we
@@ -1804,18 +1728,21 @@ void ConcurrentMark::cleanup() {
size_t known_garbage_bytes =
g1_par_count_task.used_bytes() - g1_par_count_task.live_bytes();
-#if 0
- gclog_or_tty->print_cr("used %1.2lf, live %1.2lf, garbage %1.2lf",
- (double) g1_par_count_task.used_bytes() / (double) (1024 * 1024),
- (double) g1_par_count_task.live_bytes() / (double) (1024 * 1024),
- (double) known_garbage_bytes / (double) (1024 * 1024));
-#endif // 0
g1p->set_known_garbage_bytes(known_garbage_bytes);
size_t start_used_bytes = g1h->used();
_at_least_one_mark_complete = true;
g1h->set_marking_complete();
+ ergo_verbose4(ErgoConcCycles,
+ "finish cleanup",
+ ergo_format_byte("occupancy")
+ ergo_format_byte("capacity")
+ ergo_format_byte_perc("known garbage"),
+ start_used_bytes, g1h->capacity(),
+ known_garbage_bytes,
+ ((double) known_garbage_bytes / (double) g1h->capacity()) * 100.0);
+
double count_end = os::elapsedTime();
double this_final_counting_time = (count_end - start);
if (G1PrintParCleanupStats) {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
index 1b4bb03..0aca642 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp
@@ -756,9 +756,6 @@ public:
// Clear the next marking bitmap (will be called concurrently).
void clearNextBitmap();
- // main CMS steps and related support
- void checkpointRootsInitial();
-
// These two do the work that needs to be done before and after the
// initial root checkpoint. Since this checkpoint can be done at two
// different points (i.e. an explicit pause or piggy-backed on a
diff --git a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
index 9fbf20f..85fb9a4 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
@@ -50,19 +50,6 @@ ConcurrentMarkThread::ConcurrentMarkThread(ConcurrentMark* cm) :
create_and_start();
}
-class CMCheckpointRootsInitialClosure: public VoidClosure {
-
- ConcurrentMark* _cm;
-public:
-
- CMCheckpointRootsInitialClosure(ConcurrentMark* cm) :
- _cm(cm) {}
-
- void do_void(){
- _cm->checkpointRootsInitial();
- }
-};
-
class CMCheckpointRootsFinalClosure: public VoidClosure {
ConcurrentMark* _cm;
@@ -116,27 +103,6 @@ void ConcurrentMarkThread::run() {
gclog_or_tty->print_cr("[GC concurrent-mark-start]");
}
- if (!g1_policy->in_young_gc_mode()) {
- // this ensures the flag is not set if we bail out of the marking
- // cycle; normally the flag is cleared immediately after cleanup
- g1h->set_marking_complete();
-
- if (g1_policy->adaptive_young_list_length()) {
- double now = os::elapsedTime();
- double init_prediction_ms = g1_policy->predict_init_time_ms();
- jlong sleep_time_ms = mmu_tracker->when_ms(now, init_prediction_ms);
- os::sleep(current_thread, sleep_time_ms, false);
- }
-
- // We don't have to skip here if we've been asked to restart, because
- // in the worst case we just enqueue a new VM operation to start a
- // marking. Note that the init operation resets has_aborted()
- CMCheckpointRootsInitialClosure init_cl(_cm);
- strcpy(verbose_str, "GC initial-mark");
- VM_CGC_Operation op(&init_cl, verbose_str);
- VMThread::execute(&op);
- }
-
int iter = 0;
do {
iter++;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp b/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
index 2a7f513..915ee25 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl,
bool consume,
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
index 5d0d916..ca31817 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.cpp
@@ -129,6 +129,7 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size,
// region in _alloc_region. This is the reason why an active region
// can never be empty.
_alloc_region = new_alloc_region;
+ _count += 1;
trace("region allocation successful");
return result;
} else {
@@ -139,8 +140,8 @@ HeapWord* G1AllocRegion::new_alloc_region_and_allocate(size_t word_size,
}
void G1AllocRegion::fill_in_ext_msg(ar_ext_msg* msg, const char* message) {
- msg->append("[%s] %s b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT,
- _name, message, BOOL_TO_STR(_bot_updates),
+ msg->append("[%s] %s c: "SIZE_FORMAT" b: %s r: "PTR_FORMAT" u: "SIZE_FORMAT,
+ _name, message, _count, BOOL_TO_STR(_bot_updates),
_alloc_region, _used_bytes_before);
}
@@ -148,16 +149,34 @@ void G1AllocRegion::init() {
trace("initializing");
assert(_alloc_region == NULL && _used_bytes_before == 0,
ar_ext_msg(this, "pre-condition"));
- assert(_dummy_region != NULL, "should have been set");
+ assert(_dummy_region != NULL, ar_ext_msg(this, "should have been set"));
_alloc_region = _dummy_region;
+ _count = 0;
trace("initialized");
}
+void G1AllocRegion::set(HeapRegion* alloc_region) {
+ trace("setting");
+ // We explicitly check that the region is not empty to make sure we
+ // maintain the "the alloc region cannot be empty" invariant.
+ assert(alloc_region != NULL && !alloc_region->is_empty(),
+ ar_ext_msg(this, "pre-condition"));
+ assert(_alloc_region == _dummy_region &&
+ _used_bytes_before == 0 && _count == 0,
+ ar_ext_msg(this, "pre-condition"));
+
+ _used_bytes_before = alloc_region->used();
+ _alloc_region = alloc_region;
+ _count += 1;
+ trace("set");
+}
+
HeapRegion* G1AllocRegion::release() {
trace("releasing");
HeapRegion* alloc_region = _alloc_region;
retire(false /* fill_up */);
- assert(_alloc_region == _dummy_region, "post-condition of retire()");
+ assert(_alloc_region == _dummy_region,
+ ar_ext_msg(this, "post-condition of retire()"));
_alloc_region = NULL;
trace("released");
return (alloc_region == _dummy_region) ? NULL : alloc_region;
@@ -196,7 +215,8 @@ void G1AllocRegion::trace(const char* str, size_t word_size, HeapWord* result) {
jio_snprintf(rest_buffer, buffer_length, "");
}
- tty->print_cr("[%s] %s : %s %s", _name, hr_buffer, str, rest_buffer);
+ tty->print_cr("[%s] "SIZE_FORMAT" %s : %s %s",
+ _name, _count, hr_buffer, str, rest_buffer);
}
}
#endif // G1_ALLOC_REGION_TRACING
@@ -204,5 +224,5 @@ void G1AllocRegion::trace(const char* str, size_t word_size, HeapWord* result) {
G1AllocRegion::G1AllocRegion(const char* name,
bool bot_updates)
: _name(name), _bot_updates(bot_updates),
- _alloc_region(NULL), _used_bytes_before(0) { }
+ _alloc_region(NULL), _count(0), _used_bytes_before(0) { }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp
index d329d1e..caf7ff9 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1AllocRegion.hpp
@@ -36,7 +36,7 @@ class ar_ext_msg;
// A class that holds a region that is active in satisfying allocation
// requests, potentially issued in parallel. When the active region is
-// full it will be retired it replaced with a new one. The
+// full it will be retired and replaced with a new one. The
// implementation assumes that fast-path allocations will be lock-free
// and a lock will need to be taken when the active region needs to be
// replaced.
@@ -57,13 +57,22 @@ private:
// correct use of init() and release()).
HeapRegion* _alloc_region;
+ // It keeps track of the distinct number of regions that are used
+ // for allocation in the active interval of this object, i.e.,
+ // between a call to init() and a call to release(). The count
+ // mostly includes regions that are freshly allocated, as well as
+ // the region that is re-used using the set() method. This count can
+ // be used in any heuristics that might want to bound how many
+ // distinct regions this object can used during an active interval.
+ size_t _count;
+
// When we set up a new active region we save its used bytes in this
// field so that, when we retire it, we can calculate how much space
// we allocated in it.
size_t _used_bytes_before;
- // Specifies whether the allocate calls will do BOT updates or not.
- bool _bot_updates;
+ // When true, indicates that allocate calls should do BOT updates.
+ const bool _bot_updates;
// Useful for debugging and tracing.
const char* _name;
@@ -127,6 +136,8 @@ public:
return (_alloc_region == _dummy_region) ? NULL : _alloc_region;
}
+ size_t count() { return _count; }
+
// The following two are the building blocks for the allocation method.
// First-level allocation: Should be called without holding a
@@ -153,6 +164,12 @@ public:
// Should be called before we start using this object.
void init();
+ // This can be used to set the active region to a specific
+ // region. (Use Example: we try to retain the last old GC alloc
+ // region that we've used during a GC and we can use set() to
+ // re-instate it at the beginning of the next GC.)
+ void set(HeapRegion* alloc_region);
+
// Should be called when we want to release the active region which
// is returned after it's been retired.
HeapRegion* release();
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
index 1029d6c..9d62845 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
@@ -31,6 +31,7 @@
#include "gc_implementation/g1/g1AllocRegion.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc_implementation/g1/g1ErgoVerbose.hpp"
#include "gc_implementation/g1/g1MarkSweep.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
#include "gc_implementation/g1/g1RemSet.inline.hpp"
@@ -577,6 +578,11 @@ HeapRegion* G1CollectedHeap::new_region(size_t word_size, bool do_expand) {
res = new_region_try_secondary_free_list();
}
if (res == NULL && do_expand) {
+ ergo_verbose1(ErgoHeapSizing,
+ "attempt heap expansion",
+ ergo_format_reason("region allocation request failed")
+ ergo_format_byte("allocation request"),
+ word_size * HeapWordSize);
if (expand(word_size * HeapWordSize)) {
// Even though the heap was expanded, it might not have reached
// the desired size. So, we cannot assume that the allocation
@@ -587,26 +593,6 @@ HeapRegion* G1CollectedHeap::new_region(size_t word_size, bool do_expand) {
return res;
}
-HeapRegion* G1CollectedHeap::new_gc_alloc_region(int purpose,
- size_t word_size) {
- HeapRegion* alloc_region = NULL;
- if (_gc_alloc_region_counts[purpose] < g1_policy()->max_regions(purpose)) {
- alloc_region = new_region(word_size, true /* do_expand */);
- if (alloc_region != NULL) {
- if (purpose == GCAllocForSurvived) {
- _hr_printer.alloc(alloc_region, G1HRPrinter::Survivor);
- alloc_region->set_survivor();
- } else {
- _hr_printer.alloc(alloc_region, G1HRPrinter::Old);
- }
- ++_gc_alloc_region_counts[purpose];
- }
- } else {
- g1_policy()->note_alloc_region_limit_reached(purpose);
- }
- return alloc_region;
-}
-
size_t G1CollectedHeap::humongous_obj_allocate_find_first(size_t num_regions,
size_t word_size) {
assert(isHumongous(word_size), "word_size should be humongous");
@@ -810,6 +796,11 @@ HeapWord* G1CollectedHeap::humongous_obj_allocate(size_t word_size) {
// room available.
assert(num_regions > fs, "earlier allocation should have succeeded");
+ ergo_verbose1(ErgoHeapSizing,
+ "attempt heap expansion",
+ ergo_format_reason("humongous allocation request failed")
+ ergo_format_byte("allocation request"),
+ word_size * HeapWordSize);
if (expand((num_regions - fs) * HeapRegion::GrainBytes)) {
// Even though the heap was expanded, it might not have
// reached the desired size. So, we cannot assume that the
@@ -926,6 +917,8 @@ HeapWord* G1CollectedHeap::attempt_allocation_slow(size_t word_size,
if (GC_locker::is_active_and_needs_gc()) {
if (g1_policy()->can_expand_young_list()) {
+ // No need for an ergo verbose message here,
+ // can_expand_young_list() does this when it returns true.
result = _mutator_alloc_region.attempt_allocation_force(word_size,
false /* bot_updates */);
if (result != NULL) {
@@ -1091,12 +1084,6 @@ HeapWord* G1CollectedHeap::attempt_allocation_at_safepoint(size_t word_size,
ShouldNotReachHere();
}
-void G1CollectedHeap::abandon_gc_alloc_regions() {
- // first, make sure that the GC alloc region list is empty (it should!)
- assert(_gc_alloc_region_list == NULL, "invariant");
- release_gc_alloc_regions(true /* totally */);
-}
-
class PostMCRemSetClearClosure: public HeapRegionClosure {
ModRefBarrierSet* _mr_bs;
public:
@@ -1253,6 +1240,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
/* option */ VerifyOption_G1UsePrevMarking);
}
+ pre_full_gc_dump();
COMPILER2_PRESENT(DerivedPointerTable::clear());
@@ -1289,10 +1277,8 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
g1_policy()->clear_incremental_cset();
g1_policy()->stop_incremental_cset_building();
- if (g1_policy()->in_young_gc_mode()) {
- empty_young_list();
- g1_policy()->set_full_young_gcs(true);
- }
+ empty_young_list();
+ g1_policy()->set_full_young_gcs(true);
// See the comment in G1CollectedHeap::ref_processing_init() about
// how reference processing currently works in G1.
@@ -1413,13 +1399,11 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
|| (G1DeferredRSUpdate && (dirty_card_queue_set().completed_buffers_num() == 0)), "Should not be any");
}
- if (g1_policy()->in_young_gc_mode()) {
- _young_list->reset_sampled_info();
- // At this point there should be no regions in the
- // entire heap tagged as young.
- assert( check_young_list_empty(true /* check_heap */),
- "young list should be empty at this point");
- }
+ _young_list->reset_sampled_info();
+ // At this point there should be no regions in the
+ // entire heap tagged as young.
+ assert( check_young_list_empty(true /* check_heap */),
+ "young list should be empty at this point");
// Update the number of full collections that have been completed.
increment_full_collections_completed(false /* concurrent */);
@@ -1431,6 +1415,7 @@ bool G1CollectedHeap::do_collection(bool explicit_gc,
Universe::print_heap_after_gc();
}
g1mm()->update_counters();
+ post_full_gc_dump();
return true;
}
@@ -1505,63 +1490,34 @@ resize_if_necessary_after_full_collection(size_t word_size) {
// we'll try to make the capacity smaller than it, not greater).
maximum_desired_capacity = MAX2(maximum_desired_capacity, min_heap_size);
- if (PrintGC && Verbose) {
- const double free_percentage =
- (double) free_after_gc / (double) capacity_after_gc;
- gclog_or_tty->print_cr("Computing new size after full GC ");
- gclog_or_tty->print_cr(" "
- " minimum_free_percentage: %6.2f",
- minimum_free_percentage);
- gclog_or_tty->print_cr(" "
- " maximum_free_percentage: %6.2f",
- maximum_free_percentage);
- gclog_or_tty->print_cr(" "
- " capacity: %6.1fK"
- " minimum_desired_capacity: %6.1fK"
- " maximum_desired_capacity: %6.1fK",
- (double) capacity_after_gc / (double) K,
- (double) minimum_desired_capacity / (double) K,
- (double) maximum_desired_capacity / (double) K);
- gclog_or_tty->print_cr(" "
- " free_after_gc: %6.1fK"
- " used_after_gc: %6.1fK",
- (double) free_after_gc / (double) K,
- (double) used_after_gc / (double) K);
- gclog_or_tty->print_cr(" "
- " free_percentage: %6.2f",
- free_percentage);
- }
if (capacity_after_gc < minimum_desired_capacity) {
// Don't expand unless it's significant
size_t expand_bytes = minimum_desired_capacity - capacity_after_gc;
- if (expand(expand_bytes)) {
- if (PrintGC && Verbose) {
- gclog_or_tty->print_cr(" "
- " expanding:"
- " max_heap_size: %6.1fK"
- " minimum_desired_capacity: %6.1fK"
- " expand_bytes: %6.1fK",
- (double) max_heap_size / (double) K,
- (double) minimum_desired_capacity / (double) K,
- (double) expand_bytes / (double) K);
- }
- }
+ ergo_verbose4(ErgoHeapSizing,
+ "attempt heap expansion",
+ ergo_format_reason("capacity lower than "
+ "min desired capacity after Full GC")
+ ergo_format_byte("capacity")
+ ergo_format_byte("occupancy")
+ ergo_format_byte_perc("min desired capacity"),
+ capacity_after_gc, used_after_gc,
+ minimum_desired_capacity, (double) MinHeapFreeRatio);
+ expand(expand_bytes);
// No expansion, now see if we want to shrink
} else if (capacity_after_gc > maximum_desired_capacity) {
// Capacity too large, compute shrinking size
size_t shrink_bytes = capacity_after_gc - maximum_desired_capacity;
+ ergo_verbose4(ErgoHeapSizing,
+ "attempt heap shrinking",
+ ergo_format_reason("capacity higher than "
+ "max desired capacity after Full GC")
+ ergo_format_byte("capacity")
+ ergo_format_byte("occupancy")
+ ergo_format_byte_perc("max desired capacity"),
+ capacity_after_gc, used_after_gc,
+ maximum_desired_capacity, (double) MaxHeapFreeRatio);
shrink(shrink_bytes);
- if (PrintGC && Verbose) {
- gclog_or_tty->print_cr(" "
- " shrinking:"
- " min_heap_size: %6.1fK"
- " maximum_desired_capacity: %6.1fK"
- " shrink_bytes: %6.1fK",
- (double) min_heap_size / (double) K,
- (double) maximum_desired_capacity / (double) K,
- (double) shrink_bytes / (double) K);
- }
}
}
@@ -1647,6 +1603,11 @@ HeapWord* G1CollectedHeap::expand_and_allocate(size_t word_size) {
verify_region_sets_optional();
size_t expand_bytes = MAX2(word_size * HeapWordSize, MinHeapDeltaBytes);
+ ergo_verbose1(ErgoHeapSizing,
+ "attempt heap expansion",
+ ergo_format_reason("allocation request failed")
+ ergo_format_byte("allocation request"),
+ word_size * HeapWordSize);
if (expand(expand_bytes)) {
_hrs.verify_optional();
verify_region_sets_optional();
@@ -1674,11 +1635,11 @@ bool G1CollectedHeap::expand(size_t expand_bytes) {
size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes);
aligned_expand_bytes = align_size_up(aligned_expand_bytes,
HeapRegion::GrainBytes);
-
- if (Verbose && PrintGC) {
- gclog_or_tty->print("Expanding garbage-first heap from %ldK by %ldK",
- old_mem_size/K, aligned_expand_bytes/K);
- }
+ ergo_verbose2(ErgoHeapSizing,
+ "expand the heap",
+ ergo_format_byte("requested expansion amount")
+ ergo_format_byte("attempted expansion amount"),
+ expand_bytes, aligned_expand_bytes);
// First commit the memory.
HeapWord* old_end = (HeapWord*) _g1_storage.high();
@@ -1721,7 +1682,11 @@ bool G1CollectedHeap::expand(size_t expand_bytes) {
}
assert(curr == mr.end(), "post-condition");
}
+ g1_policy()->record_new_heap_size(n_regions());
} else {
+ ergo_verbose0(ErgoHeapSizing,
+ "did not expand the heap",
+ ergo_format_reason("heap expansion operation failed"));
// The expansion of the virtual storage space was unsuccessful.
// Let's see if it was because we ran out of swap.
if (G1ExitOnExpansionFailure &&
@@ -1730,13 +1695,6 @@ bool G1CollectedHeap::expand(size_t expand_bytes) {
vm_exit_out_of_memory(aligned_expand_bytes, "G1 heap expansion");
}
}
-
- if (Verbose && PrintGC) {
- size_t new_mem_size = _g1_storage.committed_size();
- gclog_or_tty->print_cr("...%s, expanded to %ldK",
- (successful ? "Successful" : "Failed"),
- new_mem_size/K);
- }
return successful;
}
@@ -1750,6 +1708,13 @@ void G1CollectedHeap::shrink_helper(size_t shrink_bytes) {
MemRegion mr = _hrs.shrink_by(aligned_shrink_bytes, &num_regions_deleted);
HeapWord* old_end = (HeapWord*) _g1_storage.high();
assert(mr.end() == old_end, "post-condition");
+
+ ergo_verbose3(ErgoHeapSizing,
+ "shrink the heap",
+ ergo_format_byte("requested shrinking amount")
+ ergo_format_byte("aligned shrinking amount")
+ ergo_format_byte("attempted shrinking amount"),
+ shrink_bytes, aligned_shrink_bytes, mr.byte_size());
if (mr.byte_size() > 0) {
if (_hr_printer.is_active()) {
HeapWord* curr = mr.end();
@@ -1768,20 +1733,22 @@ void G1CollectedHeap::shrink_helper(size_t shrink_bytes) {
_expansion_regions += num_regions_deleted;
update_committed_space(old_end, new_end);
HeapRegionRemSet::shrink_heap(n_regions());
-
- if (Verbose && PrintGC) {
- size_t new_mem_size = _g1_storage.committed_size();
- gclog_or_tty->print_cr("Shrinking garbage-first heap from %ldK by %ldK to %ldK",
- old_mem_size/K, aligned_shrink_bytes/K,
- new_mem_size/K);
- }
+ g1_policy()->record_new_heap_size(n_regions());
+ } else {
+ ergo_verbose0(ErgoHeapSizing,
+ "did not shrink the heap",
+ ergo_format_reason("heap shrinking operation failed"));
}
}
void G1CollectedHeap::shrink(size_t shrink_bytes) {
verify_region_sets_optional();
- release_gc_alloc_regions(true /* totally */);
+ // We should only reach here at the end of a Full GC which means we
+ // should not not be holding to any GC alloc regions. The method
+ // below will make sure of that and do any remaining clean up.
+ abandon_gc_alloc_regions();
+
// Instead of tearing down / rebuilding the free lists here, we
// could instead use the remove_all_pending() method on free_list to
// remove only the ones that we need to remove.
@@ -1821,6 +1788,7 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
_free_regions_coming(false),
_young_list(new YoungList(this)),
_gc_time_stamp(0),
+ _retained_old_gc_alloc_region(NULL),
_surviving_young_words(NULL),
_full_collections_completed(0),
_in_cset_fast_test(NULL),
@@ -1852,20 +1820,6 @@ G1CollectedHeap::G1CollectedHeap(G1CollectorPolicy* policy_) :
_task_queues->register_queue(i, q);
}
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- _gc_alloc_regions[ap] = NULL;
- _gc_alloc_region_counts[ap] = 0;
- _retained_gc_alloc_regions[ap] = NULL;
- // by default, we do not retain a GC alloc region for each ap;
- // we'll override this, when appropriate, below
- _retain_gc_alloc_region[ap] = false;
- }
-
- // We will try to remember the last half-full tenured region we
- // allocated to at the end of a collection so that we can re-use it
- // during the next collection.
- _retain_gc_alloc_region[GCAllocForTenured] = true;
-
guarantee(_task_queues != NULL, "task_queues allocation failure.");
}
@@ -1901,12 +1855,27 @@ jint G1CollectedHeap::initialize() {
PermanentGenerationSpec* pgs = collector_policy()->permanent_generation();
// Includes the perm-gen.
- const size_t total_reserved = max_byte_size + pgs->max_size();
+ // When compressed oops are enabled, the preferred heap base
+ // is calculated by subtracting the requested size from the
+ // 32Gb boundary and using the result as the base address for
+ // heap reservation. If the requested size is not aligned to
+ // HeapRegion::GrainBytes (i.e. the alignment that is passed
+ // into the ReservedHeapSpace constructor) then the actual
+ // base of the reserved heap may end up differing from the
+ // address that was requested (i.e. the preferred heap base).
+ // If this happens then we could end up using a non-optimal
+ // compressed oops mode.
+
+ // Since max_byte_size is aligned to the size of a heap region (checked
+ // above), we also need to align the perm gen size as it might not be.
+ const size_t total_reserved = max_byte_size +
+ align_size_up(pgs->max_size(), HeapRegion::GrainBytes);
+ Universe::check_alignment(total_reserved, HeapRegion::GrainBytes, "g1 heap and perm");
+
char* addr = Universe::preferred_heap_base(total_reserved, Universe::UnscaledNarrowOop);
- ReservedSpace heap_rs(max_byte_size + pgs->max_size(),
- HeapRegion::GrainBytes,
- UseLargePages, addr);
+ ReservedHeapSpace heap_rs(total_reserved, HeapRegion::GrainBytes,
+ UseLargePages, addr);
if (UseCompressedOops) {
if (addr != NULL && !heap_rs.is_reserved()) {
@@ -1914,14 +1883,17 @@ jint G1CollectedHeap::initialize() {
// region is taken already, for example, by 'java' launcher.
// Try again to reserver heap higher.
addr = Universe::preferred_heap_base(total_reserved, Universe::ZeroBasedNarrowOop);
- ReservedSpace heap_rs0(total_reserved, HeapRegion::GrainBytes,
- UseLargePages, addr);
+
+ ReservedHeapSpace heap_rs0(total_reserved, HeapRegion::GrainBytes,
+ UseLargePages, addr);
+
if (addr != NULL && !heap_rs0.is_reserved()) {
// Failed to reserve at specified address again - give up.
addr = Universe::preferred_heap_base(total_reserved, Universe::HeapBasedNarrowOop);
assert(addr == NULL, "");
- ReservedSpace heap_rs1(total_reserved, HeapRegion::GrainBytes,
- UseLargePages, addr);
+
+ ReservedHeapSpace heap_rs1(total_reserved, HeapRegion::GrainBytes,
+ UseLargePages, addr);
heap_rs = heap_rs1;
} else {
heap_rs = heap_rs0;
@@ -2065,8 +2037,6 @@ jint G1CollectedHeap::initialize() {
// counts and that mechanism.
SpecializationStats::clear();
- _gc_alloc_region_list = NULL;
-
// Do later initialization work for concurrent refinement.
_cg1r->init();
@@ -2187,27 +2157,6 @@ size_t G1CollectedHeap::recalculate_used() const {
return blk.result();
}
-#ifndef PRODUCT
-class SumUsedRegionsClosure: public HeapRegionClosure {
- size_t _num;
-public:
- SumUsedRegionsClosure() : _num(0) {}
- bool doHeapRegion(HeapRegion* r) {
- if (r->continuesHumongous() || r->used() > 0 || r->is_gc_alloc_region()) {
- _num += 1;
- }
- return false;
- }
- size_t result() { return _num; }
-};
-
-size_t G1CollectedHeap::recalculate_used_regions() const {
- SumUsedRegionsClosure blk;
- heap_region_iterate(&blk);
- return blk.result();
-}
-#endif // PRODUCT
-
size_t G1CollectedHeap::unsafe_max_alloc() {
if (free_regions() > 0) return HeapRegion::GrainBytes;
// otherwise, is there space in the current allocation region?
@@ -3201,12 +3150,6 @@ G1CollectedHeap::doConcurrentMark() {
}
}
-void G1CollectedHeap::do_sync_mark() {
- _cm->checkpointRootsInitial();
- _cm->markFromRoots();
- _cm->checkpointRootsFinal(false);
-}
-
// <NEW PREDICTION>
double G1CollectedHeap::predict_region_elapsed_time_ms(HeapRegion *hr,
@@ -3357,11 +3300,10 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
char verbose_str[128];
sprintf(verbose_str, "GC pause ");
- if (g1_policy()->in_young_gc_mode()) {
- if (g1_policy()->full_young_gcs())
- strcat(verbose_str, "(young)");
- else
- strcat(verbose_str, "(partial)");
+ if (g1_policy()->full_young_gcs()) {
+ strcat(verbose_str, "(young)");
+ } else {
+ strcat(verbose_str, "(partial)");
}
if (g1_policy()->during_initial_mark_pause()) {
strcat(verbose_str, " (initial-mark)");
@@ -3390,18 +3332,15 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
append_secondary_free_list_if_not_empty_with_lock();
}
- increment_gc_time_stamp();
-
- if (g1_policy()->in_young_gc_mode()) {
- assert(check_young_list_well_formed(),
- "young list should be well formed");
- }
+ assert(check_young_list_well_formed(),
+ "young list should be well formed");
{ // Call to jvmpi::post_class_unload_events must occur outside of active GC
IsGCActiveMark x;
gc_prologue(false);
increment_total_collections(false /* full gc */);
+ increment_gc_time_stamp();
if (VerifyBeforeGC && total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
@@ -3454,7 +3393,7 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
if (g1_policy()->during_initial_mark_pause()) {
concurrent_mark()->checkpointRootsInitialPre();
}
- save_marks();
+ perm_gen()->save_marks();
// We must do this before any possible evacuation that should propagate
// marks.
@@ -3516,8 +3455,8 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
setup_surviving_young_words();
- // Set up the gc allocation regions.
- get_gc_alloc_regions();
+ // Initialize the GC alloc regions.
+ init_gc_alloc_regions();
// Actually do the work...
evacuate_collection_set();
@@ -3535,38 +3474,35 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
// evacuation pause.
clear_cset_fast_test();
- if (g1_policy()->in_young_gc_mode()) {
- _young_list->reset_sampled_info();
+ _young_list->reset_sampled_info();
- // Don't check the whole heap at this point as the
- // GC alloc regions from this pause have been tagged
- // as survivors and moved on to the survivor list.
- // Survivor regions will fail the !is_young() check.
- assert(check_young_list_empty(false /* check_heap */),
- "young list should be empty");
+ // Don't check the whole heap at this point as the
+ // GC alloc regions from this pause have been tagged
+ // as survivors and moved on to the survivor list.
+ // Survivor regions will fail the !is_young() check.
+ assert(check_young_list_empty(false /* check_heap */),
+ "young list should be empty");
#if YOUNG_LIST_VERBOSE
- gclog_or_tty->print_cr("Before recording survivors.\nYoung List:");
- _young_list->print();
+ gclog_or_tty->print_cr("Before recording survivors.\nYoung List:");
+ _young_list->print();
#endif // YOUNG_LIST_VERBOSE
- g1_policy()->record_survivor_regions(_young_list->survivor_length(),
- _young_list->first_survivor_region(),
- _young_list->last_survivor_region());
+ g1_policy()->record_survivor_regions(_young_list->survivor_length(),
+ _young_list->first_survivor_region(),
+ _young_list->last_survivor_region());
- _young_list->reset_auxilary_lists();
- }
+ _young_list->reset_auxilary_lists();
if (evacuation_failed()) {
_summary_bytes_used = recalculate_used();
} else {
// The "used" of the the collection set have already been subtracted
// when they were freed. Add in the bytes evacuated.
- _summary_bytes_used += g1_policy()->bytes_in_to_space();
+ _summary_bytes_used += g1_policy()->bytes_copied_during_gc();
}
- if (g1_policy()->in_young_gc_mode() &&
- g1_policy()->during_initial_mark_pause()) {
+ if (g1_policy()->during_initial_mark_pause()) {
concurrent_mark()->checkpointRootsInitialPost();
set_marking_started();
// CAUTION: after the doConcurrentMark() call below,
@@ -3589,6 +3525,19 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
init_mutator_alloc_region();
+ {
+ size_t expand_bytes = g1_policy()->expansion_amount();
+ if (expand_bytes > 0) {
+ size_t bytes_before = capacity();
+ if (!expand(expand_bytes)) {
+ // We failed to expand the heap so let's verify that
+ // committed/uncommitted amount match the backing store
+ assert(capacity() == _g1_storage.committed_size(), "committed size mismatch");
+ assert(max_capacity() == _g1_storage.reserved_size(), "reserved size mismatch");
+ }
+ }
+ }
+
double end_time_sec = os::elapsedTime();
double pause_time_ms = (end_time_sec - start_time_sec) * MILLIUNITS;
g1_policy()->record_pause_time_ms(pause_time_ms);
@@ -3596,6 +3545,29 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
MemoryService::track_memory_usage();
+ // In prepare_for_verify() below we'll need to scan the deferred
+ // update buffers to bring the RSets up-to-date if
+ // G1HRRSFlushLogBuffersOnVerify has been set. While scanning
+ // the update buffers we'll probably need to scan cards on the
+ // regions we just allocated to (i.e., the GC alloc
+ // regions). However, during the last GC we called
+ // set_saved_mark() on all the GC alloc regions, so card
+ // scanning might skip the [saved_mark_word()...top()] area of
+ // those regions (i.e., the area we allocated objects into
+ // during the last GC). But it shouldn't. Given that
+ // saved_mark_word() is conditional on whether the GC time stamp
+ // on the region is current or not, by incrementing the GC time
+ // stamp here we invalidate all the GC time stamps on all the
+ // regions and saved_mark_word() will simply return top() for
+ // all the regions. This is a nicer way of ensuring this rather
+ // than iterating over the regions and fixing them. In fact, the
+ // GC time stamp increment here also ensures that
+ // saved_mark_word() will return top() between pauses, i.e.,
+ // during concurrent refinement. So we don't need the
+ // is_gc_active() check to decided which top to use when
+ // scanning cards (see CR 7039627).
+ increment_gc_time_stamp();
+
if (VerifyAfterGC && total_collections() >= VerifyGCStartAt) {
HandleMark hm; // Discard invalid handles created during verification
gclog_or_tty->print(" VerifyAfterGC:");
@@ -3611,6 +3583,8 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
size_t expand_bytes = g1_policy()->expansion_amount();
if (expand_bytes > 0) {
size_t bytes_before = capacity();
+ // No need for an ergo verbose message here,
+ // expansion_amount() does this when it returns a value > 0.
if (!expand(expand_bytes)) {
// We failed to expand the heap so let's verify that
// committed/uncommitted amount match the backing store
@@ -3695,251 +3669,49 @@ void G1CollectedHeap::release_mutator_alloc_region() {
assert(_mutator_alloc_region.get() == NULL, "post-condition");
}
-void G1CollectedHeap::set_gc_alloc_region(int purpose, HeapRegion* r) {
- assert(purpose >= 0 && purpose < GCAllocPurposeCount, "invalid purpose");
- // make sure we don't call set_gc_alloc_region() multiple times on
- // the same region
- assert(r == NULL || !r->is_gc_alloc_region(),
- "shouldn't already be a GC alloc region");
- assert(r == NULL || !r->isHumongous(),
- "humongous regions shouldn't be used as GC alloc regions");
-
- HeapWord* original_top = NULL;
- if (r != NULL)
- original_top = r->top();
-
- // We will want to record the used space in r as being there before gc.
- // One we install it as a GC alloc region it's eligible for allocation.
- // So record it now and use it later.
- size_t r_used = 0;
- if (r != NULL) {
- r_used = r->used();
-
- if (G1CollectedHeap::use_parallel_gc_threads()) {
- // need to take the lock to guard against two threads calling
- // get_gc_alloc_region concurrently (very unlikely but...)
- MutexLockerEx x(ParGCRareEvent_lock, Mutex::_no_safepoint_check_flag);
- r->save_marks();
- }
- }
- HeapRegion* old_alloc_region = _gc_alloc_regions[purpose];
- _gc_alloc_regions[purpose] = r;
- if (old_alloc_region != NULL) {
- // Replace aliases too.
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- if (_gc_alloc_regions[ap] == old_alloc_region) {
- _gc_alloc_regions[ap] = r;
- }
- }
- }
- if (r != NULL) {
- push_gc_alloc_region(r);
- if (mark_in_progress() && original_top != r->next_top_at_mark_start()) {
- // We are using a region as a GC alloc region after it has been used
- // as a mutator allocation region during the current marking cycle.
- // The mutator-allocated objects are currently implicitly marked, but
- // when we move hr->next_top_at_mark_start() forward at the the end
- // of the GC pause, they won't be. We therefore mark all objects in
- // the "gap". We do this object-by-object, since marking densely
- // does not currently work right with marking bitmap iteration. This
- // means we rely on TLAB filling at the start of pauses, and no
- // "resuscitation" of filled TLAB's. If we want to do this, we need
- // to fix the marking bitmap iteration.
- HeapWord* curhw = r->next_top_at_mark_start();
- HeapWord* t = original_top;
-
- while (curhw < t) {
- oop cur = (oop)curhw;
- // We'll assume parallel for generality. This is rare code.
- concurrent_mark()->markAndGrayObjectIfNecessary(cur); // can't we just mark them?
- curhw = curhw + cur->size();
- }
- assert(curhw == t, "Should have parsed correctly.");
- }
- if (G1PolicyVerbose > 1) {
- gclog_or_tty->print("New alloc region ["PTR_FORMAT", "PTR_FORMAT", " PTR_FORMAT") "
- "for survivors:", r->bottom(), original_top, r->end());
- r->print();
- }
- g1_policy()->record_before_bytes(r_used);
- }
-}
-
-void G1CollectedHeap::push_gc_alloc_region(HeapRegion* hr) {
- assert(Thread::current()->is_VM_thread() ||
- FreeList_lock->owned_by_self(), "Precondition");
- assert(!hr->is_gc_alloc_region() && !hr->in_collection_set(),
- "Precondition.");
- hr->set_is_gc_alloc_region(true);
- hr->set_next_gc_alloc_region(_gc_alloc_region_list);
- _gc_alloc_region_list = hr;
-}
-
-#ifdef G1_DEBUG
-class FindGCAllocRegion: public HeapRegionClosure {
-public:
- bool doHeapRegion(HeapRegion* r) {
- if (r->is_gc_alloc_region()) {
- gclog_or_tty->print_cr("Region "HR_FORMAT" is still a GC alloc region",
- HR_FORMAT_PARAMS(r));
- }
- return false;
- }
-};
-#endif // G1_DEBUG
-
-void G1CollectedHeap::forget_alloc_region_list() {
+void G1CollectedHeap::init_gc_alloc_regions() {
assert_at_safepoint(true /* should_be_vm_thread */);
- while (_gc_alloc_region_list != NULL) {
- HeapRegion* r = _gc_alloc_region_list;
- assert(r->is_gc_alloc_region(), "Invariant.");
- // We need HeapRegion::oops_on_card_seq_iterate_careful() to work on
- // newly allocated data in order to be able to apply deferred updates
- // before the GC is done for verification purposes (i.e to allow
- // G1HRRSFlushLogBuffersOnVerify). It's safe thing to do after the
- // collection.
- r->ContiguousSpace::set_saved_mark();
- _gc_alloc_region_list = r->next_gc_alloc_region();
- r->set_next_gc_alloc_region(NULL);
- r->set_is_gc_alloc_region(false);
- if (r->is_survivor()) {
- if (r->is_empty()) {
- r->set_not_young();
- } else {
- _young_list->add_survivor_region(r);
- }
- }
- }
-#ifdef G1_DEBUG
- FindGCAllocRegion fa;
- heap_region_iterate(&fa);
-#endif // G1_DEBUG
-}
-
-bool G1CollectedHeap::check_gc_alloc_regions() {
- // TODO: allocation regions check
- return true;
+ _survivor_gc_alloc_region.init();
+ _old_gc_alloc_region.init();
+ HeapRegion* retained_region = _retained_old_gc_alloc_region;
+ _retained_old_gc_alloc_region = NULL;
+
+ // We will discard the current GC alloc region if:
+ // a) it's in the collection set (it can happen!),
+ // b) it's already full (no point in using it),
+ // c) it's empty (this means that it was emptied during
+ // a cleanup and it should be on the free list now), or
+ // d) it's humongous (this means that it was emptied
+ // during a cleanup and was added to the free list, but
+ // has been subseqently used to allocate a humongous
+ // object that may be less than the region size).
+ if (retained_region != NULL &&
+ !retained_region->in_collection_set() &&
+ !(retained_region->top() == retained_region->end()) &&
+ !retained_region->is_empty() &&
+ !retained_region->isHumongous()) {
+ retained_region->set_saved_mark();
+ _old_gc_alloc_region.set(retained_region);
+ _hr_printer.reuse(retained_region);
+ }
+}
+
+void G1CollectedHeap::release_gc_alloc_regions() {
+ _survivor_gc_alloc_region.release();
+ // If we have an old GC alloc region to release, we'll save it in
+ // _retained_old_gc_alloc_region. If we don't
+ // _retained_old_gc_alloc_region will become NULL. This is what we
+ // want either way so no reason to check explicitly for either
+ // condition.
+ _retained_old_gc_alloc_region = _old_gc_alloc_region.release();
}
-void G1CollectedHeap::get_gc_alloc_regions() {
- // First, let's check that the GC alloc region list is empty (it should)
- assert(_gc_alloc_region_list == NULL, "invariant");
-
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- assert(_gc_alloc_regions[ap] == NULL, "invariant");
- assert(_gc_alloc_region_counts[ap] == 0, "invariant");
-
- // Create new GC alloc regions.
- HeapRegion* alloc_region = _retained_gc_alloc_regions[ap];
- _retained_gc_alloc_regions[ap] = NULL;
-
- if (alloc_region != NULL) {
- assert(_retain_gc_alloc_region[ap], "only way to retain a GC region");
-
- // let's make sure that the GC alloc region is not tagged as such
- // outside a GC operation
- assert(!alloc_region->is_gc_alloc_region(), "sanity");
-
- if (alloc_region->in_collection_set() ||
- alloc_region->top() == alloc_region->end() ||
- alloc_region->top() == alloc_region->bottom() ||
- alloc_region->isHumongous()) {
- // we will discard the current GC alloc region if
- // * it's in the collection set (it can happen!),
- // * it's already full (no point in using it),
- // * it's empty (this means that it was emptied during
- // a cleanup and it should be on the free list now), or
- // * it's humongous (this means that it was emptied
- // during a cleanup and was added to the free list, but
- // has been subseqently used to allocate a humongous
- // object that may be less than the region size).
-
- alloc_region = NULL;
- }
- }
-
- if (alloc_region == NULL) {
- // we will get a new GC alloc region
- alloc_region = new_gc_alloc_region(ap, HeapRegion::GrainWords);
- } else {
- // the region was retained from the last collection
- ++_gc_alloc_region_counts[ap];
-
- _hr_printer.reuse(alloc_region);
- }
-
- if (alloc_region != NULL) {
- assert(_gc_alloc_regions[ap] == NULL, "pre-condition");
- set_gc_alloc_region(ap, alloc_region);
- }
-
- assert(_gc_alloc_regions[ap] == NULL ||
- _gc_alloc_regions[ap]->is_gc_alloc_region(),
- "the GC alloc region should be tagged as such");
- assert(_gc_alloc_regions[ap] == NULL ||
- _gc_alloc_regions[ap] == _gc_alloc_region_list,
- "the GC alloc region should be the same as the GC alloc list head");
- }
- // Set alternative regions for allocation purposes that have reached
- // their limit.
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- GCAllocPurpose alt_purpose = g1_policy()->alternative_purpose(ap);
- if (_gc_alloc_regions[ap] == NULL && alt_purpose != ap) {
- _gc_alloc_regions[ap] = _gc_alloc_regions[alt_purpose];
- }
- }
- assert(check_gc_alloc_regions(), "alloc regions messed up");
-}
-
-void G1CollectedHeap::release_gc_alloc_regions(bool totally) {
- // We keep a separate list of all regions that have been alloc regions in
- // the current collection pause. Forget that now. This method will
- // untag the GC alloc regions and tear down the GC alloc region
- // list. It's desirable that no regions are tagged as GC alloc
- // outside GCs.
-
- forget_alloc_region_list();
-
- // The current alloc regions contain objs that have survived
- // collection. Make them no longer GC alloc regions.
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- HeapRegion* r = _gc_alloc_regions[ap];
- _retained_gc_alloc_regions[ap] = NULL;
- _gc_alloc_region_counts[ap] = 0;
-
- if (r != NULL) {
- // we retain nothing on _gc_alloc_regions between GCs
- set_gc_alloc_region(ap, NULL);
-
- if (r->is_empty()) {
- // We didn't actually allocate anything in it; let's just put
- // it back on the free list.
- _free_list.add_as_head(r);
- } else if (_retain_gc_alloc_region[ap] && !totally) {
- // retain it so that we can use it at the beginning of the next GC
- _retained_gc_alloc_regions[ap] = r;
- }
- }
- }
-}
-
-#ifndef PRODUCT
-// Useful for debugging
-
-void G1CollectedHeap::print_gc_alloc_regions() {
- gclog_or_tty->print_cr("GC alloc regions");
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- HeapRegion* r = _gc_alloc_regions[ap];
- if (r == NULL) {
- gclog_or_tty->print_cr(" %2d : "PTR_FORMAT, ap, NULL);
- } else {
- gclog_or_tty->print_cr(" %2d : "PTR_FORMAT" "SIZE_FORMAT,
- ap, r->bottom(), r->used());
- }
- }
+void G1CollectedHeap::abandon_gc_alloc_regions() {
+ assert(_survivor_gc_alloc_region.get() == NULL, "pre-condition");
+ assert(_old_gc_alloc_region.get() == NULL, "pre-condition");
+ _retained_old_gc_alloc_region = NULL;
}
-#endif // PRODUCT
void G1CollectedHeap::init_for_evac_failure(OopsInHeapRegionClosure* cl) {
_drain_in_progress = false;
@@ -3956,8 +3728,6 @@ void G1CollectedHeap::finalize_for_evac_failure() {
_evac_failure_scan_stack = NULL;
}
-
-
// *** Sequential G1 Evacuation
class G1IsAliveClosure: public BoolObjectClosure {
@@ -3968,13 +3738,6 @@ public:
bool do_object_b(oop p) {
// It is reachable if it is outside the collection set, or is inside
// and forwarded.
-
-#ifdef G1_DEBUG
- gclog_or_tty->print_cr("is alive "PTR_FORMAT" in CS %d forwarded %d overall %d",
- (void*) p, _g1->obj_in_cs(p), p->is_forwarded(),
- !_g1->obj_in_cs(p) || p->is_forwarded());
-#endif // G1_DEBUG
-
return !_g1->obj_in_cs(p) || p->is_forwarded();
}
};
@@ -3986,20 +3749,9 @@ public:
void do_oop(narrowOop* p) { guarantee(false, "Not needed"); }
void do_oop( oop* p) {
oop obj = *p;
-#ifdef G1_DEBUG
- if (PrintGC && Verbose) {
- gclog_or_tty->print_cr("keep alive *"PTR_FORMAT" = "PTR_FORMAT" "PTR_FORMAT,
- p, (void*) obj, (void*) *p);
- }
-#endif // G1_DEBUG
-
if (_g1->obj_in_cs(obj)) {
assert( obj->is_forwarded(), "invariant" );
*p = obj->forwardee();
-#ifdef G1_DEBUG
- gclog_or_tty->print_cr(" in CSet: moved "PTR_FORMAT" -> "PTR_FORMAT,
- (void*) obj, (void*) *p);
-#endif // G1_DEBUG
}
}
};
@@ -4269,136 +4021,32 @@ void G1CollectedHeap::preserve_mark_if_necessary(oop obj, markOop m) {
}
}
-// *** Parallel G1 Evacuation
-
HeapWord* G1CollectedHeap::par_allocate_during_gc(GCAllocPurpose purpose,
size_t word_size) {
- assert(!isHumongous(word_size),
- err_msg("we should not be seeing humongous allocation requests "
- "during GC, word_size = "SIZE_FORMAT, word_size));
-
- HeapRegion* alloc_region = _gc_alloc_regions[purpose];
- // let the caller handle alloc failure
- if (alloc_region == NULL) return NULL;
-
- HeapWord* block = alloc_region->par_allocate(word_size);
- if (block == NULL) {
- block = allocate_during_gc_slow(purpose, alloc_region, true, word_size);
- }
- return block;
-}
-
-void G1CollectedHeap::retire_alloc_region(HeapRegion* alloc_region,
- bool par) {
- // Another thread might have obtained alloc_region for the given
- // purpose, and might be attempting to allocate in it, and might
- // succeed. Therefore, we can't do the "finalization" stuff on the
- // region below until we're sure the last allocation has happened.
- // We ensure this by allocating the remaining space with a garbage
- // object.
- if (par) par_allocate_remaining_space(alloc_region);
- // Now we can do the post-GC stuff on the region.
- alloc_region->note_end_of_copying();
- g1_policy()->record_after_bytes(alloc_region->used());
- _hr_printer.retire(alloc_region);
-}
-
-HeapWord*
-G1CollectedHeap::allocate_during_gc_slow(GCAllocPurpose purpose,
- HeapRegion* alloc_region,
- bool par,
- size_t word_size) {
- assert(!isHumongous(word_size),
- err_msg("we should not be seeing humongous allocation requests "
- "during GC, word_size = "SIZE_FORMAT, word_size));
-
- // We need to make sure we serialize calls to this method. Given
- // that the FreeList_lock guards accesses to the free_list anyway,
- // and we need to potentially remove a region from it, we'll use it
- // to protect the whole call.
- MutexLockerEx x(FreeList_lock, Mutex::_no_safepoint_check_flag);
-
- HeapWord* block = NULL;
- // In the parallel case, a previous thread to obtain the lock may have
- // already assigned a new gc_alloc_region.
- if (alloc_region != _gc_alloc_regions[purpose]) {
- assert(par, "But should only happen in parallel case.");
- alloc_region = _gc_alloc_regions[purpose];
- if (alloc_region == NULL) return NULL;
- block = alloc_region->par_allocate(word_size);
- if (block != NULL) return block;
- // Otherwise, continue; this new region is empty, too.
- }
- assert(alloc_region != NULL, "We better have an allocation region");
- retire_alloc_region(alloc_region, par);
-
- if (_gc_alloc_region_counts[purpose] >= g1_policy()->max_regions(purpose)) {
- // Cannot allocate more regions for the given purpose.
- GCAllocPurpose alt_purpose = g1_policy()->alternative_purpose(purpose);
- // Is there an alternative?
- if (purpose != alt_purpose) {
- HeapRegion* alt_region = _gc_alloc_regions[alt_purpose];
- // Has not the alternative region been aliased?
- if (alloc_region != alt_region && alt_region != NULL) {
- // Try to allocate in the alternative region.
- if (par) {
- block = alt_region->par_allocate(word_size);
- } else {
- block = alt_region->allocate(word_size);
- }
- // Make an alias.
- _gc_alloc_regions[purpose] = _gc_alloc_regions[alt_purpose];
- if (block != NULL) {
- return block;
- }
- retire_alloc_region(alt_region, par);
- }
- // Both the allocation region and the alternative one are full
- // and aliased, replace them with a new allocation region.
- purpose = alt_purpose;
+ if (purpose == GCAllocForSurvived) {
+ HeapWord* result = survivor_attempt_allocation(word_size);
+ if (result != NULL) {
+ return result;
} else {
- set_gc_alloc_region(purpose, NULL);
- return NULL;
+ // Let's try to allocate in the old gen in case we can fit the
+ // object there.
+ return old_attempt_allocation(word_size);
}
- }
-
- // Now allocate a new region for allocation.
- alloc_region = new_gc_alloc_region(purpose, word_size);
-
- // let the caller handle alloc failure
- if (alloc_region != NULL) {
-
- assert(check_gc_alloc_regions(), "alloc regions messed up");
- assert(alloc_region->saved_mark_at_top(),
- "Mark should have been saved already.");
- // This must be done last: once it's installed, other regions may
- // allocate in it (without holding the lock.)
- set_gc_alloc_region(purpose, alloc_region);
-
- if (par) {
- block = alloc_region->par_allocate(word_size);
+ } else {
+ assert(purpose == GCAllocForTenured, "sanity");
+ HeapWord* result = old_attempt_allocation(word_size);
+ if (result != NULL) {
+ return result;
} else {
- block = alloc_region->allocate(word_size);
+ // Let's try to allocate in the survivors in case we can fit the
+ // object there.
+ return survivor_attempt_allocation(word_size);
}
- // Caller handles alloc failure.
- } else {
- // This sets other apis using the same old alloc region to NULL, also.
- set_gc_alloc_region(purpose, NULL);
}
- return block; // May be NULL.
-}
-void G1CollectedHeap::par_allocate_remaining_space(HeapRegion* r) {
- HeapWord* block = NULL;
- size_t free_words;
- do {
- free_words = r->free()/HeapWordSize;
- // If there's too little space, no one can allocate, so we're done.
- if (free_words < CollectedHeap::min_fill_size()) return;
- // Otherwise, try to claim it.
- block = r->par_allocate(free_words);
- } while (block == NULL);
- fill_with_object(block, free_words);
+ ShouldNotReachHere();
+ // Trying to keep some compilers happy.
+ return NULL;
}
#ifndef PRODUCT
@@ -4409,6 +4057,23 @@ bool GCLabBitMapClosure::do_bit(size_t offset) {
}
#endif // PRODUCT
+G1ParGCAllocBuffer::G1ParGCAllocBuffer(size_t gclab_word_size) :
+ ParGCAllocBuffer(gclab_word_size),
+ _should_mark_objects(false),
+ _bitmap(G1CollectedHeap::heap()->reserved_region().start(), gclab_word_size),
+ _retired(false)
+{
+ //_should_mark_objects is set to true when G1ParCopyHelper needs to
+ // mark the forwarded location of an evacuated object.
+ // We set _should_mark_objects to true if marking is active, i.e. when we
+ // need to propagate a mark, or during an initial mark pause, i.e. when we
+ // need to mark objects immediately reachable by the roots.
+ if (G1CollectedHeap::heap()->mark_in_progress() ||
+ G1CollectedHeap::heap()->g1_policy()->during_initial_mark_pause()) {
+ _should_mark_objects = true;
+ }
+}
+
G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, int queue_num)
: _g1h(g1h),
_refs(g1h->task_queue(queue_num)),
@@ -4524,12 +4189,14 @@ void G1ParScanThreadState::trim_queue() {
G1ParClosureSuper::G1ParClosureSuper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state) :
_g1(g1), _g1_rem(_g1->g1_rem_set()), _cm(_g1->concurrent_mark()),
- _par_scan_state(par_scan_state) { }
+ _par_scan_state(par_scan_state),
+ _during_initial_mark(_g1->g1_policy()->during_initial_mark_pause()),
+ _mark_in_progress(_g1->mark_in_progress()) { }
-template <class T> void G1ParCopyHelper::mark_forwardee(T* p) {
- // This is called _after_ do_oop_work has been called, hence after
- // the object has been relocated to its new location and *p points
- // to its new location.
+template <class T> void G1ParCopyHelper::mark_object(T* p) {
+ // This is called from do_oop_work for objects that are not
+ // in the collection set. Objects in the collection set
+ // are marked after they have been evacuated.
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
@@ -4541,7 +4208,7 @@ template <class T> void G1ParCopyHelper::mark_forwardee(T* p) {
}
}
-oop G1ParCopyHelper::copy_to_survivor_space(oop old) {
+oop G1ParCopyHelper::copy_to_survivor_space(oop old, bool should_mark_copy) {
size_t word_sz = old->size();
HeapRegion* from_region = _g1->heap_region_containing_raw(old);
// +1 to make the -1 indexes valid...
@@ -4597,8 +4264,8 @@ oop G1ParCopyHelper::copy_to_survivor_space(oop old) {
obj->set_mark(m);
}
- // preserve "next" mark bit
- if (_g1->mark_in_progress() && !_g1->is_obj_ill(old)) {
+ // Mark the evacuated object or propagate "next" mark bit
+ if (should_mark_copy) {
if (!use_local_bitmaps ||
!_par_scan_state->alloc_buffer(alloc_purpose)->mark(obj_ptr)) {
// if we couldn't mark it on the local bitmap (this happens when
@@ -4606,11 +4273,12 @@ oop G1ParCopyHelper::copy_to_survivor_space(oop old) {
// the bullet and do the standard parallel mark
_cm->markAndGrayObjectIfNecessary(obj);
}
-#if 1
+
if (_g1->isMarkedNext(old)) {
+ // Unmark the object's old location so that marking
+ // doesn't think the old object is alive.
_cm->nextMarkBitMap()->parClear((HeapWord*)old);
}
-#endif
}
size_t* surv_young_words = _par_scan_state->surviving_young_words();
@@ -4633,26 +4301,62 @@ oop G1ParCopyHelper::copy_to_survivor_space(oop old) {
return obj;
}
-template <bool do_gen_barrier, G1Barrier barrier, bool do_mark_forwardee>
+template <bool do_gen_barrier, G1Barrier barrier, bool do_mark_object>
template <class T>
-void G1ParCopyClosure <do_gen_barrier, barrier, do_mark_forwardee>
+void G1ParCopyClosure<do_gen_barrier, barrier, do_mark_object>
::do_oop_work(T* p) {
oop obj = oopDesc::load_decode_heap_oop(p);
assert(barrier != G1BarrierRS || obj != NULL,
"Precondition: G1BarrierRS implies obj is nonNull");
+ // Marking:
+ // If the object is in the collection set, then the thread
+ // that copies the object should mark, or propagate the
+ // mark to, the evacuated object.
+ // If the object is not in the collection set then we
+ // should call the mark_object() method depending on the
+ // value of the template parameter do_mark_object (which will
+ // be true for root scanning closures during an initial mark
+ // pause).
+ // The mark_object() method first checks whether the object
+ // is marked and, if not, attempts to mark the object.
+
// here the null check is implicit in the cset_fast_test() test
if (_g1->in_cset_fast_test(obj)) {
if (obj->is_forwarded()) {
oopDesc::encode_store_heap_oop(p, obj->forwardee());
+ // If we are a root scanning closure during an initial
+ // mark pause (i.e. do_mark_object will be true) then
+ // we also need to handle marking of roots in the
+ // event of an evacuation failure. In the event of an
+ // evacuation failure, the object is forwarded to itself
+ // and not copied so let's mark it here.
+ if (do_mark_object && obj->forwardee() == obj) {
+ mark_object(p);
+ }
} else {
- oop copy_oop = copy_to_survivor_space(obj);
+ // We need to mark the copied object if we're a root scanning
+ // closure during an initial mark pause (i.e. do_mark_object
+ // will be true), or the object is already marked and we need
+ // to propagate the mark to the evacuated copy.
+ bool should_mark_copy = do_mark_object ||
+ _during_initial_mark ||
+ (_mark_in_progress && !_g1->is_obj_ill(obj));
+
+ oop copy_oop = copy_to_survivor_space(obj, should_mark_copy);
oopDesc::encode_store_heap_oop(p, copy_oop);
}
// When scanning the RS, we only care about objs in CS.
if (barrier == G1BarrierRS) {
_par_scan_state->update_rs(_from, p, _par_scan_state->queue_num());
}
+ } else {
+ // The object is not in collection set. If we're a root scanning
+ // closure during an initial mark pause (i.e. do_mark_object will
+ // be true) then attempt to mark the object.
+ if (do_mark_object) {
+ mark_object(p);
+ }
}
if (barrier == G1BarrierEvac && obj != NULL) {
@@ -4834,6 +4538,7 @@ public:
scan_perm_cl,
i);
pss.end_strong_roots();
+
{
double start = os::elapsedTime();
G1ParEvacuateFollowersClosure evac(_g1h, &pss, _queues, &_terminator);
@@ -4890,17 +4595,28 @@ g1_process_strong_roots(bool collecting_perm_gen,
&eager_scan_code_roots,
&buf_scan_perm);
- // Finish up any enqueued closure apps.
+ // Now the ref_processor roots.
+ if (!_process_strong_tasks->is_task_claimed(G1H_PS_refProcessor_oops_do)) {
+ // We need to treat the discovered reference lists as roots and
+ // keep entries (which are added by the marking threads) on them
+ // live until they can be processed at the end of marking.
+ ref_processor()->weak_oops_do(&buf_scan_non_heap_roots);
+ }
+
+ // Finish up any enqueued closure apps (attributed as object copy time).
buf_scan_non_heap_roots.done();
buf_scan_perm.done();
+
double ext_roots_end = os::elapsedTime();
+
g1_policy()->reset_obj_copy_time(worker_i);
- double obj_copy_time_sec =
- buf_scan_non_heap_roots.closure_app_seconds() +
- buf_scan_perm.closure_app_seconds();
+ double obj_copy_time_sec = buf_scan_perm.closure_app_seconds() +
+ buf_scan_non_heap_roots.closure_app_seconds();
g1_policy()->record_obj_copy_time(worker_i, obj_copy_time_sec * 1000.0);
+
double ext_root_time_ms =
((ext_roots_end - ext_roots_start) - obj_copy_time_sec) * 1000.0;
+
g1_policy()->record_ext_root_scan_time(worker_i, ext_root_time_ms);
// Scan strong roots in mark stack.
@@ -4910,21 +4626,11 @@ g1_process_strong_roots(bool collecting_perm_gen,
double mark_stack_scan_ms = (os::elapsedTime() - ext_roots_end) * 1000.0;
g1_policy()->record_mark_stack_scan_time(worker_i, mark_stack_scan_ms);
- // XXX What should this be doing in the parallel case?
- g1_policy()->record_collection_pause_end_CH_strong_roots();
// Now scan the complement of the collection set.
if (scan_rs != NULL) {
g1_rem_set()->oops_into_collection_set_do(scan_rs, worker_i);
}
- // Finish with the ref_processor roots.
- if (!_process_strong_tasks->is_task_claimed(G1H_PS_refProcessor_oops_do)) {
- // We need to treat the discovered reference lists as roots and
- // keep entries (which are added by the marking threads) on them
- // live until they can be processed at the end of marking.
- ref_processor()->weak_oops_do(scan_non_heap_roots);
- ref_processor()->oops_do(scan_non_heap_roots);
- }
- g1_policy()->record_collection_pause_end_G1_strong_roots();
+
_process_strong_tasks->all_tasks_completed();
}
@@ -4935,24 +4641,6 @@ G1CollectedHeap::g1_process_weak_roots(OopClosure* root_closure,
SharedHeap::process_weak_roots(root_closure, &roots_in_blobs, non_root_closure);
}
-
-class SaveMarksClosure: public HeapRegionClosure {
-public:
- bool doHeapRegion(HeapRegion* r) {
- r->save_marks();
- return false;
- }
-};
-
-void G1CollectedHeap::save_marks() {
- if (!CollectedHeap::use_parallel_gc_threads()) {
- SaveMarksClosure sm;
- heap_region_iterate(&sm);
- }
- // We do this even in the parallel case
- perm_gen()->save_marks();
-}
-
void G1CollectedHeap::evacuate_collection_set() {
set_evacuation_failed(false);
@@ -4983,10 +4671,6 @@ void G1CollectedHeap::evacuate_collection_set() {
double par_time = (os::elapsedTime() - start_par) * 1000.0;
g1_policy()->record_par_time(par_time);
set_par_threads(0);
- // Is this the right thing to do here? We don't save marks
- // on individual heap regions when we allocate from
- // them in parallel, so this seems like the correct place for this.
- retire_all_alloc_regions();
// Weak root processing.
// Note: when JSR 292 is enabled and code blobs can contain
@@ -4997,7 +4681,7 @@ void G1CollectedHeap::evacuate_collection_set() {
G1KeepAliveClosure keep_alive(this);
JNIHandles::weak_oops_do(&is_alive, &keep_alive);
}
- release_gc_alloc_regions(false /* totally */);
+ release_gc_alloc_regions();
g1_rem_set()->cleanup_after_oops_into_collection_set_do();
concurrent_g1_refine()->clear_hot_cache();
@@ -5118,68 +4802,31 @@ void G1CollectedHeap::update_sets_after_freeing_regions(size_t pre_used,
}
}
-void G1CollectedHeap::dirtyCardsForYoungRegions(CardTableModRefBS* ct_bs, HeapRegion* list) {
- while (list != NULL) {
- guarantee( list->is_young(), "invariant" );
-
- HeapWord* bottom = list->bottom();
- HeapWord* end = list->end();
- MemRegion mr(bottom, end);
- ct_bs->dirty(mr);
-
- list = list->get_next_young_region();
- }
-}
-
-
class G1ParCleanupCTTask : public AbstractGangTask {
CardTableModRefBS* _ct_bs;
G1CollectedHeap* _g1h;
HeapRegion* volatile _su_head;
public:
G1ParCleanupCTTask(CardTableModRefBS* ct_bs,
- G1CollectedHeap* g1h,
- HeapRegion* survivor_list) :
+ G1CollectedHeap* g1h) :
AbstractGangTask("G1 Par Cleanup CT Task"),
- _ct_bs(ct_bs),
- _g1h(g1h),
- _su_head(survivor_list)
- { }
+ _ct_bs(ct_bs), _g1h(g1h) { }
void work(int i) {
HeapRegion* r;
while (r = _g1h->pop_dirty_cards_region()) {
clear_cards(r);
}
- // Redirty the cards of the survivor regions.
- dirty_list(&this->_su_head);
}
void clear_cards(HeapRegion* r) {
- // Cards for Survivor regions will be dirtied later.
+ // Cards of the survivors should have already been dirtied.
if (!r->is_survivor()) {
_ct_bs->clear(MemRegion(r->bottom(), r->end()));
}
}
-
- void dirty_list(HeapRegion* volatile * head_ptr) {
- HeapRegion* head;
- do {
- // Pop region off the list.
- head = *head_ptr;
- if (head != NULL) {
- HeapRegion* r = (HeapRegion*)
- Atomic::cmpxchg_ptr(head->get_next_young_region(), head_ptr, head);
- if (r == head) {
- assert(!r->isHumongous(), "Humongous regions shouldn't be on survivor list");
- _ct_bs->dirty(MemRegion(r->bottom(), r->end()));
- }
- }
- } while (*head_ptr != NULL);
- }
};
-
#ifndef PRODUCT
class G1VerifyCardTableCleanup: public HeapRegionClosure {
G1CollectedHeap* _g1h;
@@ -5235,8 +4882,7 @@ void G1CollectedHeap::cleanUpCardTable() {
double start = os::elapsedTime();
// Iterate over the dirty cards region list.
- G1ParCleanupCTTask cleanup_task(ct_bs, this,
- _young_list->first_survivor_region());
+ G1ParCleanupCTTask cleanup_task(ct_bs, this);
if (ParallelGCThreads > 0) {
set_par_threads(workers()->total_workers());
@@ -5253,10 +4899,6 @@ void G1CollectedHeap::cleanUpCardTable() {
}
r->set_next_dirty_cards_region(NULL);
}
- // now, redirty the cards of the survivor regions
- // (it seemed faster to do it this way, instead of iterating over
- // all regions and then clearing / dirtying as appropriate)
- dirtyCardsForYoungRegions(ct_bs, _young_list->first_survivor_region());
}
double elapsed = os::elapsedTime() - start;
@@ -5478,39 +5120,10 @@ bool G1CollectedHeap::check_young_list_empty(bool check_heap, bool check_sample)
void G1CollectedHeap::empty_young_list() {
assert(heap_lock_held_for_gc(),
"the heap lock should already be held by or for this thread");
- assert(g1_policy()->in_young_gc_mode(), "should be in young GC mode");
_young_list->empty_list();
}
-bool G1CollectedHeap::all_alloc_regions_no_allocs_since_save_marks() {
- bool no_allocs = true;
- for (int ap = 0; ap < GCAllocPurposeCount && no_allocs; ++ap) {
- HeapRegion* r = _gc_alloc_regions[ap];
- no_allocs = r == NULL || r->saved_mark_at_top();
- }
- return no_allocs;
-}
-
-void G1CollectedHeap::retire_all_alloc_regions() {
- for (int ap = 0; ap < GCAllocPurposeCount; ++ap) {
- HeapRegion* r = _gc_alloc_regions[ap];
- if (r != NULL) {
- // Check for aliases.
- bool has_processed_alias = false;
- for (int i = 0; i < ap; ++i) {
- if (_gc_alloc_regions[i] == r) {
- has_processed_alias = true;
- break;
- }
- }
- if (!has_processed_alias) {
- retire_alloc_region(r, false /* par */);
- }
- }
- }
-}
-
// Done at the start of full GC.
void G1CollectedHeap::tear_down_region_lists() {
_free_list.remove_all();
@@ -5565,6 +5178,8 @@ bool G1CollectedHeap::is_in_closed_subset(const void* p) const {
}
}
+// Methods for the mutator alloc region
+
HeapRegion* G1CollectedHeap::new_mutator_alloc_region(size_t word_size,
bool force) {
assert_heap_locked_or_at_safepoint(true /* should_be_vm_thread */);
@@ -5605,6 +5220,69 @@ void MutatorAllocRegion::retire_region(HeapRegion* alloc_region,
_g1h->retire_mutator_alloc_region(alloc_region, allocated_bytes);
}
+// Methods for the GC alloc regions
+
+HeapRegion* G1CollectedHeap::new_gc_alloc_region(size_t word_size,
+ size_t count,
+ GCAllocPurpose ap) {
+ assert(FreeList_lock->owned_by_self(), "pre-condition");
+
+ if (count < g1_policy()->max_regions(ap)) {
+ HeapRegion* new_alloc_region = new_region(word_size,
+ true /* do_expand */);
+ if (new_alloc_region != NULL) {
+ // We really only need to do this for old regions given that we
+ // should never scan survivors. But it doesn't hurt to do it
+ // for survivors too.
+ new_alloc_region->set_saved_mark();
+ if (ap == GCAllocForSurvived) {
+ new_alloc_region->set_survivor();
+ _hr_printer.alloc(new_alloc_region, G1HRPrinter::Survivor);
+ } else {
+ _hr_printer.alloc(new_alloc_region, G1HRPrinter::Old);
+ }
+ return new_alloc_region;
+ } else {
+ g1_policy()->note_alloc_region_limit_reached(ap);
+ }
+ }
+ return NULL;
+}
+
+void G1CollectedHeap::retire_gc_alloc_region(HeapRegion* alloc_region,
+ size_t allocated_bytes,
+ GCAllocPurpose ap) {
+ alloc_region->note_end_of_copying();
+ g1_policy()->record_bytes_copied_during_gc(allocated_bytes);
+ if (ap == GCAllocForSurvived) {
+ young_list()->add_survivor_region(alloc_region);
+ }
+ _hr_printer.retire(alloc_region);
+}
+
+HeapRegion* SurvivorGCAllocRegion::allocate_new_region(size_t word_size,
+ bool force) {
+ assert(!force, "not supported for GC alloc regions");
+ return _g1h->new_gc_alloc_region(word_size, count(), GCAllocForSurvived);
+}
+
+void SurvivorGCAllocRegion::retire_region(HeapRegion* alloc_region,
+ size_t allocated_bytes) {
+ _g1h->retire_gc_alloc_region(alloc_region, allocated_bytes,
+ GCAllocForSurvived);
+}
+
+HeapRegion* OldGCAllocRegion::allocate_new_region(size_t word_size,
+ bool force) {
+ assert(!force, "not supported for GC alloc regions");
+ return _g1h->new_gc_alloc_region(word_size, count(), GCAllocForTenured);
+}
+
+void OldGCAllocRegion::retire_region(HeapRegion* alloc_region,
+ size_t allocated_bytes) {
+ _g1h->retire_gc_alloc_region(alloc_region, allocated_bytes,
+ GCAllocForTenured);
+}
// Heap region set verification
class VerifyRegionListsClosure : public HeapRegionClosure {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
index 98a7df0..650e438 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp
@@ -155,6 +155,24 @@ public:
: G1AllocRegion("Mutator Alloc Region", false /* bot_updates */) { }
};
+class SurvivorGCAllocRegion : public G1AllocRegion {
+protected:
+ virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
+ virtual void retire_region(HeapRegion* alloc_region, size_t allocated_bytes);
+public:
+ SurvivorGCAllocRegion()
+ : G1AllocRegion("Survivor GC Alloc Region", false /* bot_updates */) { }
+};
+
+class OldGCAllocRegion : public G1AllocRegion {
+protected:
+ virtual HeapRegion* allocate_new_region(size_t word_size, bool force);
+ virtual void retire_region(HeapRegion* alloc_region, size_t allocated_bytes);
+public:
+ OldGCAllocRegion()
+ : G1AllocRegion("Old GC Alloc Region", true /* bot_updates */) { }
+};
+
class RefineCardTableEntryClosure;
class G1CollectedHeap : public SharedHeap {
friend class VM_G1CollectForAllocation;
@@ -163,6 +181,8 @@ class G1CollectedHeap : public SharedHeap {
friend class VM_G1IncCollectionPause;
friend class VMStructs;
friend class MutatorAllocRegion;
+ friend class SurvivorGCAllocRegion;
+ friend class OldGCAllocRegion;
// Closures used in implementation.
friend class G1ParCopyHelper;
@@ -225,30 +245,33 @@ private:
// Alloc region used to satisfy mutator allocation requests.
MutatorAllocRegion _mutator_alloc_region;
+ // Alloc region used to satisfy allocation requests by the GC for
+ // survivor objects.
+ SurvivorGCAllocRegion _survivor_gc_alloc_region;
+
+ // Alloc region used to satisfy allocation requests by the GC for
+ // old objects.
+ OldGCAllocRegion _old_gc_alloc_region;
+
+ // The last old region we allocated to during the last GC.
+ // Typically, it is not full so we should re-use it during the next GC.
+ HeapRegion* _retained_old_gc_alloc_region;
+
// It resets the mutator alloc region before new allocations can take place.
void init_mutator_alloc_region();
// It releases the mutator alloc region.
void release_mutator_alloc_region();
- void abandon_gc_alloc_regions();
+ // It initializes the GC alloc regions at the start of a GC.
+ void init_gc_alloc_regions();
- // The to-space memory regions into which objects are being copied during
- // a GC.
- HeapRegion* _gc_alloc_regions[GCAllocPurposeCount];
- size_t _gc_alloc_region_counts[GCAllocPurposeCount];
- // These are the regions, one per GCAllocPurpose, that are half-full
- // at the end of a collection and that we want to reuse during the
- // next collection.
- HeapRegion* _retained_gc_alloc_regions[GCAllocPurposeCount];
- // This specifies whether we will keep the last half-full region at
- // the end of a collection so that it can be reused during the next
- // collection (this is specified per GCAllocPurpose)
- bool _retain_gc_alloc_region[GCAllocPurposeCount];
-
- // A list of the regions that have been set to be alloc regions in the
- // current collection.
- HeapRegion* _gc_alloc_region_list;
+ // It releases the GC alloc regions at the end of a GC.
+ void release_gc_alloc_regions();
+
+ // It does any cleanup that needs to be done on the GC alloc regions
+ // before a Full GC.
+ void abandon_gc_alloc_regions();
// Helper for monitoring and management support.
G1MonitoringSupport* _g1mm;
@@ -256,20 +279,6 @@ private:
// Determines PLAB size for a particular allocation purpose.
static size_t desired_plab_sz(GCAllocPurpose purpose);
- // When called by par thread, requires the FreeList_lock to be held.
- void push_gc_alloc_region(HeapRegion* hr);
-
- // This should only be called single-threaded. Undeclares all GC alloc
- // regions.
- void forget_alloc_region_list();
-
- // Should be used to set an alloc region, because there's other
- // associated bookkeeping.
- void set_gc_alloc_region(int purpose, HeapRegion* r);
-
- // Check well-formedness of alloc region list.
- bool check_gc_alloc_regions();
-
// Outside of GC pauses, the number of bytes used in all regions other
// than the current allocation region.
size_t _summary_bytes_used;
@@ -387,14 +396,7 @@ private:
protected:
- // Returns "true" iff none of the gc alloc regions have any allocations
- // since the last call to "save_marks".
- bool all_alloc_regions_no_allocs_since_save_marks();
- // Perform finalization stuff on all allocation regions.
- void retire_all_alloc_regions();
-
- // The number of regions allocated to hold humongous objects.
- int _num_humongous_regions;
+ // The young region list.
YoungList* _young_list;
// The current policy object for the collector.
@@ -413,11 +415,6 @@ protected:
// request.
HeapRegion* new_region(size_t word_size, bool do_expand);
- // Try to allocate a new region to be used for allocation by
- // a GC thread. It will try to expand the heap if no region is
- // available.
- HeapRegion* new_gc_alloc_region(int purpose, size_t word_size);
-
// Attempt to satisfy a humongous allocation request of the given
// size by finding a contiguous set of free regions of num_regions
// length and remove them from the master free list. Return the
@@ -525,16 +522,25 @@ protected:
// that parallel threads might be attempting allocations.
void par_allocate_remaining_space(HeapRegion* r);
- // Retires an allocation region when it is full or at the end of a
- // GC pause.
- void retire_alloc_region(HeapRegion* alloc_region, bool par);
+ // Allocation attempt during GC for a survivor object / PLAB.
+ inline HeapWord* survivor_attempt_allocation(size_t word_size);
- // These two methods are the "callbacks" from the G1AllocRegion class.
+ // Allocation attempt during GC for an old object / PLAB.
+ inline HeapWord* old_attempt_allocation(size_t word_size);
+ // These methods are the "callbacks" from the G1AllocRegion class.
+
+ // For mutator alloc regions.
HeapRegion* new_mutator_alloc_region(size_t word_size, bool force);
void retire_mutator_alloc_region(HeapRegion* alloc_region,
size_t allocated_bytes);
+ // For GC alloc regions.
+ HeapRegion* new_gc_alloc_region(size_t word_size, size_t count,
+ GCAllocPurpose ap);
+ void retire_gc_alloc_region(HeapRegion* alloc_region,
+ size_t allocated_bytes, GCAllocPurpose ap);
+
// - if explicit_gc is true, the GC is for a System.gc() or a heap
// inspection request and should collect the entire heap
// - if clear_all_soft_refs is true, all soft references should be
@@ -728,9 +734,6 @@ protected:
void g1_process_weak_roots(OopClosure* root_closure,
OopClosure* non_root_closure);
- // Invoke "save_marks" on all heap regions.
- void save_marks();
-
// Frees a non-humongous region by initializing its contents and
// adding it to the free list that's passed as a parameter (this is
// usually a local list which will be appended to the master free
@@ -822,24 +825,6 @@ protected:
oop handle_evacuation_failure_par(OopsInHeapRegionClosure* cl, oop obj);
void handle_evacuation_failure_common(oop obj, markOop m);
- // Ensure that the relevant gc_alloc regions are set.
- void get_gc_alloc_regions();
- // We're done with GC alloc regions. We are going to tear down the
- // gc alloc list and remove the gc alloc tag from all the regions on
- // that list. However, we will also retain the last (i.e., the one
- // that is half-full) GC alloc region, per GCAllocPurpose, for
- // possible reuse during the next collection, provided
- // _retain_gc_alloc_region[] indicates that it should be the
- // case. Said regions are kept in the _retained_gc_alloc_regions[]
- // array. If the parameter totally is set, we will not retain any
- // regions, irrespective of what _retain_gc_alloc_region[]
- // indicates.
- void release_gc_alloc_regions(bool totally);
-#ifndef PRODUCT
- // Useful for debugging.
- void print_gc_alloc_regions();
-#endif // !PRODUCT
-
// Instance of the concurrent mark is_alive closure for embedding
// into the reference processor as the is_alive_non_header. This
// prevents unnecessary additions to the discovered lists during
@@ -948,9 +933,6 @@ public:
// result might be a bit inaccurate.
size_t used_unlocked() const;
size_t recalculate_used() const;
-#ifndef PRODUCT
- size_t recalculate_used_regions() const;
-#endif // PRODUCT
// These virtual functions do the actual allocation.
// Some heaps may offer a contiguous region for shared non-blocking
@@ -1110,9 +1092,6 @@ public:
virtual bool is_in_closed_subset(const void* p) const;
- // Dirty card table entries covering a list of young regions.
- void dirtyCardsForYoungRegions(CardTableModRefBS* ct_bs, HeapRegion* list);
-
// This resets the card table to all zeros. It is used after
// a collection pause which used the card table to claim cards.
void cleanUpCardTable();
@@ -1284,16 +1263,10 @@ public:
// in the young gen: for the SATB pre-barrier, there is no
// pre-value that needs to be remembered; for the remembered-set
// update logging post-barrier, we don't maintain remembered set
- // information for young gen objects. Note that non-generational
- // G1 does not have any "young" objects, should not elide
- // the rs logging barrier and so should always answer false below.
- // However, non-generational G1 (-XX:-G1Gen) appears to have
- // bit-rotted so was not tested below.
+ // information for young gen objects.
virtual bool can_elide_initializing_store_barrier(oop new_obj) {
// Re 6920090, 6920109 above.
assert(ReduceInitialCardMarksForG1, "Else cannot be here");
- assert(G1Gen || !is_in_young(new_obj),
- "Non-generational G1 should never return true below");
return is_in_young(new_obj);
}
@@ -1410,9 +1383,6 @@ public:
// bitmap off to the side.
void doConcurrentMark();
- // Do a full concurrent marking, synchronously.
- void do_sync_mark();
-
bool isMarkedPrev(oop obj) const;
bool isMarkedNext(oop obj) const;
@@ -1745,26 +1715,22 @@ public:
class G1ParGCAllocBuffer: public ParGCAllocBuffer {
private:
bool _retired;
- bool _during_marking;
+ bool _should_mark_objects;
GCLabBitMap _bitmap;
public:
- G1ParGCAllocBuffer(size_t gclab_word_size) :
- ParGCAllocBuffer(gclab_word_size),
- _during_marking(G1CollectedHeap::heap()->mark_in_progress()),
- _bitmap(G1CollectedHeap::heap()->reserved_region().start(), gclab_word_size),
- _retired(false)
- { }
+ G1ParGCAllocBuffer(size_t gclab_word_size);
inline bool mark(HeapWord* addr) {
guarantee(use_local_bitmaps, "invariant");
- assert(_during_marking, "invariant");
+ assert(_should_mark_objects, "invariant");
return _bitmap.mark(addr);
}
inline void set_buf(HeapWord* buf) {
- if (use_local_bitmaps && _during_marking)
+ if (use_local_bitmaps && _should_mark_objects) {
_bitmap.set_buffer(buf);
+ }
ParGCAllocBuffer::set_buf(buf);
_retired = false;
}
@@ -1772,7 +1738,7 @@ public:
inline void retire(bool end_of_gc, bool retain) {
if (_retired)
return;
- if (use_local_bitmaps && _during_marking) {
+ if (use_local_bitmaps && _should_mark_objects) {
_bitmap.retire();
}
ParGCAllocBuffer::retire(end_of_gc, retain);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
index 05a42d7..ee18c4d 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp
@@ -77,6 +77,38 @@ G1CollectedHeap::attempt_allocation(size_t word_size,
return result;
}
+inline HeapWord* G1CollectedHeap::survivor_attempt_allocation(size_t
+ word_size) {
+ assert(!isHumongous(word_size),
+ "we should not be seeing humongous-size allocations in this path");
+
+ HeapWord* result = _survivor_gc_alloc_region.attempt_allocation(word_size,
+ false /* bot_updates */);
+ if (result == NULL) {
+ MutexLockerEx x(FreeList_lock, Mutex::_no_safepoint_check_flag);
+ result = _survivor_gc_alloc_region.attempt_allocation_locked(word_size,
+ false /* bot_updates */);
+ }
+ if (result != NULL) {
+ dirty_young_block(result, word_size);
+ }
+ return result;
+}
+
+inline HeapWord* G1CollectedHeap::old_attempt_allocation(size_t word_size) {
+ assert(!isHumongous(word_size),
+ "we should not be seeing humongous-size allocations in this path");
+
+ HeapWord* result = _old_gc_alloc_region.attempt_allocation(word_size,
+ true /* bot_updates */);
+ if (result == NULL) {
+ MutexLockerEx x(FreeList_lock, Mutex::_no_safepoint_check_flag);
+ result = _old_gc_alloc_region.attempt_allocation_locked(word_size,
+ true /* bot_updates */);
+ }
+ return result;
+}
+
// It dirties the cards that cover the block so that so that the post
// write barrier never queues anything when updating objects on this
// block. It is assumed (and in fact we assert) that the block
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
index 4084550..d43d080 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
@@ -28,6 +28,7 @@
#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1CollectorPolicy.hpp"
+#include "gc_implementation/g1/g1ErgoVerbose.hpp"
#include "gc_implementation/g1/heapRegionRemSet.hpp"
#include "gc_implementation/shared/gcPolicyCounters.hpp"
#include "runtime/arguments.hpp"
@@ -134,13 +135,10 @@ public:
G1CollectorPolicy::G1CollectorPolicy() :
_parallel_gc_threads(G1CollectedHeap::use_parallel_gc_threads()
- ? ParallelGCThreads : 1),
-
+ ? ParallelGCThreads : 1),
_n_pauses(0),
- _recent_CH_strong_roots_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
- _recent_G1_strong_roots_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
- _recent_evac_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
+ _recent_rs_scan_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
_recent_pause_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
_recent_rs_sizes(new TruncatedSeq(NumPrevPausesForHeuristics)),
_recent_gc_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
@@ -148,6 +146,7 @@ G1CollectorPolicy::G1CollectorPolicy() :
_stop_world_start(0.0),
_all_stop_world_times_ms(new NumberSeq()),
_all_yield_times_ms(new NumberSeq()),
+ _using_new_ratio_calculations(false),
_all_mod_union_times_ms(new NumberSeq()),
@@ -173,7 +172,6 @@ G1CollectorPolicy::G1CollectorPolicy() :
_cur_aux_times_ms(new double[_aux_num]),
_cur_aux_times_set(new bool[_aux_num]),
- _concurrent_mark_init_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
_concurrent_mark_remark_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
_concurrent_mark_cleanup_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
@@ -204,7 +202,6 @@ G1CollectorPolicy::G1CollectorPolicy() :
// </NEW PREDICTION>
- _in_young_gc_mode(false),
_full_young_gcs(true),
_full_young_pause_num(0),
_partial_young_pause_num(0),
@@ -276,15 +273,26 @@ G1CollectorPolicy::G1CollectorPolicy() :
_recorded_survivor_tail(NULL),
_survivors_age_table(true),
- _gc_overhead_perc(0.0)
+ _gc_overhead_perc(0.0) {
-{
// Set up the region size and associated fields. Given that the
// policy is created before the heap, we have to set this up here,
// so it's done as soon as possible.
HeapRegion::setup_heap_region_size(Arguments::min_heap_size());
HeapRegionRemSet::setup_remset_size();
+ G1ErgoVerbose::initialize();
+ if (PrintAdaptiveSizePolicy) {
+ // Currently, we only use a single switch for all the heuristics.
+ G1ErgoVerbose::set_enabled(true);
+ // Given that we don't currently have a verboseness level
+ // parameter, we'll hardcode this to high. This can be easily
+ // changed in the future.
+ G1ErgoVerbose::set_level(ErgoHigh);
+ } else {
+ G1ErgoVerbose::set_enabled(false);
+ }
+
// Verify PLAB sizes
const uint region_size = HeapRegion::GrainWords;
if (YoungPLABSize > region_size || OldPLABSize > region_size) {
@@ -403,21 +411,30 @@ G1CollectorPolicy::G1CollectorPolicy() :
_sigma = (double) G1ConfidencePercent / 100.0;
// start conservatively (around 50ms is about right)
- _concurrent_mark_init_times_ms->add(0.05);
_concurrent_mark_remark_times_ms->add(0.05);
_concurrent_mark_cleanup_times_ms->add(0.20);
_tenuring_threshold = MaxTenuringThreshold;
-
- // if G1FixedSurvivorSpaceSize is 0 which means the size is not
- // fixed, then _max_survivor_regions will be calculated at
- // calculate_young_list_target_length during initialization
- _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes;
+ // _max_survivor_regions will be calculated by
+ // update_young_list_target_length() during initialization.
+ _max_survivor_regions = 0;
assert(GCTimeRatio > 0,
"we should have set it to a default value set_g1_gc_flags() "
"if a user set it to 0");
_gc_overhead_perc = 100.0 * (1.0 / (1.0 + GCTimeRatio));
+ uintx reserve_perc = G1ReservePercent;
+ // Put an artificial ceiling on this so that it's not set to a silly value.
+ if (reserve_perc > 50) {
+ reserve_perc = 50;
+ warning("G1ReservePercent is set to a value that is too large, "
+ "it's been updated to %u", reserve_perc);
+ }
+ _reserve_factor = (double) reserve_perc / 100.0;
+ // This will be set when the heap is expanded
+ // for the first time during initialization.
+ _reserve_regions = 0;
+
initialize_all();
}
@@ -442,16 +459,15 @@ void G1CollectorPolicy::initialize_flags() {
// ParallelScavengeHeap::initialize()). We might change this in the
// future, but it's a good start.
class G1YoungGenSizer : public TwoGenerationCollectorPolicy {
- size_t size_to_region_num(size_t byte_size) {
- return MAX2((size_t) 1, byte_size / HeapRegion::GrainBytes);
- }
public:
G1YoungGenSizer() {
initialize_flags();
initialize_size_info();
}
-
+ size_t size_to_region_num(size_t byte_size) {
+ return MAX2((size_t) 1, byte_size / HeapRegion::GrainBytes);
+ }
size_t min_young_region_num() {
return size_to_region_num(_min_gen0_size);
}
@@ -463,6 +479,13 @@ public:
}
};
+void G1CollectorPolicy::update_young_list_size_using_newratio(size_t number_of_heap_regions) {
+ assert(number_of_heap_regions > 0, "Heap must be initialized");
+ size_t young_size = number_of_heap_regions / (NewRatio + 1);
+ _min_desired_young_length = young_size;
+ _max_desired_young_length = young_size;
+}
+
void G1CollectorPolicy::init() {
// Set aside an initial future to_space.
_g1 = G1CollectedHeap::heap();
@@ -471,27 +494,37 @@ void G1CollectorPolicy::init() {
initialize_gc_policy_counters();
- if (G1Gen) {
- _in_young_gc_mode = true;
+ G1YoungGenSizer sizer;
+ size_t initial_region_num = sizer.initial_young_region_num();
+ _min_desired_young_length = sizer.min_young_region_num();
+ _max_desired_young_length = sizer.max_young_region_num();
- G1YoungGenSizer sizer;
- size_t initial_region_num = sizer.initial_young_region_num();
-
- if (UseAdaptiveSizePolicy) {
- set_adaptive_young_list_length(true);
- _young_list_fixed_length = 0;
+ if (FLAG_IS_CMDLINE(NewRatio)) {
+ if (FLAG_IS_CMDLINE(NewSize) || FLAG_IS_CMDLINE(MaxNewSize)) {
+ gclog_or_tty->print_cr("-XX:NewSize and -XX:MaxNewSize overrides -XX:NewRatio");
} else {
- set_adaptive_young_list_length(false);
- _young_list_fixed_length = initial_region_num;
+ // Treat NewRatio as a fixed size that is only recalculated when the heap size changes
+ size_t heap_regions = sizer.size_to_region_num(_g1->n_regions());
+ update_young_list_size_using_newratio(heap_regions);
+ _using_new_ratio_calculations = true;
}
- _free_regions_at_end_of_collection = _g1->free_regions();
- calculate_young_list_min_length();
- guarantee( _young_list_min_length == 0, "invariant, not enough info" );
- calculate_young_list_target_length();
+ }
+
+ // GenCollectorPolicy guarantees that min <= initial <= max.
+ // Asserting here just to state that we rely on this property.
+ assert(_min_desired_young_length <= _max_desired_young_length, "Invalid min/max young gen size values");
+ assert(initial_region_num <= _max_desired_young_length, "Initial young gen size too large");
+ assert(_min_desired_young_length <= initial_region_num, "Initial young gen size too small");
+
+ set_adaptive_young_list_length(_min_desired_young_length < _max_desired_young_length);
+ if (adaptive_young_list_length()) {
+ _young_list_fixed_length = 0;
} else {
- _young_list_fixed_length = 0;
- _in_young_gc_mode = false;
+ _young_list_fixed_length = initial_region_num;
}
+ _free_regions_at_end_of_collection = _g1->free_regions();
+ update_young_list_target_length();
+ _prev_eden_capacity = _young_list_target_length * HeapRegion::GrainBytes;
// We may immediately start allocating regions and placing them on the
// collection set list. Initialize the per-collection set info
@@ -499,236 +532,259 @@ void G1CollectorPolicy::init() {
}
// Create the jstat counters for the policy.
-void G1CollectorPolicy::initialize_gc_policy_counters()
-{
- _gc_policy_counters = new GCPolicyCounters("GarbageFirst", 1, 2 + G1Gen);
+void G1CollectorPolicy::initialize_gc_policy_counters() {
+ _gc_policy_counters = new GCPolicyCounters("GarbageFirst", 1, 3);
}
-void G1CollectorPolicy::calculate_young_list_min_length() {
- _young_list_min_length = 0;
+bool G1CollectorPolicy::predict_will_fit(size_t young_length,
+ double base_time_ms,
+ size_t base_free_regions,
+ double target_pause_time_ms) {
+ if (young_length >= base_free_regions) {
+ // end condition 1: not enough space for the young regions
+ return false;
+ }
- if (!adaptive_young_list_length())
- return;
+ double accum_surv_rate = accum_yg_surv_rate_pred((int)(young_length - 1));
+ size_t bytes_to_copy =
+ (size_t) (accum_surv_rate * (double) HeapRegion::GrainBytes);
+ double copy_time_ms = predict_object_copy_time_ms(bytes_to_copy);
+ double young_other_time_ms = predict_young_other_time_ms(young_length);
+ double pause_time_ms = base_time_ms + copy_time_ms + young_other_time_ms;
+ if (pause_time_ms > target_pause_time_ms) {
+ // end condition 2: prediction is over the target pause time
+ return false;
+ }
- if (_alloc_rate_ms_seq->num() > 3) {
- double now_sec = os::elapsedTime();
- double when_ms = _mmu_tracker->when_max_gc_sec(now_sec) * 1000.0;
- double alloc_rate_ms = predict_alloc_rate_ms();
- size_t min_regions = (size_t) ceil(alloc_rate_ms * when_ms);
- size_t current_region_num = _g1->young_list()->length();
- _young_list_min_length = min_regions + current_region_num;
+ size_t free_bytes =
+ (base_free_regions - young_length) * HeapRegion::GrainBytes;
+ if ((2.0 * sigma()) * (double) bytes_to_copy > (double) free_bytes) {
+ // end condition 3: out-of-space (conservatively!)
+ return false;
}
+
+ // success!
+ return true;
}
-void G1CollectorPolicy::calculate_young_list_target_length() {
- if (adaptive_young_list_length()) {
- size_t rs_lengths = (size_t) get_new_prediction(_rs_lengths_seq);
- calculate_young_list_target_length(rs_lengths);
- } else {
- if (full_young_gcs())
- _young_list_target_length = _young_list_fixed_length;
- else
- _young_list_target_length = _young_list_fixed_length / 2;
- }
-
- // Make sure we allow the application to allocate at least one
- // region before we need to do a collection again.
- size_t min_length = _g1->young_list()->length() + 1;
- _young_list_target_length = MAX2(_young_list_target_length, min_length);
- calculate_max_gc_locker_expansion();
- calculate_survivors_policy();
-}
-
-void G1CollectorPolicy::calculate_young_list_target_length(size_t rs_lengths) {
- guarantee( adaptive_young_list_length(), "pre-condition" );
- guarantee( !_in_marking_window || !_last_full_young_gc, "invariant" );
-
- double start_time_sec = os::elapsedTime();
- size_t min_reserve_perc = MAX2((size_t)2, (size_t)G1ReservePercent);
- min_reserve_perc = MIN2((size_t) 50, min_reserve_perc);
- size_t reserve_regions =
- (size_t) ((double) min_reserve_perc * (double) _g1->n_regions() / 100.0);
-
- if (full_young_gcs() && _free_regions_at_end_of_collection > 0) {
- // we are in fully-young mode and there are free regions in the heap
-
- double survivor_regions_evac_time =
- predict_survivor_regions_evac_time();
-
- double target_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
- size_t pending_cards = (size_t) get_new_prediction(_pending_cards_seq);
- size_t adj_rs_lengths = rs_lengths + predict_rs_length_diff();
- size_t scanned_cards = predict_young_card_num(adj_rs_lengths);
- double base_time_ms = predict_base_elapsed_time_ms(pending_cards, scanned_cards)
- + survivor_regions_evac_time;
-
- // the result
- size_t final_young_length = 0;
-
- size_t init_free_regions =
- MAX2((size_t)0, _free_regions_at_end_of_collection - reserve_regions);
-
- // if we're still under the pause target...
- if (base_time_ms <= target_pause_time_ms) {
- // We make sure that the shortest young length that makes sense
- // fits within the target pause time.
- size_t min_young_length = 1;
-
- if (predict_will_fit(min_young_length, base_time_ms,
- init_free_regions, target_pause_time_ms)) {
- // The shortest young length will fit within the target pause time;
- // we'll now check whether the absolute maximum number of young
- // regions will fit in the target pause time. If not, we'll do
- // a binary search between min_young_length and max_young_length
- size_t abs_max_young_length = _free_regions_at_end_of_collection - 1;
- size_t max_young_length = abs_max_young_length;
-
- if (max_young_length > min_young_length) {
- // Let's check if the initial max young length will fit within the
- // target pause. If so then there is no need to search for a maximal
- // young length - we'll return the initial maximum
-
- if (predict_will_fit(max_young_length, base_time_ms,
- init_free_regions, target_pause_time_ms)) {
- // The maximum young length will satisfy the target pause time.
- // We are done so set min young length to this maximum length.
- // The code after the loop will then set final_young_length using
- // the value cached in the minimum length.
- min_young_length = max_young_length;
- } else {
- // The maximum possible number of young regions will not fit within
- // the target pause time so let's search....
-
- size_t diff = (max_young_length - min_young_length) / 2;
- max_young_length = min_young_length + diff;
-
- while (max_young_length > min_young_length) {
- if (predict_will_fit(max_young_length, base_time_ms,
- init_free_regions, target_pause_time_ms)) {
-
- // The current max young length will fit within the target
- // pause time. Note we do not exit the loop here. By setting
- // min = max, and then increasing the max below means that
- // we will continue searching for an upper bound in the
- // range [max..max+diff]
- min_young_length = max_young_length;
- }
- diff = (max_young_length - min_young_length) / 2;
- max_young_length = min_young_length + diff;
- }
- // the above loop found a maximal young length that will fit
- // within the target pause time.
- }
- assert(min_young_length <= abs_max_young_length, "just checking");
- }
- final_young_length = min_young_length;
- }
- }
- // and we're done!
-
- // we should have at least one region in the target young length
- _young_list_target_length =
- final_young_length + _recorded_survivor_regions;
-
- // let's keep an eye of how long we spend on this calculation
- // right now, I assume that we'll print it when we need it; we
- // should really adde it to the breakdown of a pause
- double end_time_sec = os::elapsedTime();
- double elapsed_time_ms = (end_time_sec - start_time_sec) * 1000.0;
-
-#ifdef TRACE_CALC_YOUNG_LENGTH
- // leave this in for debugging, just in case
- gclog_or_tty->print_cr("target = %1.1lf ms, young = " SIZE_FORMAT ", "
- "elapsed %1.2lf ms, (%s%s) " SIZE_FORMAT SIZE_FORMAT,
- target_pause_time_ms,
- _young_list_target_length
- elapsed_time_ms,
- full_young_gcs() ? "full" : "partial",
- during_initial_mark_pause() ? " i-m" : "",
- _in_marking_window,
- _in_marking_window_im);
-#endif // TRACE_CALC_YOUNG_LENGTH
-
- if (_young_list_target_length < _young_list_min_length) {
- // bummer; this means that, if we do a pause when the maximal
- // length dictates, we'll violate the pause spacing target (the
- // min length was calculate based on the application's current
- // alloc rate);
-
- // so, we have to bite the bullet, and allocate the minimum
- // number. We'll violate our target, but we just can't meet it.
-
-#ifdef TRACE_CALC_YOUNG_LENGTH
- // leave this in for debugging, just in case
- gclog_or_tty->print_cr("adjusted target length from "
- SIZE_FORMAT " to " SIZE_FORMAT,
- _young_list_target_length, _young_list_min_length);
-#endif // TRACE_CALC_YOUNG_LENGTH
-
- _young_list_target_length = _young_list_min_length;
- }
- } else {
- // we are in a partially-young mode or we've run out of regions (due
- // to evacuation failure)
+void G1CollectorPolicy::record_new_heap_size(size_t new_number_of_regions) {
+ // re-calculate the necessary reserve
+ double reserve_regions_d = (double) new_number_of_regions * _reserve_factor;
+ // We use ceiling so that if reserve_regions_d is > 0.0 (but
+ // smaller than 1.0) we'll get 1.
+ _reserve_regions = (size_t) ceil(reserve_regions_d);
-#ifdef TRACE_CALC_YOUNG_LENGTH
- // leave this in for debugging, just in case
- gclog_or_tty->print_cr("(partial) setting target to " SIZE_FORMAT
- _young_list_min_length);
-#endif // TRACE_CALC_YOUNG_LENGTH
- // we'll do the pause as soon as possible by choosing the minimum
- _young_list_target_length = _young_list_min_length;
+ if (_using_new_ratio_calculations) {
+ // -XX:NewRatio was specified so we need to update the
+ // young gen length when the heap size has changed.
+ update_young_list_size_using_newratio(new_number_of_regions);
}
+}
- _rs_lengths_prediction = rs_lengths;
+size_t G1CollectorPolicy::calculate_young_list_desired_min_length(
+ size_t base_min_length) {
+ size_t desired_min_length = 0;
+ if (adaptive_young_list_length()) {
+ if (_alloc_rate_ms_seq->num() > 3) {
+ double now_sec = os::elapsedTime();
+ double when_ms = _mmu_tracker->when_max_gc_sec(now_sec) * 1000.0;
+ double alloc_rate_ms = predict_alloc_rate_ms();
+ desired_min_length = (size_t) ceil(alloc_rate_ms * when_ms);
+ } else {
+ // otherwise we don't have enough info to make the prediction
+ }
+ }
+ desired_min_length += base_min_length;
+ // make sure we don't go below any user-defined minimum bound
+ return MAX2(_min_desired_young_length, desired_min_length);
}
-// This is used by: calculate_young_list_target_length(rs_length). It
-// returns true iff:
-// the predicted pause time for the given young list will not overflow
-// the target pause time
-// and:
-// the predicted amount of surviving data will not overflow the
-// the amount of free space available for survivor regions.
-//
-bool
-G1CollectorPolicy::predict_will_fit(size_t young_length,
- double base_time_ms,
- size_t init_free_regions,
- double target_pause_time_ms) {
+size_t G1CollectorPolicy::calculate_young_list_desired_max_length() {
+ // Here, we might want to also take into account any additional
+ // constraints (i.e., user-defined minimum bound). Currently, we
+ // effectively don't set this bound.
+ return _max_desired_young_length;
+}
- if (young_length >= init_free_regions)
- // end condition 1: not enough space for the young regions
- return false;
+void G1CollectorPolicy::update_young_list_target_length(size_t rs_lengths) {
+ if (rs_lengths == (size_t) -1) {
+ // if it's set to the default value (-1), we should predict it;
+ // otherwise, use the given value.
+ rs_lengths = (size_t) get_new_prediction(_rs_lengths_seq);
+ }
- double accum_surv_rate_adj = 0.0;
- double accum_surv_rate =
- accum_yg_surv_rate_pred((int)(young_length - 1)) - accum_surv_rate_adj;
+ // Calculate the absolute and desired min bounds.
- size_t bytes_to_copy =
- (size_t) (accum_surv_rate * (double) HeapRegion::GrainBytes);
+ // This is how many young regions we already have (currently: the survivors).
+ size_t base_min_length = recorded_survivor_regions();
+ // This is the absolute minimum young length, which ensures that we
+ // can allocate one eden region in the worst-case.
+ size_t absolute_min_length = base_min_length + 1;
+ size_t desired_min_length =
+ calculate_young_list_desired_min_length(base_min_length);
+ if (desired_min_length < absolute_min_length) {
+ desired_min_length = absolute_min_length;
+ }
- double copy_time_ms = predict_object_copy_time_ms(bytes_to_copy);
+ // Calculate the absolute and desired max bounds.
- double young_other_time_ms =
- predict_young_other_time_ms(young_length);
+ // We will try our best not to "eat" into the reserve.
+ size_t absolute_max_length = 0;
+ if (_free_regions_at_end_of_collection > _reserve_regions) {
+ absolute_max_length = _free_regions_at_end_of_collection - _reserve_regions;
+ }
+ size_t desired_max_length = calculate_young_list_desired_max_length();
+ if (desired_max_length > absolute_max_length) {
+ desired_max_length = absolute_max_length;
+ }
- double pause_time_ms =
- base_time_ms + copy_time_ms + young_other_time_ms;
+ size_t young_list_target_length = 0;
+ if (adaptive_young_list_length()) {
+ if (full_young_gcs()) {
+ young_list_target_length =
+ calculate_young_list_target_length(rs_lengths,
+ base_min_length,
+ desired_min_length,
+ desired_max_length);
+ _rs_lengths_prediction = rs_lengths;
+ } else {
+ // Don't calculate anything and let the code below bound it to
+ // the desired_min_length, i.e., do the next GC as soon as
+ // possible to maximize how many old regions we can add to it.
+ }
+ } else {
+ if (full_young_gcs()) {
+ young_list_target_length = _young_list_fixed_length;
+ } else {
+ // A bit arbitrary: during partially-young GCs we allocate half
+ // the young regions to try to add old regions to the CSet.
+ young_list_target_length = _young_list_fixed_length / 2;
+ // We choose to accept that we might go under the desired min
+ // length given that we intentionally ask for a smaller young gen.
+ desired_min_length = absolute_min_length;
+ }
+ }
- if (pause_time_ms > target_pause_time_ms)
- // end condition 2: over the target pause time
- return false;
+ // Make sure we don't go over the desired max length, nor under the
+ // desired min length. In case they clash, desired_min_length wins
+ // which is why that test is second.
+ if (young_list_target_length > desired_max_length) {
+ young_list_target_length = desired_max_length;
+ }
+ if (young_list_target_length < desired_min_length) {
+ young_list_target_length = desired_min_length;
+ }
- size_t free_bytes =
- (init_free_regions - young_length) * HeapRegion::GrainBytes;
+ assert(young_list_target_length > recorded_survivor_regions(),
+ "we should be able to allocate at least one eden region");
+ assert(young_list_target_length >= absolute_min_length, "post-condition");
+ _young_list_target_length = young_list_target_length;
- if ((2.0 + sigma()) * (double) bytes_to_copy > (double) free_bytes)
- // end condition 3: out of to-space (conservatively)
- return false;
+ update_max_gc_locker_expansion();
+}
- // success!
- return true;
+size_t
+G1CollectorPolicy::calculate_young_list_target_length(size_t rs_lengths,
+ size_t base_min_length,
+ size_t desired_min_length,
+ size_t desired_max_length) {
+ assert(adaptive_young_list_length(), "pre-condition");
+ assert(full_young_gcs(), "only call this for fully-young GCs");
+
+ // In case some edge-condition makes the desired max length too small...
+ if (desired_max_length <= desired_min_length) {
+ return desired_min_length;
+ }
+
+ // We'll adjust min_young_length and max_young_length not to include
+ // the already allocated young regions (i.e., so they reflect the
+ // min and max eden regions we'll allocate). The base_min_length
+ // will be reflected in the predictions by the
+ // survivor_regions_evac_time prediction.
+ assert(desired_min_length > base_min_length, "invariant");
+ size_t min_young_length = desired_min_length - base_min_length;
+ assert(desired_max_length > base_min_length, "invariant");
+ size_t max_young_length = desired_max_length - base_min_length;
+
+ double target_pause_time_ms = _mmu_tracker->max_gc_time() * 1000.0;
+ double survivor_regions_evac_time = predict_survivor_regions_evac_time();
+ size_t pending_cards = (size_t) get_new_prediction(_pending_cards_seq);
+ size_t adj_rs_lengths = rs_lengths + predict_rs_length_diff();
+ size_t scanned_cards = predict_young_card_num(adj_rs_lengths);
+ double base_time_ms =
+ predict_base_elapsed_time_ms(pending_cards, scanned_cards) +
+ survivor_regions_evac_time;
+ size_t available_free_regions = _free_regions_at_end_of_collection;
+ size_t base_free_regions = 0;
+ if (available_free_regions > _reserve_regions) {
+ base_free_regions = available_free_regions - _reserve_regions;
+ }
+
+ // Here, we will make sure that the shortest young length that
+ // makes sense fits within the target pause time.
+
+ if (predict_will_fit(min_young_length, base_time_ms,
+ base_free_regions, target_pause_time_ms)) {
+ // The shortest young length will fit into the target pause time;
+ // we'll now check whether the absolute maximum number of young
+ // regions will fit in the target pause time. If not, we'll do
+ // a binary search between min_young_length and max_young_length.
+ if (predict_will_fit(max_young_length, base_time_ms,
+ base_free_regions, target_pause_time_ms)) {
+ // The maximum young length will fit into the target pause time.
+ // We are done so set min young length to the maximum length (as
+ // the result is assumed to be returned in min_young_length).
+ min_young_length = max_young_length;
+ } else {
+ // The maximum possible number of young regions will not fit within
+ // the target pause time so we'll search for the optimal
+ // length. The loop invariants are:
+ //
+ // min_young_length < max_young_length
+ // min_young_length is known to fit into the target pause time
+ // max_young_length is known not to fit into the target pause time
+ //
+ // Going into the loop we know the above hold as we've just
+ // checked them. Every time around the loop we check whether
+ // the middle value between min_young_length and
+ // max_young_length fits into the target pause time. If it
+ // does, it becomes the new min. If it doesn't, it becomes
+ // the new max. This way we maintain the loop invariants.
+
+ assert(min_young_length < max_young_length, "invariant");
+ size_t diff = (max_young_length - min_young_length) / 2;
+ while (diff > 0) {
+ size_t young_length = min_young_length + diff;
+ if (predict_will_fit(young_length, base_time_ms,
+ base_free_regions, target_pause_time_ms)) {
+ min_young_length = young_length;
+ } else {
+ max_young_length = young_length;
+ }
+ assert(min_young_length < max_young_length, "invariant");
+ diff = (max_young_length - min_young_length) / 2;
+ }
+ // The results is min_young_length which, according to the
+ // loop invariants, should fit within the target pause time.
+
+ // These are the post-conditions of the binary search above:
+ assert(min_young_length < max_young_length,
+ "otherwise we should have discovered that max_young_length "
+ "fits into the pause target and not done the binary search");
+ assert(predict_will_fit(min_young_length, base_time_ms,
+ base_free_regions, target_pause_time_ms),
+ "min_young_length, the result of the binary search, should "
+ "fit into the pause target");
+ assert(!predict_will_fit(min_young_length + 1, base_time_ms,
+ base_free_regions, target_pause_time_ms),
+ "min_young_length, the result of the binary search, should be "
+ "optimal, so no larger length should fit into the pause target");
+ }
+ } else {
+ // Even the minimum length doesn't fit into the pause time
+ // target, return it as the result nevertheless.
+ }
+ return base_min_length + min_young_length;
}
double G1CollectorPolicy::predict_survivor_regions_evac_time() {
@@ -741,17 +797,19 @@ double G1CollectorPolicy::predict_survivor_regions_evac_time() {
return survivor_regions_evac_time;
}
-void G1CollectorPolicy::check_prediction_validity() {
+void G1CollectorPolicy::revise_young_list_target_length_if_necessary() {
guarantee( adaptive_young_list_length(), "should not call this otherwise" );
size_t rs_lengths = _g1->young_list()->sampled_rs_lengths();
if (rs_lengths > _rs_lengths_prediction) {
// add 10% to avoid having to recalculate often
size_t rs_lengths_prediction = rs_lengths * 1100 / 1000;
- calculate_young_list_target_length(rs_lengths_prediction);
+ update_young_list_target_length(rs_lengths_prediction);
}
}
+
+
HeapWord* G1CollectorPolicy::mem_allocate_work(size_t size,
bool is_tlab,
bool* gc_overhead_limit_was_exceeded) {
@@ -858,16 +916,7 @@ void G1CollectorPolicy::record_full_collection_end() {
_free_regions_at_end_of_collection = _g1->free_regions();
// Reset survivors SurvRateGroup.
_survivor_surv_rate_group->reset();
- calculate_young_list_min_length();
- calculate_young_list_target_length();
-}
-
-void G1CollectorPolicy::record_before_bytes(size_t bytes) {
- _bytes_in_to_space_before_gc += bytes;
-}
-
-void G1CollectorPolicy::record_after_bytes(size_t bytes) {
- _bytes_in_to_space_after_gc += bytes;
+ update_young_list_target_length();
}
void G1CollectorPolicy::record_stop_world_start() {
@@ -879,10 +928,14 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
if (PrintGCDetails) {
gclog_or_tty->stamp(PrintGCTimeStamps);
gclog_or_tty->print("[GC pause");
- if (in_young_gc_mode())
- gclog_or_tty->print(" (%s)", full_young_gcs() ? "young" : "partial");
+ gclog_or_tty->print(" (%s)", full_young_gcs() ? "young" : "partial");
}
+ // We only need to do this here as the policy will only be applied
+ // to the GC we're about to start. so, no point is calculating this
+ // every time we calculate / recalculate the target young length.
+ update_survivors_policy();
+
assert(_g1->used() == _g1->recalculate_used(),
err_msg("sanity, used: "SIZE_FORMAT" recalculate_used: "SIZE_FORMAT,
_g1->used(), _g1->recalculate_used()));
@@ -897,9 +950,8 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
_pending_cards = _g1->pending_card_num();
_max_pending_cards = _g1->max_pending_card_num();
- _bytes_in_to_space_before_gc = 0;
- _bytes_in_to_space_after_gc = 0;
_bytes_in_collection_set_before_gc = 0;
+ _bytes_copied_during_gc = 0;
YoungList* young_list = _g1->young_list();
_eden_bytes_before_gc = young_list->eden_used_bytes();
@@ -933,8 +985,7 @@ void G1CollectorPolicy::record_collection_pause_start(double start_time_sec,
_satb_drain_time_set = false;
_last_satb_drain_processed_buffers = -1;
- if (in_young_gc_mode())
- _last_young_gc_full = false;
+ _last_young_gc_full = false;
// do that for any other surv rate groups
_short_lived_surv_rate_group->stop_adding_regions();
@@ -947,12 +998,7 @@ void G1CollectorPolicy::record_mark_closure_time(double mark_closure_time_ms) {
_mark_closure_time_ms = mark_closure_time_ms;
}
-void G1CollectorPolicy::record_concurrent_mark_init_start() {
- _mark_init_start_sec = os::elapsedTime();
- guarantee(!in_young_gc_mode(), "should not do be here in young GC mode");
-}
-
-void G1CollectorPolicy::record_concurrent_mark_init_end_pre(double
+void G1CollectorPolicy::record_concurrent_mark_init_end(double
mark_init_elapsed_time_ms) {
_during_marking = true;
assert(!initiate_conc_mark_if_possible(), "we should have cleared it by now");
@@ -960,15 +1006,6 @@ void G1CollectorPolicy::record_concurrent_mark_init_end_pre(double
_cur_mark_stop_world_time_ms = mark_init_elapsed_time_ms;
}
-void G1CollectorPolicy::record_concurrent_mark_init_end() {
- double end_time_sec = os::elapsedTime();
- double elapsed_time_ms = (end_time_sec - _mark_init_start_sec) * 1000.0;
- _concurrent_mark_init_times_ms->add(elapsed_time_ms);
- record_concurrent_mark_init_end_pre(elapsed_time_ms);
-
- _mmu_tracker->add_pause(_mark_init_start_sec, end_time_sec, true);
-}
-
void G1CollectorPolicy::record_concurrent_mark_remark_start() {
_mark_remark_start_sec = os::elapsedTime();
_during_marking = false;
@@ -999,11 +1036,9 @@ void
G1CollectorPolicy::
record_concurrent_mark_cleanup_end_work1(size_t freed_bytes,
size_t max_live_bytes) {
- if (_n_marks < 2) _n_marks++;
- if (G1PolicyVerbose > 0)
- gclog_or_tty->print_cr("At end of marking, max_live is " SIZE_FORMAT " MB "
- " (of " SIZE_FORMAT " MB heap).",
- max_live_bytes/M, _g1->capacity()/M);
+ if (_n_marks < 2) {
+ _n_marks++;
+ }
}
// The important thing about this is that it includes "os::elapsedTime".
@@ -1017,27 +1052,15 @@ void G1CollectorPolicy::record_concurrent_mark_cleanup_end_work2() {
_mmu_tracker->add_pause(_mark_cleanup_start_sec, end_time_sec, true);
_num_markings++;
-
- // We did a marking, so reset the "since_last_mark" variables.
- double considerConcMarkCost = 1.0;
- // If there are available processors, concurrent activity is free...
- if (Threads::number_of_non_daemon_threads() * 2 <
- os::active_processor_count()) {
- considerConcMarkCost = 0.0;
- }
_n_pauses_at_mark_end = _n_pauses;
_n_marks_since_last_pause++;
}
void
G1CollectorPolicy::record_concurrent_mark_cleanup_completed() {
- if (in_young_gc_mode()) {
- _should_revert_to_full_young_gcs = false;
- _last_full_young_gc = true;
- _in_marking_window = false;
- if (adaptive_young_list_length())
- calculate_young_list_target_length();
- }
+ _should_revert_to_full_young_gcs = false;
+ _last_full_young_gc = true;
+ _in_marking_window = false;
}
void G1CollectorPolicy::record_concurrent_pause() {
@@ -1050,18 +1073,6 @@ void G1CollectorPolicy::record_concurrent_pause() {
void G1CollectorPolicy::record_concurrent_pause_end() {
}
-void G1CollectorPolicy::record_collection_pause_end_CH_strong_roots() {
- _cur_CH_strong_roots_end_sec = os::elapsedTime();
- _cur_CH_strong_roots_dur_ms =
- (_cur_CH_strong_roots_end_sec - _cur_collection_start_sec) * 1000.0;
-}
-
-void G1CollectorPolicy::record_collection_pause_end_G1_strong_roots() {
- _cur_G1_strong_roots_end_sec = os::elapsedTime();
- _cur_G1_strong_roots_dur_ms =
- (_cur_G1_strong_roots_end_sec - _cur_CH_strong_roots_end_sec) * 1000.0;
-}
-
template<class T>
T sum_of(T* sum_arr, int start, int n, int N) {
T sum = (T)0;
@@ -1183,7 +1194,6 @@ void G1CollectorPolicy::record_collection_pause_end() {
double end_time_sec = os::elapsedTime();
double elapsed_ms = _last_pause_time_ms;
bool parallel = G1CollectedHeap::use_parallel_gc_threads();
- double evac_ms = (end_time_sec - _cur_G1_strong_roots_end_sec) * 1000.0;
size_t rs_size =
_cur_collection_pause_used_regions_at_start - collection_set_size();
size_t cur_used_bytes = _g1->used();
@@ -1199,31 +1209,46 @@ void G1CollectorPolicy::record_collection_pause_end() {
}
#endif // PRODUCT
- if (in_young_gc_mode()) {
- last_pause_included_initial_mark = during_initial_mark_pause();
- if (last_pause_included_initial_mark)
- record_concurrent_mark_init_end_pre(0.0);
+ last_pause_included_initial_mark = during_initial_mark_pause();
+ if (last_pause_included_initial_mark)
+ record_concurrent_mark_init_end(0.0);
- size_t min_used_targ =
- (_g1->capacity() / 100) * InitiatingHeapOccupancyPercent;
+ size_t marking_initiating_used_threshold =
+ (_g1->capacity() / 100) * InitiatingHeapOccupancyPercent;
-
- if (!_g1->mark_in_progress() && !_last_full_young_gc) {
- assert(!last_pause_included_initial_mark, "invariant");
- if (cur_used_bytes > min_used_targ &&
- cur_used_bytes > _prev_collection_pause_used_at_end_bytes) {
+ if (!_g1->mark_in_progress() && !_last_full_young_gc) {
+ assert(!last_pause_included_initial_mark, "invariant");
+ if (cur_used_bytes > marking_initiating_used_threshold) {
+ if (cur_used_bytes > _prev_collection_pause_used_at_end_bytes) {
assert(!during_initial_mark_pause(), "we should not see this here");
+ ergo_verbose3(ErgoConcCycles,
+ "request concurrent cycle initiation",
+ ergo_format_reason("occupancy higher than threshold")
+ ergo_format_byte("occupancy")
+ ergo_format_byte_perc("threshold"),
+ cur_used_bytes,
+ marking_initiating_used_threshold,
+ (double) InitiatingHeapOccupancyPercent);
+
// Note: this might have already been set, if during the last
// pause we decided to start a cycle but at the beginning of
// this pause we decided to postpone it. That's OK.
set_initiate_conc_mark_if_possible();
+ } else {
+ ergo_verbose2(ErgoConcCycles,
+ "do not request concurrent cycle initiation",
+ ergo_format_reason("occupancy lower than previous occupancy")
+ ergo_format_byte("occupancy")
+ ergo_format_byte("previous occupancy"),
+ cur_used_bytes,
+ _prev_collection_pause_used_at_end_bytes);
}
}
-
- _prev_collection_pause_used_at_end_bytes = cur_used_bytes;
}
+ _prev_collection_pause_used_at_end_bytes = cur_used_bytes;
+
_mmu_tracker->add_pause(end_time_sec - elapsed_ms/1000.0,
end_time_sec, false);
@@ -1256,14 +1281,52 @@ void G1CollectorPolicy::record_collection_pause_end() {
_n_pauses++;
+ double ext_root_scan_time = avg_value(_par_last_ext_root_scan_times_ms);
+ double mark_stack_scan_time = avg_value(_par_last_mark_stack_scan_times_ms);
+ double update_rs_time = avg_value(_par_last_update_rs_times_ms);
+ double update_rs_processed_buffers =
+ sum_of_values(_par_last_update_rs_processed_buffers);
+ double scan_rs_time = avg_value(_par_last_scan_rs_times_ms);
+ double obj_copy_time = avg_value(_par_last_obj_copy_times_ms);
+ double termination_time = avg_value(_par_last_termination_times_ms);
+
+ double parallel_known_time = update_rs_time +
+ ext_root_scan_time +
+ mark_stack_scan_time +
+ scan_rs_time +
+ obj_copy_time +
+ termination_time;
+
+ double parallel_other_time = _cur_collection_par_time_ms - parallel_known_time;
+
+ PauseSummary* summary = _summary;
+
if (update_stats) {
- _recent_CH_strong_roots_times_ms->add(_cur_CH_strong_roots_dur_ms);
- _recent_G1_strong_roots_times_ms->add(_cur_G1_strong_roots_dur_ms);
- _recent_evac_times_ms->add(evac_ms);
+ _recent_rs_scan_times_ms->add(scan_rs_time);
_recent_pause_times_ms->add(elapsed_ms);
-
_recent_rs_sizes->add(rs_size);
+ MainBodySummary* body_summary = summary->main_body_summary();
+ guarantee(body_summary != NULL, "should not be null!");
+
+ if (_satb_drain_time_set)
+ body_summary->record_satb_drain_time_ms(_cur_satb_drain_time_ms);
+ else
+ body_summary->record_satb_drain_time_ms(0.0);
+
+ body_summary->record_ext_root_scan_time_ms(ext_root_scan_time);
+ body_summary->record_mark_stack_scan_time_ms(mark_stack_scan_time);
+ body_summary->record_update_rs_time_ms(update_rs_time);
+ body_summary->record_scan_rs_time_ms(scan_rs_time);
+ body_summary->record_obj_copy_time_ms(obj_copy_time);
+ if (parallel) {
+ body_summary->record_parallel_time_ms(_cur_collection_par_time_ms);
+ body_summary->record_clear_ct_time_ms(_cur_clear_ct_time_ms);
+ body_summary->record_termination_time_ms(termination_time);
+ body_summary->record_parallel_other_time_ms(parallel_other_time);
+ }
+ body_summary->record_mark_closure_time_ms(_mark_closure_time_ms);
+
// We exempt parallel collection from this check because Alloc Buffer
// fragmentation can produce negative collections. Same with evac
// failure.
@@ -1328,56 +1391,12 @@ void G1CollectorPolicy::record_collection_pause_end() {
gclog_or_tty->print_cr(" Recording collection pause(%d)", _n_pauses);
}
- PauseSummary* summary = _summary;
-
- double ext_root_scan_time = avg_value(_par_last_ext_root_scan_times_ms);
- double mark_stack_scan_time = avg_value(_par_last_mark_stack_scan_times_ms);
- double update_rs_time = avg_value(_par_last_update_rs_times_ms);
- double update_rs_processed_buffers =
- sum_of_values(_par_last_update_rs_processed_buffers);
- double scan_rs_time = avg_value(_par_last_scan_rs_times_ms);
- double obj_copy_time = avg_value(_par_last_obj_copy_times_ms);
- double termination_time = avg_value(_par_last_termination_times_ms);
-
- double parallel_other_time = _cur_collection_par_time_ms -
- (update_rs_time + ext_root_scan_time + mark_stack_scan_time +
- scan_rs_time + obj_copy_time + termination_time);
- if (update_stats) {
- MainBodySummary* body_summary = summary->main_body_summary();
- guarantee(body_summary != NULL, "should not be null!");
-
- if (_satb_drain_time_set)
- body_summary->record_satb_drain_time_ms(_cur_satb_drain_time_ms);
- else
- body_summary->record_satb_drain_time_ms(0.0);
- body_summary->record_ext_root_scan_time_ms(ext_root_scan_time);
- body_summary->record_mark_stack_scan_time_ms(mark_stack_scan_time);
- body_summary->record_update_rs_time_ms(update_rs_time);
- body_summary->record_scan_rs_time_ms(scan_rs_time);
- body_summary->record_obj_copy_time_ms(obj_copy_time);
- if (parallel) {
- body_summary->record_parallel_time_ms(_cur_collection_par_time_ms);
- body_summary->record_clear_ct_time_ms(_cur_clear_ct_time_ms);
- body_summary->record_termination_time_ms(termination_time);
- body_summary->record_parallel_other_time_ms(parallel_other_time);
- }
- body_summary->record_mark_closure_time_ms(_mark_closure_time_ms);
- }
-
if (G1PolicyVerbose > 1) {
gclog_or_tty->print_cr(" ET: %10.6f ms (avg: %10.6f ms)\n"
- " CH Strong: %10.6f ms (avg: %10.6f ms)\n"
- " G1 Strong: %10.6f ms (avg: %10.6f ms)\n"
- " Evac: %10.6f ms (avg: %10.6f ms)\n"
" ET-RS: %10.6f ms (avg: %10.6f ms)\n"
" |RS|: " SIZE_FORMAT,
elapsed_ms, recent_avg_time_for_pauses_ms(),
- _cur_CH_strong_roots_dur_ms, recent_avg_time_for_CH_strong_ms(),
- _cur_G1_strong_roots_dur_ms, recent_avg_time_for_G1_strong_ms(),
- evac_ms, recent_avg_time_for_evac_ms(),
- scan_rs_time,
- recent_avg_time_for_pauses_ms() -
- recent_avg_time_for_G1_strong_ms(),
+ scan_rs_time, recent_avg_time_for_rs_scan_ms(),
rs_size);
gclog_or_tty->print_cr(" Used at start: " SIZE_FORMAT"K"
@@ -1438,7 +1457,7 @@ void G1CollectorPolicy::record_collection_pause_end() {
}
print_par_stats(2, "GC Worker Times", _par_last_gc_worker_times_ms);
- print_stats(2, "Other", parallel_other_time);
+ print_stats(2, "Parallel Other", parallel_other_time);
print_stats(1, "Clear CT", _cur_clear_ct_time_ms);
} else {
print_stats(1, "Update RS", update_rs_time);
@@ -1499,24 +1518,52 @@ void G1CollectorPolicy::record_collection_pause_end() {
new_in_marking_window_im = true;
}
- if (in_young_gc_mode()) {
- if (_last_full_young_gc) {
- set_full_young_gcs(false);
- _last_full_young_gc = false;
- }
-
- if ( !_last_young_gc_full ) {
- if ( _should_revert_to_full_young_gcs ||
- _known_garbage_ratio < 0.05 ||
- (adaptive_young_list_length() &&
- (get_gc_eff_factor() * cur_efficiency < predict_young_gc_eff())) ) {
- set_full_young_gcs(true);
- }
+ if (_last_full_young_gc) {
+ ergo_verbose2(ErgoPartiallyYoungGCs,
+ "start partially-young GCs",
+ ergo_format_byte_perc("known garbage"),
+ _known_garbage_bytes, _known_garbage_ratio * 100.0);
+ set_full_young_gcs(false);
+ _last_full_young_gc = false;
+ }
+
+ if ( !_last_young_gc_full ) {
+ if (_should_revert_to_full_young_gcs) {
+ ergo_verbose2(ErgoPartiallyYoungGCs,
+ "end partially-young GCs",
+ ergo_format_reason("partially-young GCs end requested")
+ ergo_format_byte_perc("known garbage"),
+ _known_garbage_bytes, _known_garbage_ratio * 100.0);
+ set_full_young_gcs(true);
+ } else if (_known_garbage_ratio < 0.05) {
+ ergo_verbose3(ErgoPartiallyYoungGCs,
+ "end partially-young GCs",
+ ergo_format_reason("known garbage percent lower than threshold")
+ ergo_format_byte_perc("known garbage")
+ ergo_format_perc("threshold"),
+ _known_garbage_bytes, _known_garbage_ratio * 100.0,
+ 0.05 * 100.0);
+ set_full_young_gcs(true);
+ } else if (adaptive_young_list_length() &&
+ (get_gc_eff_factor() * cur_efficiency < predict_young_gc_eff())) {
+ ergo_verbose5(ErgoPartiallyYoungGCs,
+ "end partially-young GCs",
+ ergo_format_reason("current GC efficiency lower than "
+ "predicted fully-young GC efficiency")
+ ergo_format_double("GC efficiency factor")
+ ergo_format_double("current GC efficiency")
+ ergo_format_double("predicted fully-young GC efficiency")
+ ergo_format_byte_perc("known garbage"),
+ get_gc_eff_factor(), cur_efficiency,
+ predict_young_gc_eff(),
+ _known_garbage_bytes, _known_garbage_ratio * 100.0);
+ set_full_young_gcs(true);
}
- _should_revert_to_full_young_gcs = false;
+ }
+ _should_revert_to_full_young_gcs = false;
- if (_last_young_gc_full && !_during_marking)
- _young_gc_eff_seq->add(cur_efficiency);
+ if (_last_young_gc_full && !_during_marking) {
+ _young_gc_eff_seq->add(cur_efficiency);
}
_short_lived_surv_rate_group->start_adding_regions();
@@ -1600,8 +1647,8 @@ void G1CollectorPolicy::record_collection_pause_end() {
double survival_ratio = 0.0;
if (_bytes_in_collection_set_before_gc > 0) {
- survival_ratio = (double) bytes_in_to_space_during_gc() /
- (double) _bytes_in_collection_set_before_gc;
+ survival_ratio = (double) _bytes_copied_during_gc /
+ (double) _bytes_in_collection_set_before_gc;
}
_pending_cards_seq->add((double) _pending_cards);
@@ -1664,8 +1711,7 @@ void G1CollectorPolicy::record_collection_pause_end() {
_in_marking_window = new_in_marking_window;
_in_marking_window_im = new_in_marking_window_im;
_free_regions_at_end_of_collection = _g1->free_regions();
- calculate_young_list_min_length();
- calculate_young_list_target_length();
+ update_young_list_target_length();
// Note that _mmu_tracker->max_gc_time() returns the time in seconds.
double update_rs_time_goal_ms = _mmu_tracker->max_gc_time() * MILLIUNITS * G1RSetUpdatingPauseTimePercent / 100.0;
@@ -1686,20 +1732,26 @@ void G1CollectorPolicy::print_heap_transition() {
size_t used_before_gc = _cur_collection_pause_used_at_start_bytes;
size_t used = _g1->used();
size_t capacity = _g1->capacity();
+ size_t eden_capacity =
+ (_young_list_target_length * HeapRegion::GrainBytes) - survivor_bytes;
gclog_or_tty->print_cr(
- " [Eden: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
- "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
- "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
- EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
- EXT_SIZE_PARAMS(_eden_bytes_before_gc),
- EXT_SIZE_PARAMS(eden_bytes),
- EXT_SIZE_PARAMS(_survivor_bytes_before_gc),
- EXT_SIZE_PARAMS(survivor_bytes),
- EXT_SIZE_PARAMS(used_before_gc),
- EXT_SIZE_PARAMS(_capacity_before_gc),
- EXT_SIZE_PARAMS(used),
- EXT_SIZE_PARAMS(capacity));
+ " [Eden: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT") "
+ "Survivors: "EXT_SIZE_FORMAT"->"EXT_SIZE_FORMAT" "
+ "Heap: "EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")->"
+ EXT_SIZE_FORMAT"("EXT_SIZE_FORMAT")]",
+ EXT_SIZE_PARAMS(_eden_bytes_before_gc),
+ EXT_SIZE_PARAMS(_prev_eden_capacity),
+ EXT_SIZE_PARAMS(eden_bytes),
+ EXT_SIZE_PARAMS(eden_capacity),
+ EXT_SIZE_PARAMS(_survivor_bytes_before_gc),
+ EXT_SIZE_PARAMS(survivor_bytes),
+ EXT_SIZE_PARAMS(used_before_gc),
+ EXT_SIZE_PARAMS(_capacity_before_gc),
+ EXT_SIZE_PARAMS(used),
+ EXT_SIZE_PARAMS(capacity));
+
+ _prev_eden_capacity = eden_capacity;
} else if (PrintGC) {
_g1->print_size_transition(gclog_or_tty,
_cur_collection_pause_used_at_start_bytes,
@@ -1941,18 +1993,14 @@ void G1CollectorPolicy::check_if_region_is_too_expensive(double
// I don't think we need to do this when in young GC mode since
// marking will be initiated next time we hit the soft limit anyway...
if (predicted_time_ms > _expensive_region_limit_ms) {
- if (!in_young_gc_mode()) {
- set_full_young_gcs(true);
- // We might want to do something different here. However,
- // right now we don't support the non-generational G1 mode
- // (and in fact we are planning to remove the associated code,
- // see CR 6814390). So, let's leave it as is and this will be
- // removed some time in the future
- ShouldNotReachHere();
- set_during_initial_mark_pause();
- } else
- // no point in doing another partial one
- _should_revert_to_full_young_gcs = true;
+ ergo_verbose2(ErgoPartiallyYoungGCs,
+ "request partially-young GCs end",
+ ergo_format_reason("predicted region time higher than threshold")
+ ergo_format_ms("predicted region time")
+ ergo_format_ms("threshold"),
+ predicted_time_ms, _expensive_region_limit_ms);
+ // no point in doing another partial one
+ _should_revert_to_full_young_gcs = true;
}
}
@@ -1967,38 +2015,27 @@ void G1CollectorPolicy::update_recent_gc_times(double end_time_sec,
}
double G1CollectorPolicy::recent_avg_time_for_pauses_ms() {
- if (_recent_pause_times_ms->num() == 0) return (double) MaxGCPauseMillis;
- else return _recent_pause_times_ms->avg();
-}
-
-double G1CollectorPolicy::recent_avg_time_for_CH_strong_ms() {
- if (_recent_CH_strong_roots_times_ms->num() == 0)
- return (double)MaxGCPauseMillis/3.0;
- else return _recent_CH_strong_roots_times_ms->avg();
+ if (_recent_pause_times_ms->num() == 0) {
+ return (double) MaxGCPauseMillis;
+ }
+ return _recent_pause_times_ms->avg();
}
-double G1CollectorPolicy::recent_avg_time_for_G1_strong_ms() {
- if (_recent_G1_strong_roots_times_ms->num() == 0)
+double G1CollectorPolicy::recent_avg_time_for_rs_scan_ms() {
+ if (_recent_rs_scan_times_ms->num() == 0) {
return (double)MaxGCPauseMillis/3.0;
- else return _recent_G1_strong_roots_times_ms->avg();
-}
-
-double G1CollectorPolicy::recent_avg_time_for_evac_ms() {
- if (_recent_evac_times_ms->num() == 0) return (double)MaxGCPauseMillis/3.0;
- else return _recent_evac_times_ms->avg();
+ }
+ return _recent_rs_scan_times_ms->avg();
}
int G1CollectorPolicy::number_of_recent_gcs() {
- assert(_recent_CH_strong_roots_times_ms->num() ==
- _recent_G1_strong_roots_times_ms->num(), "Sequence out of sync");
- assert(_recent_G1_strong_roots_times_ms->num() ==
- _recent_evac_times_ms->num(), "Sequence out of sync");
- assert(_recent_evac_times_ms->num() ==
+ assert(_recent_rs_scan_times_ms->num() ==
_recent_pause_times_ms->num(), "Sequence out of sync");
assert(_recent_pause_times_ms->num() ==
_recent_CS_bytes_used_before->num(), "Sequence out of sync");
assert(_recent_CS_bytes_used_before->num() ==
_recent_CS_bytes_surviving->num(), "Sequence out of sync");
+
return _recent_pause_times_ms->num();
}
@@ -2071,7 +2108,9 @@ G1CollectorPolicy::conservative_avg_survival_fraction_work(double avg,
}
size_t G1CollectorPolicy::expansion_amount() {
- if ((recent_avg_pause_time_ratio() * 100.0) > _gc_overhead_perc) {
+ double recent_gc_overhead = recent_avg_pause_time_ratio() * 100.0;
+ double threshold = _gc_overhead_perc;
+ if (recent_gc_overhead > threshold) {
// We will double the existing space, or take
// G1ExpandByPercentOfAvailable % of the available expansion
// space, whichever is smaller, bounded below by a minimum
@@ -2086,20 +2125,19 @@ size_t G1CollectorPolicy::expansion_amount() {
expand_bytes = MIN2(expand_bytes_via_pct, committed_bytes);
expand_bytes = MAX2(expand_bytes, min_expand_bytes);
expand_bytes = MIN2(expand_bytes, uncommitted_bytes);
- if (G1PolicyVerbose > 1) {
- gclog_or_tty->print("Decided to expand: ratio = %5.2f, "
- "committed = %d%s, uncommited = %d%s, via pct = %d%s.\n"
- " Answer = %d.\n",
- recent_avg_pause_time_ratio(),
- byte_size_in_proper_unit(committed_bytes),
- proper_unit_for_byte_size(committed_bytes),
- byte_size_in_proper_unit(uncommitted_bytes),
- proper_unit_for_byte_size(uncommitted_bytes),
- byte_size_in_proper_unit(expand_bytes_via_pct),
- proper_unit_for_byte_size(expand_bytes_via_pct),
- byte_size_in_proper_unit(expand_bytes),
- proper_unit_for_byte_size(expand_bytes));
- }
+
+ ergo_verbose5(ErgoHeapSizing,
+ "attempt heap expansion",
+ ergo_format_reason("recent GC overhead higher than "
+ "threshold after GC")
+ ergo_format_perc("recent GC overhead")
+ ergo_format_perc("threshold")
+ ergo_format_byte("uncommitted")
+ ergo_format_byte_perc("calculated expansion amount"),
+ recent_gc_overhead, threshold,
+ uncommitted_bytes,
+ expand_bytes_via_pct, (double) G1ExpandByPercentOfAvailable);
+
return expand_bytes;
} else {
return 0;
@@ -2322,8 +2360,7 @@ void G1CollectorPolicy::print_yg_surv_rate_info() const {
#endif // PRODUCT
}
-void
-G1CollectorPolicy::update_region_num(bool young) {
+void G1CollectorPolicy::update_region_num(bool young) {
if (young) {
++_region_num_young;
} else {
@@ -2355,7 +2392,7 @@ size_t G1CollectorPolicy::max_regions(int purpose) {
};
}
-void G1CollectorPolicy::calculate_max_gc_locker_expansion() {
+void G1CollectorPolicy::update_max_gc_locker_expansion() {
size_t expansion_region_num = 0;
if (GCLockerEdenExpansionPercent > 0) {
double perc = (double) GCLockerEdenExpansionPercent / 100.0;
@@ -2371,20 +2408,15 @@ void G1CollectorPolicy::calculate_max_gc_locker_expansion() {
}
// Calculates survivor space parameters.
-void G1CollectorPolicy::calculate_survivors_policy()
-{
- if (G1FixedSurvivorSpaceSize == 0) {
- _max_survivor_regions = _young_list_target_length / SurvivorRatio;
- } else {
- _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes;
- }
-
- if (G1FixedTenuringThreshold) {
- _tenuring_threshold = MaxTenuringThreshold;
- } else {
- _tenuring_threshold = _survivors_age_table.compute_tenuring_threshold(
+void G1CollectorPolicy::update_survivors_policy() {
+ double max_survivor_regions_d =
+ (double) _young_list_target_length / (double) SurvivorRatio;
+ // We use ceiling so that if max_survivor_regions_d is > 0.0 (but
+ // smaller than 1.0) we'll get 1.
+ _max_survivor_regions = (size_t) ceil(max_survivor_regions_d);
+
+ _tenuring_threshold = _survivors_age_table.compute_tenuring_threshold(
HeapRegion::GrainWords * _max_survivor_regions);
- }
}
#ifndef PRODUCT
@@ -2409,13 +2441,23 @@ bool G1CollectorPolicy_BestRegionsFirst::assertMarkedBytesDataOK() {
}
#endif
-bool
-G1CollectorPolicy::force_initial_mark_if_outside_cycle() {
+bool G1CollectorPolicy::force_initial_mark_if_outside_cycle(
+ GCCause::Cause gc_cause) {
bool during_cycle = _g1->concurrent_mark()->cmThread()->during_cycle();
if (!during_cycle) {
+ ergo_verbose1(ErgoConcCycles,
+ "request concurrent cycle initiation",
+ ergo_format_reason("requested by GC cause")
+ ergo_format_str("GC cause"),
+ GCCause::to_string(gc_cause));
set_initiate_conc_mark_if_possible();
return true;
} else {
+ ergo_verbose1(ErgoConcCycles,
+ "do not request concurrent cycle initiation",
+ ergo_format_reason("concurrent cycle already in progress")
+ ergo_format_str("GC cause"),
+ GCCause::to_string(gc_cause));
return false;
}
}
@@ -2447,6 +2489,10 @@ G1CollectorPolicy::decide_on_conc_mark_initiation() {
// And we can now clear initiate_conc_mark_if_possible() as
// we've already acted on it.
clear_initiate_conc_mark_if_possible();
+
+ ergo_verbose0(ErgoConcCycles,
+ "initiate concurrent cycle",
+ ergo_format_reason("concurrent cycle initiation requested"));
} else {
// The concurrent marking thread is still finishing up the
// previous cycle. If we start one right now the two cycles
@@ -2460,6 +2506,9 @@ G1CollectorPolicy::decide_on_conc_mark_initiation() {
// and, if it's in a yield point, it's waiting for us to
// finish. So, at this point we will not start a cycle and we'll
// let the concurrent marking thread complete the last one.
+ ergo_verbose0(ErgoConcCycles,
+ "do not initiate concurrent cycle",
+ ergo_format_reason("concurrent cycle already in progress"));
}
}
}
@@ -2659,9 +2708,7 @@ void G1CollectorPolicy::start_incremental_cset_building() {
_inc_cset_size = 0;
_inc_cset_bytes_used_before = 0;
- if (in_young_gc_mode()) {
- _inc_cset_young_index = 0;
- }
+ _inc_cset_young_index = 0;
_inc_cset_max_finger = 0;
_inc_cset_recorded_young_bytes = 0;
@@ -2852,6 +2899,8 @@ G1CollectorPolicy_BestRegionsFirst::choose_collection_set(
// Set this here - in case we're not doing young collections.
double non_young_start_time_sec = os::elapsedTime();
+ YoungList* young_list = _g1->young_list();
+
start_recording_regions();
guarantee(target_pause_time_ms > 0.0,
@@ -2864,116 +2913,106 @@ G1CollectorPolicy_BestRegionsFirst::choose_collection_set(
double time_remaining_ms = target_pause_time_ms - base_time_ms;
+ ergo_verbose3(ErgoCSetConstruction | ErgoHigh,
+ "start choosing CSet",
+ ergo_format_ms("predicted base time")
+ ergo_format_ms("remaining time")
+ ergo_format_ms("target pause time"),
+ base_time_ms, time_remaining_ms, target_pause_time_ms);
+
// the 10% and 50% values are arbitrary...
- if (time_remaining_ms < 0.10 * target_pause_time_ms) {
+ double threshold = 0.10 * target_pause_time_ms;
+ if (time_remaining_ms < threshold) {
+ double prev_time_remaining_ms = time_remaining_ms;
time_remaining_ms = 0.50 * target_pause_time_ms;
_within_target = false;
+ ergo_verbose3(ErgoCSetConstruction,
+ "adjust remaining time",
+ ergo_format_reason("remaining time lower than threshold")
+ ergo_format_ms("remaining time")
+ ergo_format_ms("threshold")
+ ergo_format_ms("adjusted remaining time"),
+ prev_time_remaining_ms, threshold, time_remaining_ms);
} else {
_within_target = true;
}
- // We figure out the number of bytes available for future to-space.
- // For new regions without marking information, we must assume the
- // worst-case of complete survival. If we have marking information for a
- // region, we can bound the amount of live data. We can add a number of
- // such regions, as long as the sum of the live data bounds does not
- // exceed the available evacuation space.
- size_t max_live_bytes = _g1->free_regions() * HeapRegion::GrainBytes;
+ size_t expansion_bytes = _g1->expansion_regions() * HeapRegion::GrainBytes;
- size_t expansion_bytes =
- _g1->expansion_regions() * HeapRegion::GrainBytes;
+ HeapRegion* hr;
+ double young_start_time_sec = os::elapsedTime();
_collection_set_bytes_used_before = 0;
_collection_set_size = 0;
+ _young_cset_length = 0;
+ _last_young_gc_full = full_young_gcs() ? true : false;
- // Adjust for expansion and slop.
- max_live_bytes = max_live_bytes + expansion_bytes;
-
- HeapRegion* hr;
- if (in_young_gc_mode()) {
- double young_start_time_sec = os::elapsedTime();
-
- if (G1PolicyVerbose > 0) {
- gclog_or_tty->print_cr("Adding %d young regions to the CSet",
- _g1->young_list()->length());
- }
-
- _young_cset_length = 0;
- _last_young_gc_full = full_young_gcs() ? true : false;
-
- if (_last_young_gc_full)
- ++_full_young_pause_num;
- else
- ++_partial_young_pause_num;
-
- // The young list is laid with the survivor regions from the previous
- // pause are appended to the RHS of the young list, i.e.
- // [Newly Young Regions ++ Survivors from last pause].
-
- hr = _g1->young_list()->first_survivor_region();
- while (hr != NULL) {
- assert(hr->is_survivor(), "badly formed young list");
- hr->set_young();
- hr = hr->get_next_young_region();
- }
-
- // Clear the fields that point to the survivor list - they are
- // all young now.
- _g1->young_list()->clear_survivors();
-
- if (_g1->mark_in_progress())
- _g1->concurrent_mark()->register_collection_set_finger(_inc_cset_max_finger);
+ if (_last_young_gc_full) {
+ ++_full_young_pause_num;
+ } else {
+ ++_partial_young_pause_num;
+ }
- _young_cset_length = _inc_cset_young_index;
- _collection_set = _inc_cset_head;
- _collection_set_size = _inc_cset_size;
- _collection_set_bytes_used_before = _inc_cset_bytes_used_before;
+ // The young list is laid with the survivor regions from the previous
+ // pause are appended to the RHS of the young list, i.e.
+ // [Newly Young Regions ++ Survivors from last pause].
- // For young regions in the collection set, we assume the worst
- // case of complete survival
- max_live_bytes -= _inc_cset_size * HeapRegion::GrainBytes;
+ size_t survivor_region_num = young_list->survivor_length();
+ size_t eden_region_num = young_list->length() - survivor_region_num;
+ size_t old_region_num = 0;
+ hr = young_list->first_survivor_region();
+ while (hr != NULL) {
+ assert(hr->is_survivor(), "badly formed young list");
+ hr->set_young();
+ hr = hr->get_next_young_region();
+ }
- time_remaining_ms -= _inc_cset_predicted_elapsed_time_ms;
- predicted_pause_time_ms += _inc_cset_predicted_elapsed_time_ms;
+ // Clear the fields that point to the survivor list - they are all young now.
+ young_list->clear_survivors();
- // The number of recorded young regions is the incremental
- // collection set's current size
- set_recorded_young_regions(_inc_cset_size);
- set_recorded_rs_lengths(_inc_cset_recorded_rs_lengths);
- set_recorded_young_bytes(_inc_cset_recorded_young_bytes);
+ if (_g1->mark_in_progress())
+ _g1->concurrent_mark()->register_collection_set_finger(_inc_cset_max_finger);
+
+ _young_cset_length = _inc_cset_young_index;
+ _collection_set = _inc_cset_head;
+ _collection_set_size = _inc_cset_size;
+ _collection_set_bytes_used_before = _inc_cset_bytes_used_before;
+ time_remaining_ms -= _inc_cset_predicted_elapsed_time_ms;
+ predicted_pause_time_ms += _inc_cset_predicted_elapsed_time_ms;
+
+ ergo_verbose3(ErgoCSetConstruction | ErgoHigh,
+ "add young regions to CSet",
+ ergo_format_region("eden")
+ ergo_format_region("survivors")
+ ergo_format_ms("predicted young region time"),
+ eden_region_num, survivor_region_num,
+ _inc_cset_predicted_elapsed_time_ms);
+
+ // The number of recorded young regions is the incremental
+ // collection set's current size
+ set_recorded_young_regions(_inc_cset_size);
+ set_recorded_rs_lengths(_inc_cset_recorded_rs_lengths);
+ set_recorded_young_bytes(_inc_cset_recorded_young_bytes);
#if PREDICTIONS_VERBOSE
- set_predicted_bytes_to_copy(_inc_cset_predicted_bytes_to_copy);
+ set_predicted_bytes_to_copy(_inc_cset_predicted_bytes_to_copy);
#endif // PREDICTIONS_VERBOSE
- if (G1PolicyVerbose > 0) {
- gclog_or_tty->print_cr(" Added " PTR_FORMAT " Young Regions to CS.",
- _inc_cset_size);
- gclog_or_tty->print_cr(" (" SIZE_FORMAT " KB left in heap.)",
- max_live_bytes/K);
- }
-
- assert(_inc_cset_size == _g1->young_list()->length(), "Invariant");
+ assert(_inc_cset_size == young_list->length(), "Invariant");
- double young_end_time_sec = os::elapsedTime();
- _recorded_young_cset_choice_time_ms =
- (young_end_time_sec - young_start_time_sec) * 1000.0;
+ double young_end_time_sec = os::elapsedTime();
+ _recorded_young_cset_choice_time_ms =
+ (young_end_time_sec - young_start_time_sec) * 1000.0;
- // We are doing young collections so reset this.
- non_young_start_time_sec = young_end_time_sec;
-
- // Note we can use either _collection_set_size or
- // _young_cset_length here
- if (_collection_set_size > 0 && _last_young_gc_full) {
- // don't bother adding more regions...
- goto choose_collection_set_end;
- }
- }
+ // We are doing young collections so reset this.
+ non_young_start_time_sec = young_end_time_sec;
- if (!in_young_gc_mode() || !full_young_gcs()) {
+ if (!full_young_gcs()) {
bool should_continue = true;
NumberSeq seq;
double avg_prediction = 100000000000000000.0; // something very large
+ size_t prev_collection_set_size = _collection_set_size;
+ double prev_predicted_pause_time_ms = predicted_pause_time_ms;
do {
hr = _collectionSetChooser->getNextMarkedRegion(time_remaining_ms,
avg_prediction);
@@ -2983,32 +3022,76 @@ G1CollectorPolicy_BestRegionsFirst::choose_collection_set(
predicted_pause_time_ms += predicted_time_ms;
add_to_collection_set(hr);
record_non_young_cset_region(hr);
- max_live_bytes -= MIN2(hr->max_live_bytes(), max_live_bytes);
- if (G1PolicyVerbose > 0) {
- gclog_or_tty->print_cr(" (" SIZE_FORMAT " KB left in heap.)",
- max_live_bytes/K);
- }
seq.add(predicted_time_ms);
avg_prediction = seq.avg() + seq.sd();
}
- should_continue =
- ( hr != NULL) &&
- ( (adaptive_young_list_length()) ? time_remaining_ms > 0.0
- : _collection_set_size < _young_list_fixed_length );
+
+ should_continue = true;
+ if (hr == NULL) {
+ // No need for an ergo verbose message here,
+ // getNextMarkRegion() does this when it returns NULL.
+ should_continue = false;
+ } else {
+ if (adaptive_young_list_length()) {
+ if (time_remaining_ms < 0.0) {
+ ergo_verbose1(ErgoCSetConstruction,
+ "stop adding old regions to CSet",
+ ergo_format_reason("remaining time is lower than 0")
+ ergo_format_ms("remaining time"),
+ time_remaining_ms);
+ should_continue = false;
+ }
+ } else {
+ if (_collection_set_size >= _young_list_fixed_length) {
+ ergo_verbose2(ErgoCSetConstruction,
+ "stop adding old regions to CSet",
+ ergo_format_reason("CSet length reached target")
+ ergo_format_region("CSet")
+ ergo_format_region("young target"),
+ _collection_set_size, _young_list_fixed_length);
+ should_continue = false;
+ }
+ }
+ }
} while (should_continue);
if (!adaptive_young_list_length() &&
- _collection_set_size < _young_list_fixed_length)
+ _collection_set_size < _young_list_fixed_length) {
+ ergo_verbose2(ErgoCSetConstruction,
+ "request partially-young GCs end",
+ ergo_format_reason("CSet length lower than target")
+ ergo_format_region("CSet")
+ ergo_format_region("young target"),
+ _collection_set_size, _young_list_fixed_length);
_should_revert_to_full_young_gcs = true;
+ }
+
+ old_region_num = _collection_set_size - prev_collection_set_size;
+
+ ergo_verbose2(ErgoCSetConstruction | ErgoHigh,
+ "add old regions to CSet",
+ ergo_format_region("old")
+ ergo_format_ms("predicted old region time"),
+ old_region_num,
+ predicted_pause_time_ms - prev_predicted_pause_time_ms);
}
-choose_collection_set_end:
stop_incremental_cset_building();
count_CS_bytes_used();
end_recording_regions();
+ ergo_verbose5(ErgoCSetConstruction,
+ "finish choosing CSet",
+ ergo_format_region("eden")
+ ergo_format_region("survivors")
+ ergo_format_region("old")
+ ergo_format_ms("predicted pause time")
+ ergo_format_ms("target pause time"),
+ eden_region_num, survivor_region_num, old_region_num,
+ predicted_pause_time_ms, target_pause_time_ms);
+
double non_young_end_time_sec = os::elapsedTime();
_recorded_non_young_cset_choice_time_ms =
(non_young_end_time_sec - non_young_start_time_sec) * 1000.0;
@@ -3020,12 +3103,6 @@ void G1CollectorPolicy_BestRegionsFirst::record_full_collection_end() {
}
void G1CollectorPolicy_BestRegionsFirst::
-expand_if_possible(size_t numRegions) {
- size_t expansion_bytes = numRegions * HeapRegion::GrainBytes;
- _g1->expand(expansion_bytes);
-}
-
-void G1CollectorPolicy_BestRegionsFirst::
record_collection_pause_end() {
G1CollectorPolicy::record_collection_pause_end();
assert(assertMarkedBytesDataOK(), "Marked regions not OK at pause end.");
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
index c44f6bb..9dc7349 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -129,15 +129,9 @@ protected:
jlong _num_cc_clears; // number of times the card count cache has been cleared
#endif
- double _cur_CH_strong_roots_end_sec;
- double _cur_CH_strong_roots_dur_ms;
- double _cur_G1_strong_roots_end_sec;
- double _cur_G1_strong_roots_dur_ms;
-
// Statistics for recent GC pauses. See below for how indexed.
- TruncatedSeq* _recent_CH_strong_roots_times_ms;
- TruncatedSeq* _recent_G1_strong_roots_times_ms;
- TruncatedSeq* _recent_evac_times_ms;
+ TruncatedSeq* _recent_rs_scan_times_ms;
+
// These exclude marking times.
TruncatedSeq* _recent_pause_times_ms;
TruncatedSeq* _recent_gc_times_ms;
@@ -147,7 +141,6 @@ protected:
TruncatedSeq* _recent_rs_sizes;
- TruncatedSeq* _concurrent_mark_init_times_ms;
TruncatedSeq* _concurrent_mark_remark_times_ms;
TruncatedSeq* _concurrent_mark_cleanup_times_ms;
@@ -184,18 +177,15 @@ protected:
double* _par_last_gc_worker_end_times_ms;
double* _par_last_gc_worker_times_ms;
- // indicates that we are in young GC mode
- bool _in_young_gc_mode;
-
// indicates whether we are in full young or partially young GC mode
bool _full_young_gcs;
// if true, then it tries to dynamically adjust the length of the
// young list
bool _adaptive_young_list_length;
- size_t _young_list_min_length;
size_t _young_list_target_length;
size_t _young_list_fixed_length;
+ size_t _prev_eden_capacity; // used for logging
// The max number of regions we can extend the eden by while the GC
// locker is active. This should be >= _young_list_target_length;
@@ -217,6 +207,9 @@ protected:
double _gc_overhead_perc;
+ double _reserve_factor;
+ size_t _reserve_regions;
+
bool during_marking() {
return _during_marking;
}
@@ -253,6 +246,10 @@ private:
TruncatedSeq* _max_conc_overhead_seq;
+ bool _using_new_ratio_calculations;
+ size_t _min_desired_young_length; // as set on the command line or default calculations
+ size_t _max_desired_young_length; // as set on the command line or default calculations
+
size_t _recorded_young_regions;
size_t _recorded_non_young_regions;
size_t _recorded_region_num;
@@ -466,12 +463,6 @@ public:
size_t predict_bytes_to_copy(HeapRegion* hr);
double predict_region_elapsed_time_ms(HeapRegion* hr, bool young);
- // for use by: calculate_young_list_target_length(rs_length)
- bool predict_will_fit(size_t young_region_num,
- double base_time_ms,
- size_t init_free_regions,
- double target_pause_time_ms);
-
void start_recording_regions();
void record_cset_region_info(HeapRegion* hr, bool young);
void record_non_young_cset_region(HeapRegion* hr);
@@ -503,7 +494,6 @@ public:
// </NEW PREDICTION>
-public:
void cset_regions_freed() {
bool propagate = _last_young_gc_full && !_in_marking_window;
_short_lived_surv_rate_group->all_surviving_words_recorded(propagate);
@@ -533,10 +523,6 @@ public:
return _mmu_tracker->max_gc_time() * 1000.0;
}
- double predict_init_time_ms() {
- return get_new_prediction(_concurrent_mark_init_times_ms);
- }
-
double predict_remark_time_ms() {
return get_new_prediction(_concurrent_mark_remark_times_ms);
}
@@ -591,13 +577,9 @@ protected:
int _last_update_rs_processed_buffers;
double _last_pause_time_ms;
- size_t _bytes_in_to_space_before_gc;
- size_t _bytes_in_to_space_after_gc;
- size_t bytes_in_to_space_during_gc() {
- return
- _bytes_in_to_space_after_gc - _bytes_in_to_space_before_gc;
- }
size_t _bytes_in_collection_set_before_gc;
+ size_t _bytes_copied_during_gc;
+
// Used to count used bytes in CS.
friend class CountCSClosure;
@@ -692,17 +674,11 @@ protected:
// The average time in ms per collection pause, averaged over recent pauses.
double recent_avg_time_for_pauses_ms();
- // The average time in ms for processing CollectedHeap strong roots, per
- // collection pause, averaged over recent pauses.
- double recent_avg_time_for_CH_strong_ms();
-
- // The average time in ms for processing the G1 remembered set, per
- // pause, averaged over recent pauses.
- double recent_avg_time_for_G1_strong_ms();
-
- // The average time in ms for "evacuating followers", per pause, averaged
- // over recent pauses.
- double recent_avg_time_for_evac_ms();
+ // The average time in ms for RS scanning, per pause, averaged
+ // over recent pauses. (Note the RS scanning time for a pause
+ // is itself an average of the RS scanning time for each worker
+ // thread.)
+ double recent_avg_time_for_rs_scan_ms();
// The number of "recent" GCs recorded in the number sequences
int number_of_recent_gcs();
@@ -792,14 +768,45 @@ protected:
// This set of variables tracks the collector efficiency, in order to
// determine whether we should initiate a new marking.
double _cur_mark_stop_world_time_ms;
- double _mark_init_start_sec;
double _mark_remark_start_sec;
double _mark_cleanup_start_sec;
double _mark_closure_time_ms;
- void calculate_young_list_min_length();
- void calculate_young_list_target_length();
- void calculate_young_list_target_length(size_t rs_lengths);
+ // Update the young list target length either by setting it to the
+ // desired fixed value or by calculating it using G1's pause
+ // prediction model. If no rs_lengths parameter is passed, predict
+ // the RS lengths using the prediction model, otherwise use the
+ // given rs_lengths as the prediction.
+ void update_young_list_target_length(size_t rs_lengths = (size_t) -1);
+
+ // Calculate and return the minimum desired young list target
+ // length. This is the minimum desired young list length according
+ // to the user's inputs.
+ size_t calculate_young_list_desired_min_length(size_t base_min_length);
+
+ // Calculate and return the maximum desired young list target
+ // length. This is the maximum desired young list length according
+ // to the user's inputs.
+ size_t calculate_young_list_desired_max_length();
+
+ // Calculate and return the maximum young list target length that
+ // can fit into the pause time goal. The parameters are: rs_lengths
+ // represent the prediction of how large the young RSet lengths will
+ // be, base_min_length is the alreay existing number of regions in
+ // the young list, min_length and max_length are the desired min and
+ // max young list length according to the user's inputs.
+ size_t calculate_young_list_target_length(size_t rs_lengths,
+ size_t base_min_length,
+ size_t desired_min_length,
+ size_t desired_max_length);
+
+ // Check whether a given young length (young_length) fits into the
+ // given target pause time and whether the prediction for the amount
+ // of objects to be copied for the given length will fit into the
+ // given free space (expressed by base_free_regions). It is used by
+ // calculate_young_list_target_length().
+ bool predict_will_fit(size_t young_length, double base_time_ms,
+ size_t base_free_regions, double target_pause_time_ms);
public:
@@ -811,20 +818,22 @@ public:
return CollectorPolicy::G1CollectorPolicyKind;
}
- void check_prediction_validity();
+ // Check the current value of the young list RSet lengths and
+ // compare it against the last prediction. If the current value is
+ // higher, recalculate the young list target length prediction.
+ void revise_young_list_target_length_if_necessary();
size_t bytes_in_collection_set() {
return _bytes_in_collection_set_before_gc;
}
- size_t bytes_in_to_space() {
- return bytes_in_to_space_during_gc();
- }
-
unsigned calc_gc_alloc_time_stamp() {
return _all_pause_times_ms->num() + 1;
}
+ // This should be called after the heap is resized.
+ void record_new_heap_size(size_t new_number_of_regions);
+
protected:
// Count the number of bytes used in the CS.
@@ -836,6 +845,8 @@ protected:
size_t max_live_bytes);
void record_concurrent_mark_cleanup_end_work2();
+ void update_young_list_size_using_newratio(size_t number_of_heap_regions);
+
public:
virtual void init();
@@ -869,9 +880,7 @@ public:
size_t start_used);
// Must currently be called while the world is stopped.
- virtual void record_concurrent_mark_init_start();
- virtual void record_concurrent_mark_init_end();
- void record_concurrent_mark_init_end_pre(double
+ void record_concurrent_mark_init_end(double
mark_init_elapsed_time_ms);
void record_mark_closure_time(double mark_closure_time_ms);
@@ -887,9 +896,6 @@ public:
virtual void record_concurrent_pause();
virtual void record_concurrent_pause_end();
- virtual void record_collection_pause_end_CH_strong_roots();
- virtual void record_collection_pause_end_G1_strong_roots();
-
virtual void record_collection_pause_end();
void print_heap_transition();
@@ -992,9 +998,16 @@ public:
}
#endif
- // Record the fact that "bytes" bytes allocated in a region.
- void record_before_bytes(size_t bytes);
- void record_after_bytes(size_t bytes);
+ // Record how much space we copied during a GC. This is typically
+ // called when a GC alloc region is being retired.
+ void record_bytes_copied_during_gc(size_t bytes) {
+ _bytes_copied_during_gc += bytes;
+ }
+
+ // The amount of space we copied during a GC.
+ size_t bytes_copied_during_gc() {
+ return _bytes_copied_during_gc;
+ }
// Choose a new collection set. Marks the chosen regions as being
// "in_collection_set", and links them together. The head and number of
@@ -1072,7 +1085,7 @@ public:
// new cycle, as long as we are not already in one. It's best if it
// is called during a safepoint when the test whether a cycle is in
// progress or not is stable.
- bool force_initial_mark_if_outside_cycle();
+ bool force_initial_mark_if_outside_cycle(GCCause::Cause gc_cause);
// This is called at the very beginning of an evacuation pause (it
// has to be the first thing that the pause does). If
@@ -1117,30 +1130,17 @@ public:
bool is_young_list_full() {
size_t young_list_length = _g1->young_list()->length();
size_t young_list_target_length = _young_list_target_length;
- if (G1FixedEdenSize) {
- young_list_target_length -= _max_survivor_regions;
- }
return young_list_length >= young_list_target_length;
}
bool can_expand_young_list() {
size_t young_list_length = _g1->young_list()->length();
size_t young_list_max_length = _young_list_max_length;
- if (G1FixedEdenSize) {
- young_list_max_length -= _max_survivor_regions;
- }
return young_list_length < young_list_max_length;
}
void update_region_num(bool young);
- bool in_young_gc_mode() {
- return _in_young_gc_mode;
- }
- void set_in_young_gc_mode(bool in_young_gc_mode) {
- _in_young_gc_mode = in_young_gc_mode;
- }
-
bool full_young_gcs() {
return _full_young_gcs;
}
@@ -1208,10 +1208,6 @@ public:
return purpose == GCAllocForSurvived;
}
- inline GCAllocPurpose alternative_purpose(int purpose) {
- return GCAllocForTenured;
- }
-
static const size_t REGIONS_UNLIMITED = ~(size_t)0;
size_t max_regions(int purpose);
@@ -1248,10 +1244,10 @@ public:
_survivors_age_table.merge_par(age_table);
}
- void calculate_max_gc_locker_expansion();
+ void update_max_gc_locker_expansion();
// Calculates survivor space parameters.
- void calculate_survivors_policy();
+ void update_survivors_policy();
};
@@ -1278,8 +1274,6 @@ public:
class G1CollectorPolicy_BestRegionsFirst: public G1CollectorPolicy {
CollectionSetChooser* _collectionSetChooser;
- // If the estimated is less then desirable, resize if possible.
- void expand_if_possible(size_t numRegions);
virtual void choose_collection_set(double target_pause_time_ms);
virtual void record_collection_pause_start(double start_time_sec,
@@ -1313,8 +1307,4 @@ inline double variance(int n, double sum_of_squares, double sum) {
return (sum_of_squares - 2.0 * avg * sum + n_d * avg * avg) / n_d;
}
-// Local Variables: ***
-// c-indentation-style: gnu ***
-// End: ***
-
#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1COLLECTORPOLICY_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp
new file mode 100644
index 0000000..dc6b49c
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.cpp
@@ -0,0 +1,65 @@
+/*
+ * 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.
+ *
+ */
+
+#include "precompiled.hpp"
+#include "gc_implementation/g1/g1ErgoVerbose.hpp"
+#include "utilities/ostream.hpp"
+
+ErgoLevel G1ErgoVerbose::_level;
+bool G1ErgoVerbose::_enabled[ErgoHeuristicNum];
+
+void G1ErgoVerbose::initialize() {
+ set_level(ErgoLow);
+ set_enabled(false);
+}
+
+void G1ErgoVerbose::set_level(ErgoLevel level) {
+ _level = level;
+}
+
+void G1ErgoVerbose::set_enabled(ErgoHeuristic n, bool enabled) {
+ assert(0 <= n && n < ErgoHeuristicNum, "pre-condition");
+ _enabled[n] = enabled;
+}
+
+void G1ErgoVerbose::set_enabled(bool enabled) {
+ for (int n = 0; n < ErgoHeuristicNum; n += 1) {
+ set_enabled((ErgoHeuristic) n, enabled);
+ }
+}
+
+const char* G1ErgoVerbose::to_string(int tag) {
+ ErgoHeuristic n = extract_heuristic(tag);
+ switch (n) {
+ case ErgoHeapSizing: return "Heap Sizing";
+ case ErgoCSetConstruction: return "CSet Construction";
+ case ErgoConcCycles: return "Concurrent Cycles";
+ case ErgoPartiallyYoungGCs: return "Partially-Young GCs";
+ default:
+ ShouldNotReachHere();
+ // Keep the Windows compiler happy
+ return NULL;
+ }
+}
+
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
new file mode 100644
index 0000000..c170a49
--- /dev/null
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1ErgoVerbose.hpp
@@ -0,0 +1,197 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
+#define SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
+
+#include "memory/allocation.hpp"
+#include "utilities/debug.hpp"
+
+// The log of G1's heuristic decisions comprises of a series of
+// records which have a similar format in order to maintain
+// consistency across records and ultimately easier parsing of the
+// output, if we ever choose to do that. Each record consists of:
+// * A time stamp to be able to easily correlate each record with
+// other events.
+// * A unique string to allow us to easily identify such records.
+// * The name of the heuristic the record corresponds to.
+// * An action string which describes the action that G1 did or is
+// about to do.
+// * An optional reason string which describes the reason for the
+// action.
+// * An optional number of name/value pairs which contributed to the
+// decision to take the action described in the record.
+//
+// Each record is associated with a "tag" which is the combination of
+// the heuristic the record corresponds to, as well as the min level
+// of verboseness at which the record should be printed. The tag is
+// checked against the current settings to determine whether the record
+// should be printed or not.
+
+// The available verboseness levels.
+typedef enum {
+ // Determine which part of the tag is occupied by the level.
+ ErgoLevelShift = 8,
+ ErgoLevelMask = ~((1 << ErgoLevelShift) - 1),
+
+ // ErgoLow is 0 so that we don't have to explicitly or a heuristic
+ // id with ErgoLow to keep its use simpler.
+ ErgoLow = 0,
+ ErgoHigh = 1 << ErgoLevelShift
+} ErgoLevel;
+
+// The available heuristics.
+typedef enum {
+ // Determines which part of the tag is occupied by the heuristic id.
+ ErgoHeuristicMask = ~ErgoLevelMask,
+
+ ErgoHeapSizing = 0,
+ ErgoCSetConstruction,
+ ErgoConcCycles,
+ ErgoPartiallyYoungGCs,
+
+ ErgoHeuristicNum
+} ErgoHeuristic;
+
+class G1ErgoVerbose : AllStatic {
+private:
+ // Determines the minimum verboseness level at which records will be
+ // printed.
+ static ErgoLevel _level;
+ // Determines which heuristics are currently enabled.
+ static bool _enabled[ErgoHeuristicNum];
+
+ static ErgoLevel extract_level(int tag) {
+ return (ErgoLevel) (tag & ErgoLevelMask);
+ }
+
+ static ErgoHeuristic extract_heuristic(int tag) {
+ return (ErgoHeuristic) (tag & ErgoHeuristicMask);
+ }
+
+public:
+ // Needs to be explicitly called at GC initialization.
+ static void initialize();
+
+ static void set_level(ErgoLevel level);
+ static void set_enabled(ErgoHeuristic h, bool enabled);
+ // It is applied to all heuristics.
+ static void set_enabled(bool enabled);
+
+ static bool enabled(int tag) {
+ ErgoLevel level = extract_level(tag);
+ ErgoHeuristic n = extract_heuristic(tag);
+ return level <= _level && _enabled[n];
+ }
+
+ // Extract the heuristic id from the tag and return a string with
+ // its name.
+ static const char* to_string(int tag);
+};
+
+// The macros below generate the format string for values of different
+// types and/or metrics.
+
+// The reason for the action is optional and is handled specially: the
+// reason string is concatenated here so it's not necessary to pass it
+// as a parameter.
+#define ergo_format_reason(_reason_) ", reason: " _reason_
+
+// Single parameter format strings
+#define ergo_format_str(_name_) ", " _name_ ": %s"
+#define ergo_format_region(_name_) ", " _name_ ": "SIZE_FORMAT" regions"
+#define ergo_format_byte(_name_) ", " _name_ ": "SIZE_FORMAT" bytes"
+#define ergo_format_double(_name_) ", " _name_ ": %1.2f"
+#define ergo_format_perc(_name_) ", " _name_ ": %1.2f %%"
+#define ergo_format_ms(_name_) ", " _name_ ": %1.2f ms"
+
+// Double parameter format strings
+#define ergo_format_byte_perc(_name_) \
+ ", " _name_ ": "SIZE_FORMAT" bytes (%1.2f %%)"
+
+// Generates the format string
+#define ergo_format(_action_, _extra_format_) \
+ " %1.3f: [G1Ergonomics (%s) " _action_ _extra_format_ "]"
+
+// Conditionally, prints an ergonomic decision record. _extra_format_
+// is the format string for the optional items we'd like to print
+// (i.e., the decision's reason and any associated values). This
+// string should be built up using the ergo_*_format macros (see
+// above) to ensure consistency.
+//
+// Since we cannot rely on the compiler supporting variable argument
+// macros, this macro accepts a fixed number of arguments and passes
+// them to the print method. For convenience, we have wrapper macros
+// below which take a specific number of arguments and set the rest to
+// a default value.
+#define ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_) \
+ do { \
+ if (G1ErgoVerbose::enabled((_tag_))) { \
+ gclog_or_tty->print_cr(ergo_format(_action_, _extra_format_), \
+ os::elapsedTime(), \
+ G1ErgoVerbose::to_string((_tag_)), \
+ (_arg0_), (_arg1_), (_arg2_), \
+ (_arg3_), (_arg4_), (_arg5_)); \
+ } \
+ } while (0)
+
+
+#define ergo_verbose(_tag_, _action_) \
+ ergo_verbose_common(_tag_, _action_, "", 0, 0, 0, 0, 0, 0)
+
+#define ergo_verbose0(_tag_, _action_, _extra_format_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, 0, 0, 0, 0, 0, 0)
+
+#define ergo_verbose1(_tag_, _action_, _extra_format_, \
+ _arg0_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, 0, 0, 0, 0, 0)
+
+#define ergo_verbose2(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, 0, 0, 0, 0)
+
+#define ergo_verbose3(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, 0, 0, 0)
+
+#define ergo_verbose4(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_, 0, 0)
+
+#define ergo_verbose5(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_, _arg4_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, 0)
+
+#define ergo_verbose6(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_) \
+ ergo_verbose_common(_tag_, _action_, _extra_format_, \
+ _arg0_, _arg1_, _arg2_, _arg3_, _arg4_, _arg5_)
+
+#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1ERGOVERBOSE_HPP
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
index 2943c83..bd91c8f 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1MMUTracker.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -97,10 +97,6 @@ void G1MMUTrackerQueue::add_pause(double start, double end, bool gc_thread) {
// or performance (we are GC'ing most of the time anyway!),
// simply overwrite the oldest entry in the tracker.
- if (G1PolicyVerbose > 1) {
- warning("MMU Tracker Queue overflow. Replacing earliest entry.");
- }
-
_head_index = trim_index(_head_index + 1);
assert(_head_index == _tail_index, "Because we have a full circular buffer");
_tail_index = trim_index(_tail_index + 1);
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
index 8eaaa9d..d3f1ce2 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1OopClosures.hpp
@@ -50,6 +50,8 @@ protected:
G1RemSet* _g1_rem;
ConcurrentMark* _cm;
G1ParScanThreadState* _par_scan_state;
+ bool _during_initial_mark;
+ bool _mark_in_progress;
public:
G1ParClosureSuper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state);
bool apply_to_weak_ref_discovered_field() { return true; }
@@ -102,8 +104,8 @@ public:
class G1ParCopyHelper : public G1ParClosureSuper {
G1ParScanClosure *_scanner;
protected:
- template <class T> void mark_forwardee(T* p);
- oop copy_to_survivor_space(oop obj);
+ template <class T> void mark_object(T* p);
+ oop copy_to_survivor_space(oop obj, bool should_mark_copy);
public:
G1ParCopyHelper(G1CollectedHeap* g1, G1ParScanThreadState* par_scan_state,
G1ParScanClosure *scanner) :
@@ -111,7 +113,7 @@ public:
};
template<bool do_gen_barrier, G1Barrier barrier,
- bool do_mark_forwardee>
+ bool do_mark_object>
class G1ParCopyClosure : public G1ParCopyHelper {
G1ParScanClosure _scanner;
template <class T> void do_oop_work(T* p);
@@ -120,8 +122,6 @@ public:
_scanner(g1, par_scan_state), G1ParCopyHelper(g1, par_scan_state, &_scanner) { }
template <class T> void do_oop_nv(T* p) {
do_oop_work(p);
- if (do_mark_forwardee)
- mark_forwardee(p);
}
virtual void do_oop(oop* p) { do_oop_nv(p); }
virtual void do_oop(narrowOop* p) { do_oop_nv(p); }
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
index 59d2590..e54956c 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap,
int max_covered_regions) :
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
index ee1bc44..1e2ab28 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
@@ -39,8 +39,6 @@
develop(intx, G1MarkingOverheadPercent, 0, \
"Overhead of concurrent marking") \
\
- develop(bool, G1Gen, true, \
- "If true, it will enable the generational G1") \
\
develop(intx, G1PolicyVerbose, 0, \
"The verbosity level on G1 policy decisions") \
@@ -126,9 +124,6 @@
develop(bool, G1RSBarrierNullFilter, true, \
"If true, generate null-pointer filtering code in RS barrier") \
\
- develop(bool, G1PrintCTFilterStats, false, \
- "If true, print stats on RS filtering effectiveness") \
- \
develop(bool, G1DeferredRSUpdate, true, \
"If true, use deferred RS updates") \
\
@@ -139,9 +134,9 @@
develop(bool, G1RSCountHisto, false, \
"If true, print a histogram of RS occupancies after each pause") \
\
- product(bool, G1PrintRegionLivenessInfo, false, \
- "Prints the liveness information for all regions in the heap " \
- "at the end of a marking cycle.") \
+ diagnostic(bool, G1PrintRegionLivenessInfo, false, \
+ "Prints the liveness information for all regions in the heap " \
+ "at the end of a marking cycle.") \
\
develop(bool, G1PrintParCleanupStats, false, \
"When true, print extra stats about parallel cleanup.") \
@@ -233,7 +228,7 @@
"the number of regions for which we'll print a surv rate " \
"summary.") \
\
- product(intx, G1ReservePercent, 10, \
+ product(uintx, G1ReservePercent, 10, \
"It determines the minimum reserve we should have in the heap " \
"to minimize the probability of promotion failure.") \
\
@@ -251,16 +246,6 @@
"When set, G1 will fail when it encounters an FP 'error', " \
"so as to allow debugging") \
\
- develop(bool, G1FixedTenuringThreshold, false, \
- "When set, G1 will not adjust the tenuring threshold") \
- \
- develop(bool, G1FixedEdenSize, false, \
- "When set, G1 will not allocate unused survivor space regions") \
- \
- develop(uintx, G1FixedSurvivorSpaceSize, 0, \
- "If non-0 is the size of the G1 survivor space, " \
- "otherwise SurvivorRatio is used to determine the size") \
- \
product(uintx, G1HeapRegionSize, 0, \
"Size of the G1 regions.") \
\
diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp b/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
index 5fcd66f..fea3e07 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1_specialized_oop_closures.hpp
@@ -36,7 +36,7 @@ enum G1Barrier {
};
template<bool do_gen_barrier, G1Barrier barrier,
- bool do_mark_forwardee>
+ bool do_mark_object>
class G1ParCopyClosure;
class G1ParScanClosure;
class G1ParPushHeapRSClosure;
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
index 3acd100..ec42314 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp
@@ -352,7 +352,6 @@ void HeapRegion::hr_clear(bool par, bool clear_space) {
"we should have already filtered out humongous regions");
_in_collection_set = false;
- _is_gc_alloc_region = false;
set_young_index_in_cset(-1);
uninstall_surv_rate_group();
@@ -486,7 +485,7 @@ HeapRegion(size_t hrs_index, G1BlockOffsetSharedArray* sharedOffsetArray,
: G1OffsetTableContigSpace(sharedOffsetArray, mr, is_zeroed),
_next_fk(HeapRegionDCTOC::NoFilterKind), _hrs_index(hrs_index),
_humongous_type(NotHumongous), _humongous_start_region(NULL),
- _in_collection_set(false), _is_gc_alloc_region(false),
+ _in_collection_set(false),
_next_in_special_set(NULL), _orig_end(NULL),
_claimed(InitialClaimValue), _evacuation_failed(false),
_prev_marked_bytes(0), _next_marked_bytes(0), _sort_index(-1),
@@ -716,8 +715,6 @@ void HeapRegion::print_on(outputStream* st) const {
}
if (in_collection_set())
st->print(" CS");
- else if (is_gc_alloc_region())
- st->print(" A ");
else
st->print(" ");
if (is_young())
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
index ec63d1f..774987d 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp
@@ -251,10 +251,6 @@ class HeapRegion: public G1OffsetTableContigSpace {
// True iff the region is in current collection_set.
bool _in_collection_set;
- // Is this or has it been an allocation region in the current collection
- // pause.
- bool _is_gc_alloc_region;
-
// True iff an attempt to evacuate an object in the region failed.
bool _evacuation_failed;
@@ -497,27 +493,6 @@ class HeapRegion: public G1OffsetTableContigSpace {
_next_in_special_set = r;
}
- // True iff it is or has been an allocation region in the current
- // collection pause.
- bool is_gc_alloc_region() const {
- return _is_gc_alloc_region;
- }
- void set_is_gc_alloc_region(bool b) {
- _is_gc_alloc_region = b;
- }
- HeapRegion* next_gc_alloc_region() {
- assert(is_gc_alloc_region(), "should only invoke on member of CS.");
- assert(_next_in_special_set == NULL ||
- _next_in_special_set->is_gc_alloc_region(),
- "Malformed CS.");
- return _next_in_special_set;
- }
- void set_next_gc_alloc_region(HeapRegion* r) {
- assert(is_gc_alloc_region(), "should only invoke on member of CS.");
- assert(r == NULL || r->is_gc_alloc_region(), "Malformed CS.");
- _next_in_special_set = r;
- }
-
// Methods used by the HeapRegionSetBase class and subclasses.
// Getter and setter for the next field used to link regions into
diff --git a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
index 0840bdd..8c5f15e 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp
@@ -364,7 +364,10 @@ public:
PosParPRT** next_addr() { return &_next; }
bool should_expand(int tid) {
- return par_tables() == NULL && tid > 0 && hr()->is_gc_alloc_region();
+ // Given that we now defer RSet updates for after a GC we don't
+ // really need to expand the tables any more. This code should be
+ // cleaned up in the future (see CR 6921087).
+ return false;
}
void par_expand() {
diff --git a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp b/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp
index 4186b42..7bf8fec 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
PtrQueue::PtrQueue(PtrQueueSet* qset, bool perm, bool active) :
_qset(qset), _buf(NULL), _index(0), _active(active),
diff --git a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
index d44f263..04d051b 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/vm_operations_g1.cpp
@@ -98,7 +98,7 @@ void VM_G1IncCollectionPause::doit() {
// At this point we are supposed to start a concurrent cycle. We
// will do so if one is not already in progress.
- bool res = g1h->g1_policy()->force_initial_mark_if_outside_cycle();
+ bool res = g1h->g1_policy()->force_initial_mark_if_outside_cycle(_gc_cause);
// The above routine returns true if we were able to force the
// next GC pause to be an initial mark; it returns false if a
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
index f43fffc..4496a69 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
bool
ParMarkBitMap::initialize(MemRegion covered_region)
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
index 37190f4..42e65f1 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp
@@ -909,10 +909,6 @@ void ParallelScavengeHeap::verify(bool allow_dirty, bool silent, VerifyOption op
}
young_gen()->verify(allow_dirty);
}
- if (!silent) {
- gclog_or_tty->print("ref_proc ");
- }
- ReferenceProcessor::verify();
}
void ParallelScavengeHeap::print_heap_change(size_t prev_used) {
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
index c7a651f..75ee0b3 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.cpp
@@ -80,10 +80,6 @@ void MarkFromRootsTask::do_it(GCTaskManager* manager, uint which) {
Universe::oops_do(&mark_and_push_closure);
break;
- case reference_processing:
- ReferenceProcessor::oops_do(&mark_and_push_closure);
- break;
-
case jni_handles:
JNIHandles::oops_do(&mark_and_push_closure);
break;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
index 4c8b115..c79bc7c 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/pcTasks.hpp
@@ -98,8 +98,7 @@ class MarkFromRootsTask : public GCTask {
management = 6,
jvmti = 7,
system_dictionary = 8,
- reference_processing = 9,
- code_cache = 10
+ code_cache = 9
};
private:
RootType _root_type;
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
index f541472..3d7e0ba 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp
@@ -516,7 +516,6 @@ void PSMarkSweep::mark_sweep_phase1(bool clear_all_softrefs) {
{
ParallelScavengeHeap::ParStrongRootsScope psrs;
Universe::oops_do(mark_and_push_closure());
- ReferenceProcessor::oops_do(mark_and_push_closure());
JNIHandles::oops_do(mark_and_push_closure()); // Global (strong) JNI handles
CodeBlobToOopClosure each_active_code_blob(mark_and_push_closure(), /*do_marking=*/ true);
Threads::oops_do(mark_and_push_closure(), &each_active_code_blob);
@@ -623,7 +622,6 @@ void PSMarkSweep::mark_sweep_phase3() {
// General strong roots.
Universe::oops_do(adjust_root_pointer_closure());
- ReferenceProcessor::oops_do(adjust_root_pointer_closure());
JNIHandles::oops_do(adjust_root_pointer_closure()); // Global (strong) JNI handles
Threads::oops_do(adjust_root_pointer_closure(), NULL);
ObjectSynchronizer::oops_do(adjust_root_pointer_closure());
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
index 08b723c..55cb343 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
@@ -2445,7 +2445,6 @@ void PSParallelCompact::adjust_roots() {
// General strong roots.
Universe::oops_do(adjust_root_pointer_closure());
- ReferenceProcessor::oops_do(adjust_root_pointer_closure());
JNIHandles::oops_do(adjust_root_pointer_closure()); // Global (strong) JNI handles
Threads::oops_do(adjust_root_pointer_closure(), NULL);
ObjectSynchronizer::oops_do(adjust_root_pointer_closure());
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
index c297477..f3011a8 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psTasks.cpp
@@ -55,7 +55,6 @@ void ScavengeRootsTask::do_it(GCTaskManager* manager, uint which) {
switch (_root_type) {
case universe:
Universe::oops_do(&roots_closure);
- ReferenceProcessor::oops_do(&roots_closure);
break;
case jni_handles:
diff --git a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp
index 8eba893..e194767 100644
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// PSVirtualSpace
diff --git a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
index aacaf35..e38556d 100644
--- a/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
+++ b/hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
index 6b99a8f..0a4b42c 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.cpp
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef ASSERT
@@ -157,8 +160,14 @@ HeapWord* CollectedHeap::allocate_from_tlab_slow(Thread* thread, size_t size) {
// ..and clear it.
Copy::zero_to_words(obj, new_tlab_size);
} else {
- // ...and clear just the allocated object.
- Copy::zero_to_words(obj, size);
+ // ...and zap just allocated object.
+#ifdef ASSERT
+ // Skip mangling the space corresponding to the object header to
+ // ensure that the returned space is not considered parsable by
+ // any concurrent GC thread.
+ size_t hdr_size = oopDesc::header_size();
+ Copy::fill_to_words(obj + hdr_size, new_tlab_size - hdr_size, badHeapWordVal);
+#endif // ASSERT
}
thread->tlab().fill(obj, obj + size, new_tlab_size);
return obj;
@@ -404,13 +413,13 @@ void CollectedHeap::resize_all_tlabs() {
void CollectedHeap::pre_full_gc_dump() {
if (HeapDumpBeforeFullGC) {
- TraceTime tt("Heap Dump: ", PrintGCDetails, false, gclog_or_tty);
+ TraceTime tt("Heap Dump (before full gc): ", PrintGCDetails, false, gclog_or_tty);
// We are doing a "major" collection and a heap dump before
// major collection has been requested.
HeapDumper::dump_heap();
}
if (PrintClassHistogramBeforeFullGC) {
- TraceTime tt("Class Histogram: ", PrintGCDetails, true, gclog_or_tty);
+ TraceTime tt("Class Histogram (before full gc): ", PrintGCDetails, true, gclog_or_tty);
VM_GC_HeapInspection inspector(gclog_or_tty, false /* ! full gc */, false /* ! prologue */);
inspector.doit();
}
@@ -418,11 +427,11 @@ void CollectedHeap::pre_full_gc_dump() {
void CollectedHeap::post_full_gc_dump() {
if (HeapDumpAfterFullGC) {
- TraceTime tt("Heap Dump", PrintGCDetails, false, gclog_or_tty);
+ TraceTime tt("Heap Dump (after full gc): ", PrintGCDetails, false, gclog_or_tty);
HeapDumper::dump_heap();
}
if (PrintClassHistogramAfterFullGC) {
- TraceTime tt("Class Histogram", PrintGCDetails, true, gclog_or_tty);
+ TraceTime tt("Class Histogram (after full gc): ", PrintGCDetails, true, gclog_or_tty);
VM_GC_HeapInspection inspector(gclog_or_tty, false /* ! full gc */, false /* ! prologue */);
inspector.doit();
}
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
index 36fcb40..5761ea5 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.hpp
@@ -322,6 +322,7 @@ class CollectedHeap : public CHeapObj {
// General obj/array allocation facilities.
inline static oop obj_allocate(KlassHandle klass, int size, TRAPS);
inline static oop array_allocate(KlassHandle klass, int size, int length, TRAPS);
+ inline static oop array_allocate_nozero(KlassHandle klass, int size, int length, TRAPS);
// Special obj/array allocation facilities.
// Some heaps may want to manage "permanent" data uniquely. These default
diff --git a/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp b/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
index 68003b7..adced06 100644
--- a/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
+++ b/hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp
@@ -43,6 +43,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Inline allocation implementations.
@@ -271,6 +274,23 @@ oop CollectedHeap::array_allocate(KlassHandle klass,
return (oop)obj;
}
+oop CollectedHeap::array_allocate_nozero(KlassHandle klass,
+ int size,
+ int length,
+ TRAPS) {
+ debug_only(check_for_valid_allocation_state());
+ assert(!Universe::heap()->is_gc_active(), "Allocation during gc not allowed");
+ assert(size >= 0, "int won't convert to size_t");
+ HeapWord* obj = common_mem_allocate_noinit(size, CHECK_NULL);
+ ((oop)obj)->set_klass_gap(0);
+ post_allocation_setup_array(klass, obj, size, length);
+#ifndef PRODUCT
+ const size_t hs = oopDesc::header_size()+1;
+ Universe::heap()->check_for_non_bad_heap_word_value(obj+hs, size-hs);
+#endif
+ return (oop)obj;
+}
+
oop CollectedHeap::permanent_obj_allocate(KlassHandle klass, int size, TRAPS) {
oop obj = permanent_obj_allocate_no_klass_install(klass, size, CHECK_NULL);
post_allocation_install_obj_klass(klass, obj, size);
@@ -287,7 +307,10 @@ oop CollectedHeap::permanent_obj_allocate_no_klass_install(KlassHandle klass,
assert(size >= 0, "int won't convert to size_t");
HeapWord* obj = common_permanent_mem_allocate_init(size, CHECK_NULL);
post_allocation_setup_no_klass_install(klass, obj, size);
- NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value(obj, size));
+#ifndef PRODUCT
+ const size_t hs = oopDesc::header_size();
+ Universe::heap()->check_for_bad_heap_word_value(obj+hs, size-hs);
+#endif
return (oop)obj;
}
diff --git a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
index a792812..a68fac1 100644
--- a/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
+++ b/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp
@@ -56,6 +56,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// This file contains the platform-independent parts
// of the abstract interpreter and the abstract interpreter generator.
diff --git a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
index 7da054d..68bd1c7 100644
--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
@@ -65,6 +65,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "orderAccess_linux_ppc.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "orderAccess_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "orderAccess_bsd_zero.inline.hpp"
+#endif
// no precompiled headers
diff --git a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
index 292e19c..b9f64ed 100644
--- a/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
+++ b/hotspot/src/share/vm/interpreter/bytecodeTracer.cpp
@@ -92,7 +92,7 @@ class BytecodePrinter: public BytecodeClosure {
// the incoming method. We could lose a line of trace output.
// This is acceptable in a debug-only feature.
st->cr();
- st->print("[%d] ", (int) Thread::current()->osthread()->thread_id());
+ st->print("[%ld] ", (long) Thread::current()->osthread()->thread_id());
method->print_name(st);
st->cr();
_current_method = method();
@@ -106,7 +106,7 @@ class BytecodePrinter: public BytecodeClosure {
}
_code = code;
int bci = bcp - method->code_base();
- st->print("[%d] ", (int) Thread::current()->osthread()->thread_id());
+ st->print("[%ld] ", (long) Thread::current()->osthread()->thread_id());
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
diff --git a/hotspot/src/share/vm/interpreter/bytecodes.hpp b/hotspot/src/share/vm/interpreter/bytecodes.hpp
index 6194ad6..2ea7336 100644
--- a/hotspot/src/share/vm/interpreter/bytecodes.hpp
+++ b/hotspot/src/share/vm/interpreter/bytecodes.hpp
@@ -419,6 +419,8 @@ class Bytecodes: AllStatic {
static bool is_zero_const (Code code) { return (code == _aconst_null || code == _iconst_0
|| code == _fconst_0 || code == _dconst_0); }
+ static bool is_invoke (Code code) { return (_invokevirtual <= code && code <= _invokedynamic); }
+
static int compute_flags (const char* format, int more_flags = 0); // compute the flags
static int flags (int code, bool is_wide) {
assert(code == (u_char)code, "must be a byte");
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
index 3466f43..7b7b49d 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp
@@ -509,6 +509,7 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecode
// resolve field
FieldAccessInfo info;
constantPoolHandle pool(thread, method(thread)->constants());
+ bool is_put = (bytecode == Bytecodes::_putfield || bytecode == Bytecodes::_putstatic);
bool is_static = (bytecode == Bytecodes::_getstatic || bytecode == Bytecodes::_putstatic);
{
@@ -528,8 +529,6 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecode
// exceptions at the correct place. If we do not resolve completely
// in the current pass, leaving the put_code set to zero will
// cause the next put instruction to reresolve.
- bool is_put = (bytecode == Bytecodes::_putfield ||
- bytecode == Bytecodes::_putstatic);
Bytecodes::Code put_code = (Bytecodes::Code)0;
// We also need to delay resolving getstatic instructions until the
@@ -541,7 +540,6 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecode
!klass->is_initialized());
Bytecodes::Code get_code = (Bytecodes::Code)0;
-
if (!uninitialized_static) {
get_code = ((is_static) ? Bytecodes::_getstatic : Bytecodes::_getfield);
if (is_put || !info.access_flags().is_final()) {
@@ -549,6 +547,23 @@ IRT_ENTRY(void, InterpreterRuntime::resolve_get_put(JavaThread* thread, Bytecode
}
}
+ if (is_put && !is_static && klass->is_subclass_of(SystemDictionary::CallSite_klass()) && (info.name() == vmSymbols::target_name())) {
+ const jint direction = frame::interpreter_frame_expression_stack_direction();
+ oop call_site = *((oop*) thread->last_frame().interpreter_frame_tos_at(-1 * direction));
+ oop method_handle = *((oop*) thread->last_frame().interpreter_frame_tos_at( 0 * direction));
+ assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "must be");
+ assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "must be");
+
+ {
+ // Walk all nmethods depending on this call site.
+ MutexLocker mu(Compile_lock, thread);
+ Universe::flush_dependents_on(call_site, method_handle);
+ }
+
+ // Don't allow fast path for setting CallSite.target and sub-classes.
+ put_code = (Bytecodes::Code) 0;
+ }
+
cache_entry(thread)->set_field(
get_code,
put_code,
@@ -969,11 +984,8 @@ ConstantPoolCacheEntry *cp_entry))
// check the access_flags for the field in the klass
instanceKlass* ik = instanceKlass::cast(java_lang_Class::as_klassOop(cp_entry->f1()));
- typeArrayOop fields = ik->fields();
int index = cp_entry->field_index();
- assert(index < fields->length(), "holders field index is out of range");
- // bail out if field accesses are not watched
- if ((fields->ushort_at(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return;
+ if ((ik->field_access_flags(index) & JVM_ACC_FIELD_ACCESS_WATCHED) == 0) return;
switch(cp_entry->flag_state()) {
case btos: // fall through
@@ -1006,11 +1018,9 @@ IRT_ENTRY(void, InterpreterRuntime::post_field_modification(JavaThread *thread,
// check the access_flags for the field in the klass
instanceKlass* ik = instanceKlass::cast(k);
- typeArrayOop fields = ik->fields();
int index = cp_entry->field_index();
- assert(index < fields->length(), "holders field index is out of range");
// bail out if field modifications are not watched
- if ((fields->ushort_at(index) & JVM_ACC_FIELD_MODIFICATION_WATCHED) == 0) return;
+ if ((ik->field_access_flags(index) & JVM_ACC_FIELD_MODIFICATION_WATCHED) == 0) return;
char sig_type = '\0';
@@ -1229,7 +1239,7 @@ IRT_ENTRY(void, InterpreterRuntime::prepare_native_call(JavaThread* thread, meth
// preparing the same method will be sure to see non-null entry & mirror.
IRT_END
-#if defined(IA32) || defined(AMD64)
+#if defined(IA32) || defined(AMD64) || defined(ARM)
IRT_LEAF(void, InterpreterRuntime::popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address))
if (src_address == dest_address) {
return;
diff --git a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
index 961abd5..93c1a9e 100644
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.hpp
@@ -41,6 +41,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// The InterpreterRuntime is called by the interpreter for everything
// that cannot/should not be dealt with in assembly and needs C support.
@@ -141,8 +144,8 @@ class InterpreterRuntime: AllStatic {
methodOopDesc* method,
intptr_t* from, intptr_t* to);
-#if defined(IA32) || defined(AMD64)
- // Popframe support (only needed on x86 and AMD64)
+#if defined(IA32) || defined(AMD64) || defined(ARM)
+ // Popframe support (only needed on x86, AMD64 and ARM)
static void popframe_move_outgoing_args(JavaThread* thread, void* src_address, void* dest_address);
#endif
diff --git a/hotspot/src/share/vm/interpreter/linkResolver.cpp b/hotspot/src/share/vm/interpreter/linkResolver.cpp
index 7b42fe3..b7defd7 100644
--- a/hotspot/src/share/vm/interpreter/linkResolver.cpp
+++ b/hotspot/src/share/vm/interpreter/linkResolver.cpp
@@ -52,6 +52,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
//------------------------------------------------------------------------------------------------------------------------
// Implementation of FieldAccessInfo
@@ -132,7 +135,7 @@ void CallInfo::set_common(KlassHandle resolved_klass, KlassHandle selected_klass
return;
}
CompileBroker::compile_method(selected_method, InvocationEntryBci,
- CompLevel_initial_compile,
+ CompilationPolicy::policy()->initial_compile_level(),
methodHandle(), 0, "must_be_compiled", CHECK);
}
}
diff --git a/hotspot/src/share/vm/interpreter/templateTable.hpp b/hotspot/src/share/vm/interpreter/templateTable.hpp
index f91ecc7..3b006ad 100644
--- a/hotspot/src/share/vm/interpreter/templateTable.hpp
+++ b/hotspot/src/share/vm/interpreter/templateTable.hpp
@@ -120,8 +120,8 @@ class TemplateTable: AllStatic {
// helpers
static void unimplemented_bc();
- static void patch_bytecode(Bytecodes::Code bc, Register scratch1,
- Register scratch2, bool load_bc_in_scratch = true);
+ static void patch_bytecode(Bytecodes::Code bc, Register bc_reg,
+ Register temp_reg, bool load_bc_into_bc_reg = true, int byte_no = -1);
// C calls
static void call_VM(Register oop_result, address entry_point);
diff --git a/hotspot/src/share/vm/memory/allocation.cpp b/hotspot/src/share/vm/memory/allocation.cpp
index 356e825..0479e73 100644
--- a/hotspot/src/share/vm/memory/allocation.cpp
+++ b/hotspot/src/share/vm/memory/allocation.cpp
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
void* CHeapObj::operator new(size_t size){
return (void *) AllocateHeap(size, "CHeapObj-new");
diff --git a/hotspot/src/share/vm/memory/allocation.hpp b/hotspot/src/share/vm/memory/allocation.hpp
index b923cd4..4c2f1e8 100644
--- a/hotspot/src/share/vm/memory/allocation.hpp
+++ b/hotspot/src/share/vm/memory/allocation.hpp
@@ -151,6 +151,8 @@ class AllStatic {
//------------------------------Chunk------------------------------------------
// Linked list of raw memory chunks
class Chunk: public CHeapObj {
+ friend class VMStructs;
+
protected:
Chunk* _next; // Next Chunk in list
const size_t _len; // Size of this Chunk
@@ -200,6 +202,8 @@ protected:
friend class ResourceMark;
friend class HandleMark;
friend class NoHandleMark;
+ friend class VMStructs;
+
Chunk *_first; // First chunk
Chunk *_chunk; // current chunk
char *_hwm, *_max; // High water mark and max in current chunk
diff --git a/hotspot/src/share/vm/memory/collectorPolicy.cpp b/hotspot/src/share/vm/memory/collectorPolicy.cpp
index 7a1a294..8412682 100644
--- a/hotspot/src/share/vm/memory/collectorPolicy.cpp
+++ b/hotspot/src/share/vm/memory/collectorPolicy.cpp
@@ -47,6 +47,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp"
diff --git a/hotspot/src/share/vm/memory/defNewGeneration.cpp b/hotspot/src/share/vm/memory/defNewGeneration.cpp
index c1a7051..5913b2c 100644
--- a/hotspot/src/share/vm/memory/defNewGeneration.cpp
+++ b/hotspot/src/share/vm/memory/defNewGeneration.cpp
@@ -48,6 +48,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
//
// DefNewGeneration functions.
diff --git a/hotspot/src/share/vm/memory/gcLocker.hpp b/hotspot/src/share/vm/memory/gcLocker.hpp
index 09135cb..c9d913a 100644
--- a/hotspot/src/share/vm/memory/gcLocker.hpp
+++ b/hotspot/src/share/vm/memory/gcLocker.hpp
@@ -41,6 +41,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
// The direct lock/unlock calls do not force a collection if an unlock
// decrements the count to zero. Avoid calling these if at all possible.
diff --git a/hotspot/src/share/vm/memory/genCollectedHeap.cpp b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
index c1acb8d..f233cbc 100644
--- a/hotspot/src/share/vm/memory/genCollectedHeap.cpp
+++ b/hotspot/src/share/vm/memory/genCollectedHeap.cpp
@@ -1269,10 +1269,6 @@ void GenCollectedHeap::verify(bool allow_dirty, bool silent, VerifyOption option
gclog_or_tty->print("remset ");
}
rem_set()->verify();
- if (!silent) {
- gclog_or_tty->print("ref_proc ");
- }
- ReferenceProcessor::verify();
}
void GenCollectedHeap::print() const { print_on(tty); }
diff --git a/hotspot/src/share/vm/memory/genMarkSweep.cpp b/hotspot/src/share/vm/memory/genMarkSweep.cpp
index 802c646..94a73dd 100644
--- a/hotspot/src/share/vm/memory/genMarkSweep.cpp
+++ b/hotspot/src/share/vm/memory/genMarkSweep.cpp
@@ -55,6 +55,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
void GenMarkSweep::invoke_at_safepoint(int level, ReferenceProcessor* rp,
bool clear_all_softrefs) {
diff --git a/hotspot/src/share/vm/memory/oopFactory.cpp b/hotspot/src/share/vm/memory/oopFactory.cpp
index 08f9825..c6e644c 100644
--- a/hotspot/src/share/vm/memory/oopFactory.cpp
+++ b/hotspot/src/share/vm/memory/oopFactory.cpp
@@ -77,7 +77,14 @@ typeArrayOop oopFactory::new_permanent_intArray(int length, TRAPS) {
typeArrayOop oopFactory::new_typeArray(BasicType type, int length, TRAPS) {
klassOop type_asKlassOop = Universe::typeArrayKlassObj(type);
typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop);
- typeArrayOop result = type_asArrayKlass->allocate(length, THREAD);
+ typeArrayOop result = type_asArrayKlass->allocate_common(length, true, THREAD);
+ return result;
+}
+
+typeArrayOop oopFactory::new_typeArray_nozero(BasicType type, int length, TRAPS) {
+ klassOop type_asKlassOop = Universe::typeArrayKlassObj(type);
+ typeArrayKlass* type_asArrayKlass = typeArrayKlass::cast(type_asKlassOop);
+ typeArrayOop result = type_asArrayKlass->allocate_common(length, false, THREAD);
return result;
}
diff --git a/hotspot/src/share/vm/memory/oopFactory.hpp b/hotspot/src/share/vm/memory/oopFactory.hpp
index 32e50fb..dbb42f0 100644
--- a/hotspot/src/share/vm/memory/oopFactory.hpp
+++ b/hotspot/src/share/vm/memory/oopFactory.hpp
@@ -63,6 +63,7 @@ class oopFactory: AllStatic {
static typeArrayOop new_permanent_intArray (int length, TRAPS); // used for class file structures
static typeArrayOop new_typeArray(BasicType type, int length, TRAPS);
+ static typeArrayOop new_typeArray_nozero(BasicType type, int length, TRAPS);
// Constant pools
static constantPoolOop new_constantPool (int length,
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.cpp b/hotspot/src/share/vm/memory/referenceProcessor.cpp
index 8a4da9a..9b593ef 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.cpp
+++ b/hotspot/src/share/vm/memory/referenceProcessor.cpp
@@ -35,15 +35,15 @@
ReferencePolicy* ReferenceProcessor::_always_clear_soft_ref_policy = NULL;
ReferencePolicy* ReferenceProcessor::_default_soft_ref_policy = NULL;
-oop ReferenceProcessor::_sentinelRef = NULL;
const int subclasses_of_ref = REF_PHANTOM - REF_OTHER;
+bool ReferenceProcessor::_pending_list_uses_discovered_field = false;
// List of discovered references.
class DiscoveredList {
public:
DiscoveredList() : _len(0), _compressed_head(0), _oop_head(NULL) { }
oop head() const {
- return UseCompressedOops ? oopDesc::decode_heap_oop_not_null(_compressed_head) :
+ return UseCompressedOops ? oopDesc::decode_heap_oop(_compressed_head) :
_oop_head;
}
HeapWord* adr_head() {
@@ -53,12 +53,12 @@ public:
void set_head(oop o) {
if (UseCompressedOops) {
// Must compress the head ptr.
- _compressed_head = oopDesc::encode_heap_oop_not_null(o);
+ _compressed_head = oopDesc::encode_heap_oop(o);
} else {
_oop_head = o;
}
}
- bool empty() const { return head() == ReferenceProcessor::sentinel_ref(); }
+ bool empty() const { return head() == NULL; }
size_t length() { return _len; }
void set_length(size_t len) { _len = len; }
void inc_length(size_t inc) { _len += inc; assert(_len > 0, "Error"); }
@@ -76,21 +76,9 @@ void referenceProcessor_init() {
}
void ReferenceProcessor::init_statics() {
- assert(_sentinelRef == NULL, "should be initialized precisely once");
- EXCEPTION_MARK;
- _sentinelRef = instanceKlass::cast(
- SystemDictionary::Reference_klass())->
- allocate_permanent_instance(THREAD);
-
// Initialize the master soft ref clock.
java_lang_ref_SoftReference::set_clock(os::javaTimeMillis());
- if (HAS_PENDING_EXCEPTION) {
- Handle ex(THREAD, PENDING_EXCEPTION);
- vm_exit_during_initialization(ex);
- }
- assert(_sentinelRef != NULL && _sentinelRef->is_oop(),
- "Just constructed it!");
_always_clear_soft_ref_policy = new AlwaysClearPolicy();
_default_soft_ref_policy = new COMPILER2_PRESENT(LRUMaxHeapPolicy())
NOT_COMPILER2(LRUCurrentHeapPolicy());
@@ -100,6 +88,7 @@ void ReferenceProcessor::init_statics() {
guarantee(RefDiscoveryPolicy == ReferenceBasedDiscovery ||
RefDiscoveryPolicy == ReferentBasedDiscovery,
"Unrecongnized RefDiscoveryPolicy");
+ _pending_list_uses_discovered_field = JDK_Version::current().pending_list_uses_discovered_field();
}
ReferenceProcessor::ReferenceProcessor(MemRegion span,
@@ -130,13 +119,12 @@ ReferenceProcessor::ReferenceProcessor(MemRegion span,
_discoveredWeakRefs = &_discoveredSoftRefs[_max_num_q];
_discoveredFinalRefs = &_discoveredWeakRefs[_max_num_q];
_discoveredPhantomRefs = &_discoveredFinalRefs[_max_num_q];
- assert(sentinel_ref() != NULL, "_sentinelRef is NULL");
- // Initialized all entries to _sentinelRef
+ // Initialized all entries to NULL
for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
- _discoveredSoftRefs[i].set_head(sentinel_ref());
+ _discoveredSoftRefs[i].set_head(NULL);
_discoveredSoftRefs[i].set_length(0);
}
- // If we do barreirs, cache a copy of the barrier set.
+ // If we do barriers, cache a copy of the barrier set.
if (discovered_list_needs_barrier) {
_bs = Universe::heap()->barrier_set();
}
@@ -167,10 +155,6 @@ void ReferenceProcessor::weak_oops_do(OopClosure* f) {
}
}
-void ReferenceProcessor::oops_do(OopClosure* f) {
- f->do_oop(adr_sentinel_ref());
-}
-
void ReferenceProcessor::update_soft_ref_master_clock() {
// Update (advance) the soft ref master clock field. This must be done
// after processing the soft ref list.
@@ -283,8 +267,6 @@ void ReferenceProcessor::process_phaseJNI(BoolObjectClosure* is_alive,
}
#endif
JNIHandles::weak_oops_do(is_alive, keep_alive);
- // Finally remember to keep sentinel around
- keep_alive->do_oop(adr_sentinel_ref());
complete_gc->do_void();
}
@@ -327,46 +309,77 @@ bool ReferenceProcessor::enqueue_discovered_references(AbstractRefProcTaskExecut
void ReferenceProcessor::enqueue_discovered_reflist(DiscoveredList& refs_list,
HeapWord* pending_list_addr) {
// Given a list of refs linked through the "discovered" field
- // (java.lang.ref.Reference.discovered) chain them through the
- // "next" field (java.lang.ref.Reference.next) and prepend
- // to the pending list.
+ // (java.lang.ref.Reference.discovered), self-loop their "next" field
+ // thus distinguishing them from active References, then
+ // prepend them to the pending list.
+ // BKWRD COMPATIBILITY NOTE: For older JDKs (prior to the fix for 4956777),
+ // the "next" field is used to chain the pending list, not the discovered
+ // field.
+
if (TraceReferenceGC && PrintGCDetails) {
gclog_or_tty->print_cr("ReferenceProcessor::enqueue_discovered_reflist list "
INTPTR_FORMAT, (address)refs_list.head());
}
- oop obj = refs_list.head();
- // Walk down the list, copying the discovered field into
- // the next field and clearing it (except for the last
- // non-sentinel object which is treated specially to avoid
- // confusion with an active reference).
- while (obj != sentinel_ref()) {
- assert(obj->is_instanceRef(), "should be reference object");
- oop next = java_lang_ref_Reference::discovered(obj);
- if (TraceReferenceGC && PrintGCDetails) {
- gclog_or_tty->print_cr(" obj " INTPTR_FORMAT "/next " INTPTR_FORMAT,
- obj, next);
+
+ oop obj = NULL;
+ oop next_d = refs_list.head();
+ if (pending_list_uses_discovered_field()) { // New behaviour
+ // Walk down the list, self-looping the next field
+ // so that the References are not considered active.
+ while (obj != next_d) {
+ obj = next_d;
+ assert(obj->is_instanceRef(), "should be reference object");
+ next_d = java_lang_ref_Reference::discovered(obj);
+ if (TraceReferenceGC && PrintGCDetails) {
+ gclog_or_tty->print_cr(" obj " INTPTR_FORMAT "/next_d " INTPTR_FORMAT,
+ obj, next_d);
+ }
+ assert(java_lang_ref_Reference::next(obj) == NULL,
+ "Reference not active; should not be discovered");
+ // Self-loop next, so as to make Ref not active.
+ java_lang_ref_Reference::set_next(obj, obj);
+ if (next_d == obj) { // obj is last
+ // Swap refs_list into pendling_list_addr and
+ // set obj's discovered to what we read from pending_list_addr.
+ oop old = oopDesc::atomic_exchange_oop(refs_list.head(), pending_list_addr);
+ // Need oop_check on pending_list_addr above;
+ // see special oop-check code at the end of
+ // enqueue_discovered_reflists() further below.
+ java_lang_ref_Reference::set_discovered(obj, old); // old may be NULL
+ }
}
- assert(java_lang_ref_Reference::next(obj) == NULL,
- "The reference should not be enqueued");
- if (next == sentinel_ref()) { // obj is last
- // Swap refs_list into pendling_list_addr and
- // set obj's next to what we read from pending_list_addr.
- oop old = oopDesc::atomic_exchange_oop(refs_list.head(), pending_list_addr);
- // Need oop_check on pending_list_addr above;
- // see special oop-check code at the end of
- // enqueue_discovered_reflists() further below.
- if (old == NULL) {
- // obj should be made to point to itself, since
- // pending list was empty.
- java_lang_ref_Reference::set_next(obj, obj);
+ } else { // Old behaviour
+ // Walk down the list, copying the discovered field into
+ // the next field and clearing the discovered field.
+ while (obj != next_d) {
+ obj = next_d;
+ assert(obj->is_instanceRef(), "should be reference object");
+ next_d = java_lang_ref_Reference::discovered(obj);
+ if (TraceReferenceGC && PrintGCDetails) {
+ gclog_or_tty->print_cr(" obj " INTPTR_FORMAT "/next_d " INTPTR_FORMAT,
+ obj, next_d);
+ }
+ assert(java_lang_ref_Reference::next(obj) == NULL,
+ "The reference should not be enqueued");
+ if (next_d == obj) { // obj is last
+ // Swap refs_list into pendling_list_addr and
+ // set obj's next to what we read from pending_list_addr.
+ oop old = oopDesc::atomic_exchange_oop(refs_list.head(), pending_list_addr);
+ // Need oop_check on pending_list_addr above;
+ // see special oop-check code at the end of
+ // enqueue_discovered_reflists() further below.
+ if (old == NULL) {
+ // obj should be made to point to itself, since
+ // pending list was empty.
+ java_lang_ref_Reference::set_next(obj, obj);
+ } else {
+ java_lang_ref_Reference::set_next(obj, old);
+ }
} else {
- java_lang_ref_Reference::set_next(obj, old);
+ java_lang_ref_Reference::set_next(obj, next_d);
}
- } else {
- java_lang_ref_Reference::set_next(obj, next);
+ java_lang_ref_Reference::set_discovered(obj, (oop) NULL);
}
- java_lang_ref_Reference::set_discovered(obj, (oop) NULL);
- obj = next;
}
}
@@ -376,10 +389,9 @@ public:
RefProcEnqueueTask(ReferenceProcessor& ref_processor,
DiscoveredList discovered_refs[],
HeapWord* pending_list_addr,
- oop sentinel_ref,
int n_queues)
: EnqueueTask(ref_processor, discovered_refs,
- pending_list_addr, sentinel_ref, n_queues)
+ pending_list_addr, n_queues)
{ }
virtual void work(unsigned int work_id) {
@@ -396,7 +408,7 @@ public:
j++, index += _n_queues) {
_ref_processor.enqueue_discovered_reflist(
_refs_lists[index], _pending_list_addr);
- _refs_lists[index].set_head(_sentinel_ref);
+ _refs_lists[index].set_head(NULL);
_refs_lists[index].set_length(0);
}
}
@@ -408,13 +420,13 @@ void ReferenceProcessor::enqueue_discovered_reflists(HeapWord* pending_list_addr
if (_processing_is_mt && task_executor != NULL) {
// Parallel code
RefProcEnqueueTask tsk(*this, _discoveredSoftRefs,
- pending_list_addr, sentinel_ref(), _max_num_q);
+ pending_list_addr, _max_num_q);
task_executor->execute(tsk);
} else {
// Serial code: call the parent class's implementation
for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
enqueue_discovered_reflist(_discoveredSoftRefs[i], pending_list_addr);
- _discoveredSoftRefs[i].set_head(sentinel_ref());
+ _discoveredSoftRefs[i].set_head(NULL);
_discoveredSoftRefs[i].set_length(0);
}
}
@@ -428,7 +440,7 @@ public:
BoolObjectClosure* is_alive);
// End Of List.
- inline bool has_next() const { return _next != ReferenceProcessor::sentinel_ref(); }
+ inline bool has_next() const { return _ref != NULL; }
// Get oop to the Reference object.
inline oop obj() const { return _ref; }
@@ -468,9 +480,13 @@ public:
inline void update_discovered() {
// First _prev_next ref actually points into DiscoveredList (gross).
if (UseCompressedOops) {
- _keep_alive->do_oop((narrowOop*)_prev_next);
+ if (!oopDesc::is_null(*(narrowOop*)_prev_next)) {
+ _keep_alive->do_oop((narrowOop*)_prev_next);
+ }
} else {
- _keep_alive->do_oop((oop*)_prev_next);
+ if (!oopDesc::is_null(*(oop*)_prev_next)) {
+ _keep_alive->do_oop((oop*)_prev_next);
+ }
}
}
@@ -488,6 +504,7 @@ public:
private:
DiscoveredList& _refs_list;
HeapWord* _prev_next;
+ oop _prev;
oop _ref;
HeapWord* _discovered_addr;
oop _next;
@@ -509,6 +526,7 @@ inline DiscoveredListIterator::DiscoveredListIterator(DiscoveredList& refs_li
BoolObjectClosure* is_alive)
: _refs_list(refs_list),
_prev_next(refs_list.adr_head()),
+ _prev(NULL),
_ref(refs_list.head()),
#ifdef ASSERT
_first_seen(refs_list.head()),
@@ -517,7 +535,7 @@ inline DiscoveredListIterator::DiscoveredListIterator(DiscoveredList& refs_li
_processed(0),
_removed(0),
#endif
- _next(refs_list.head()),
+ _next(NULL),
_keep_alive(keep_alive),
_is_alive(is_alive)
{ }
@@ -544,26 +562,43 @@ inline void DiscoveredListIterator::load_ptrs(DEBUG_ONLY(bool allow_null_referen
inline void DiscoveredListIterator::next() {
_prev_next = _discovered_addr;
+ _prev = _ref;
move_to_next();
}
inline void DiscoveredListIterator::remove() {
assert(_ref->is_oop(), "Dropping a bad reference");
oop_store_raw(_discovered_addr, NULL);
+
// First _prev_next ref actually points into DiscoveredList (gross).
+ oop new_next;
+ if (_next == _ref) {
+ // At the end of the list, we should make _prev point to itself.
+ // If _ref is the first ref, then _prev_next will be in the DiscoveredList,
+ // and _prev will be NULL.
+ new_next = _prev;
+ } else {
+ new_next = _next;
+ }
+
if (UseCompressedOops) {
// Remove Reference object from list.
- oopDesc::encode_store_heap_oop_not_null((narrowOop*)_prev_next, _next);
+ oopDesc::encode_store_heap_oop((narrowOop*)_prev_next, new_next);
} else {
// Remove Reference object from list.
- oopDesc::store_heap_oop((oop*)_prev_next, _next);
+ oopDesc::store_heap_oop((oop*)_prev_next, new_next);
}
NOT_PRODUCT(_removed++);
_refs_list.dec_length(1);
}
inline void DiscoveredListIterator::move_to_next() {
- _ref = _next;
+ if (_ref == _next) {
+ // End of the list.
+ _ref = NULL;
+ } else {
+ _ref = _next;
+ }
assert(_ref != _first_seen, "cyclic ref_list found");
NOT_PRODUCT(_processed++);
}
@@ -613,7 +648,7 @@ ReferenceProcessor::process_phase1(DiscoveredList& refs_list,
NOT_PRODUCT(
if (PrintGCDetails && TraceReferenceGC) {
gclog_or_tty->print_cr(" Dropped %d dead Refs out of %d "
- "discovered Refs by policy list " INTPTR_FORMAT,
+ "discovered Refs by policy, from list " INTPTR_FORMAT,
iter.removed(), iter.processed(), (address)refs_list.head());
}
)
@@ -725,24 +760,30 @@ ReferenceProcessor::process_phase3(DiscoveredList& refs_list,
assert(iter.obj()->is_oop(UseConcMarkSweepGC), "Adding a bad reference");
iter.next();
}
- // Remember to keep sentinel pointer around
+ // Remember to update the next pointer of the last ref.
iter.update_discovered();
// Close the reachable set
complete_gc->do_void();
}
void
-ReferenceProcessor::abandon_partial_discovered_list(DiscoveredList& refs_list) {
- oop obj = refs_list.head();
- while (obj != sentinel_ref()) {
- oop discovered = java_lang_ref_Reference::discovered(obj);
+ReferenceProcessor::clear_discovered_references(DiscoveredList& refs_list) {
+ oop obj = NULL;
+ oop next = refs_list.head();
+ while (next != obj) {
+ obj = next;
+ next = java_lang_ref_Reference::discovered(obj);
java_lang_ref_Reference::set_discovered_raw(obj, NULL);
- obj = discovered;
}
- refs_list.set_head(sentinel_ref());
+ refs_list.set_head(NULL);
refs_list.set_length(0);
}
+void
+ReferenceProcessor::abandon_partial_discovered_list(DiscoveredList& refs_list) {
+ clear_discovered_references(refs_list);
+}
+
void ReferenceProcessor::abandon_partial_discovery() {
// loop over the lists
for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
@@ -859,6 +900,9 @@ void ReferenceProcessor::balance_queues(DiscoveredList ref_lists[])
refs_to_move = MIN2(ref_lists[from_idx].length() - avg_refs,
avg_refs - ref_lists[to_idx].length());
}
+
+ assert(refs_to_move > 0, "otherwise the code below will fail");
+
oop move_head = ref_lists[from_idx].head();
oop move_tail = move_head;
oop new_head = move_head;
@@ -867,10 +911,24 @@ void ReferenceProcessor::balance_queues(DiscoveredList ref_lists[])
move_tail = new_head;
new_head = java_lang_ref_Reference::discovered(new_head);
}
- java_lang_ref_Reference::set_discovered(move_tail, ref_lists[to_idx].head());
+
+ // Add the chain to the to list.
+ if (ref_lists[to_idx].head() == NULL) {
+ // to list is empty. Make a loop at the end.
+ java_lang_ref_Reference::set_discovered(move_tail, move_tail);
+ } else {
+ java_lang_ref_Reference::set_discovered(move_tail, ref_lists[to_idx].head());
+ }
ref_lists[to_idx].set_head(move_head);
ref_lists[to_idx].inc_length(refs_to_move);
- ref_lists[from_idx].set_head(new_head);
+
+ // Remove the chain from the from list.
+ if (move_tail == new_head) {
+ // We found the end of the from list.
+ ref_lists[from_idx].set_head(NULL);
+ } else {
+ ref_lists[from_idx].set_head(new_head);
+ }
ref_lists[from_idx].dec_length(refs_to_move);
if (ref_lists[from_idx].length() == 0) {
break;
@@ -1082,42 +1140,40 @@ ReferenceProcessor::add_to_discovered_list_mt(DiscoveredList& refs_list,
// First we must make sure this object is only enqueued once. CAS in a non null
// discovered_addr.
oop current_head = refs_list.head();
+ // The last ref must have its discovered field pointing to itself.
+ oop next_discovered = (current_head != NULL) ? current_head : obj;
// Note: In the case of G1, this specific pre-barrier is strictly
// not necessary because the only case we are interested in
// here is when *discovered_addr is NULL (see the CAS further below),
// so this will expand to nothing. As a result, we have manually
// elided this out for G1, but left in the test for some future
- // collector that might have need for a pre-barrier here.
- if (_discovered_list_needs_barrier && !UseG1GC) {
- if (UseCompressedOops) {
- _bs->write_ref_field_pre((narrowOop*)discovered_addr, current_head);
- } else {
- _bs->write_ref_field_pre((oop*)discovered_addr, current_head);
- }
- guarantee(false, "Need to check non-G1 collector");
- }
- oop retest = oopDesc::atomic_compare_exchange_oop(current_head, discovered_addr,
+ // collector that might have need for a pre-barrier here, e.g.:-
+ // _bs->write_ref_field_pre((oop* or narrowOop*)discovered_addr, next_discovered);
+ assert(!_discovered_list_needs_barrier || UseG1GC,
+ "Need to check non-G1 collector: "
+ "may need a pre-write-barrier for CAS from NULL below");
+ oop retest = oopDesc::atomic_compare_exchange_oop(next_discovered, discovered_addr,
NULL);
if (retest == NULL) {
// This thread just won the right to enqueue the object.
- // We have separate lists for enqueueing so no synchronization
+ // We have separate lists for enqueueing, so no synchronization
// is necessary.
refs_list.set_head(obj);
refs_list.inc_length(1);
if (_discovered_list_needs_barrier) {
- _bs->write_ref_field((void*)discovered_addr, current_head);
+ _bs->write_ref_field((void*)discovered_addr, next_discovered);
}
if (TraceReferenceGC) {
- gclog_or_tty->print_cr("Enqueued reference (mt) (" INTPTR_FORMAT ": %s)",
+ gclog_or_tty->print_cr("Discovered reference (mt) (" INTPTR_FORMAT ": %s)",
obj, obj->blueprint()->internal_name());
}
} else {
// If retest was non NULL, another thread beat us to it:
// The reference has already been discovered...
if (TraceReferenceGC) {
- gclog_or_tty->print_cr("Already enqueued reference (" INTPTR_FORMAT ": %s)",
+ gclog_or_tty->print_cr("Already discovered reference (" INTPTR_FORMAT ": %s)",
obj, obj->blueprint()->internal_name());
}
}
@@ -1142,7 +1198,7 @@ void ReferenceProcessor::verify_referent(oop obj) {
// (or part of the heap being collected, indicated by our "span"
// we don't treat it specially (i.e. we scan it as we would
// a normal oop, treating its references as strong references).
-// This means that references can't be enqueued unless their
+// This means that references can't be discovered unless their
// referent is also in the same span. This is the simplest,
// most "local" and most conservative approach, albeit one
// that may cause weak references to be enqueued least promptly.
@@ -1164,14 +1220,13 @@ void ReferenceProcessor::verify_referent(oop obj) {
// and complexity in processing these references.
// We call this choice the "RefeferentBasedDiscovery" policy.
bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
- // We enqueue references only if we are discovering refs
- // (rather than processing discovered refs).
+ // Make sure we are discovering refs (rather than processing discovered refs).
if (!_discovering_refs || !RegisterReferences) {
return false;
}
- // We only enqueue active references.
+ // We only discover active references.
oop next = java_lang_ref_Reference::next(obj);
- if (next != NULL) {
+ if (next != NULL) { // Ref is no longer active
return false;
}
@@ -1184,8 +1239,8 @@ bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
return false;
}
- // We only enqueue references whose referents are not (yet) strongly
- // reachable.
+ // We only discover references whose referents are not (yet)
+ // known to be strongly reachable.
if (is_alive_non_header() != NULL) {
verify_referent(obj);
if (is_alive_non_header()->do_object_b(java_lang_ref_Reference::referent(obj))) {
@@ -1211,7 +1266,7 @@ bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
if (discovered != NULL) {
// The reference has already been discovered...
if (TraceReferenceGC) {
- gclog_or_tty->print_cr("Already enqueued reference (" INTPTR_FORMAT ": %s)",
+ gclog_or_tty->print_cr("Already discovered reference (" INTPTR_FORMAT ": %s)",
obj, obj->blueprint()->internal_name());
}
if (RefDiscoveryPolicy == ReferentBasedDiscovery) {
@@ -1233,9 +1288,9 @@ bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
if (RefDiscoveryPolicy == ReferentBasedDiscovery) {
verify_referent(obj);
- // enqueue if and only if either:
- // reference is in our span or
- // we are an atomic collector and referent is in our span
+ // Discover if and only if EITHER:
+ // .. reference is in our span, OR
+ // .. we are an atomic collector and referent is in our span
if (_span.contains(obj_addr) ||
(discovery_is_atomic() &&
_span.contains(java_lang_ref_Reference::referent(obj)))) {
@@ -1262,30 +1317,28 @@ bool ReferenceProcessor::discover_reference(oop obj, ReferenceType rt) {
// here: the field will be visited later when processing the discovered
// references.
oop current_head = list->head();
+ // The last ref must have its discovered field pointing to itself.
+ oop next_discovered = (current_head != NULL) ? current_head : obj;
+
// As in the case further above, since we are over-writing a NULL
// pre-value, we can safely elide the pre-barrier here for the case of G1.
+ // e.g.:- _bs->write_ref_field_pre((oop* or narrowOop*)discovered_addr, next_discovered);
assert(discovered == NULL, "control point invariant");
- if (_discovered_list_needs_barrier && !UseG1GC) { // safe to elide for G1
- if (UseCompressedOops) {
- _bs->write_ref_field_pre((narrowOop*)discovered_addr, current_head);
- } else {
- _bs->write_ref_field_pre((oop*)discovered_addr, current_head);
- }
- guarantee(false, "Need to check non-G1 collector");
- }
- oop_store_raw(discovered_addr, current_head);
+ assert(!_discovered_list_needs_barrier || UseG1GC,
+ "For non-G1 collector, may need a pre-write-barrier for CAS from NULL below");
+ oop_store_raw(discovered_addr, next_discovered);
if (_discovered_list_needs_barrier) {
- _bs->write_ref_field((void*)discovered_addr, current_head);
+ _bs->write_ref_field((void*)discovered_addr, next_discovered);
}
list->set_head(obj);
list->inc_length(1);
if (TraceReferenceGC) {
- gclog_or_tty->print_cr("Enqueued reference (" INTPTR_FORMAT ": %s)",
+ gclog_or_tty->print_cr("Discovered reference (" INTPTR_FORMAT ": %s)",
obj, obj->blueprint()->internal_name());
}
}
- assert(obj->is_oop(), "Enqueued a bad reference");
+ assert(obj->is_oop(), "Discovered a bad reference");
verify_referent(obj);
return true;
}
@@ -1437,22 +1490,12 @@ void ReferenceProcessor::verify_ok_to_handle_reflists() {
}
#endif
-void ReferenceProcessor::verify() {
- guarantee(sentinel_ref() != NULL && sentinel_ref()->is_oop(), "Lost _sentinelRef");
-}
-
#ifndef PRODUCT
void ReferenceProcessor::clear_discovered_references() {
guarantee(!_discovering_refs, "Discovering refs?");
for (int i = 0; i < _max_num_q * subclasses_of_ref; i++) {
- oop obj = _discoveredSoftRefs[i].head();
- while (obj != sentinel_ref()) {
- oop next = java_lang_ref_Reference::discovered(obj);
- java_lang_ref_Reference::set_discovered(obj, (oop) NULL);
- obj = next;
- }
- _discoveredSoftRefs[i].set_head(sentinel_ref());
- _discoveredSoftRefs[i].set_length(0);
+ clear_discovered_references(_discoveredSoftRefs[i]);
}
}
+
#endif // PRODUCT
diff --git a/hotspot/src/share/vm/memory/referenceProcessor.hpp b/hotspot/src/share/vm/memory/referenceProcessor.hpp
index fceb4c4..8178f60 100644
--- a/hotspot/src/share/vm/memory/referenceProcessor.hpp
+++ b/hotspot/src/share/vm/memory/referenceProcessor.hpp
@@ -52,8 +52,8 @@ class DiscoveredList;
class ReferenceProcessor : public CHeapObj {
protected:
- // End of list marker
- static oop _sentinelRef;
+ // Compatibility with pre-4965777 JDK's
+ static bool _pending_list_uses_discovered_field;
MemRegion _span; // (right-open) interval of heap
// subject to wkref discovery
bool _discovering_refs; // true when discovery enabled
@@ -106,8 +106,6 @@ class ReferenceProcessor : public CHeapObj {
int max_num_q() { return _max_num_q; }
void set_active_mt_degree(int v) { _num_q = v; }
DiscoveredList* discovered_soft_refs() { return _discoveredSoftRefs; }
- static oop sentinel_ref() { return _sentinelRef; }
- static oop* adr_sentinel_ref() { return &_sentinelRef; }
ReferencePolicy* setup_policy(bool always_clear) {
_current_soft_ref_policy = always_clear ?
_always_clear_soft_ref_policy : _default_soft_ref_policy;
@@ -115,7 +113,6 @@ class ReferenceProcessor : public CHeapObj {
return _current_soft_ref_policy;
}
- public:
// Process references with a certain reachability level.
void process_discovered_reflist(DiscoveredList refs_lists[],
ReferencePolicy* policy,
@@ -230,6 +227,7 @@ class ReferenceProcessor : public CHeapObj {
HeapWord* discovered_addr);
void verify_ok_to_handle_reflists() PRODUCT_RETURN;
+ void clear_discovered_references(DiscoveredList& refs_list);
void abandon_partial_discovered_list(DiscoveredList& refs_list);
// Calculate the number of jni handles.
@@ -300,6 +298,13 @@ class ReferenceProcessor : public CHeapObj {
bool discovery_is_atomic() const { return _discovery_is_atomic; }
void set_atomic_discovery(bool atomic) { _discovery_is_atomic = atomic; }
+ // whether the JDK in which we are embedded is a pre-4965777 JDK,
+ // and thus whether or not it uses the discovered field to chain
+ // the entries in the pending list.
+ static bool pending_list_uses_discovered_field() {
+ return _pending_list_uses_discovered_field;
+ }
+
// whether discovery is done by multiple threads same-old-timeously
bool discovery_is_mt() const { return _discovery_is_mt; }
void set_mt_discovery(bool mt) { _discovery_is_mt = mt; }
@@ -314,7 +319,6 @@ class ReferenceProcessor : public CHeapObj {
// iterate over oops
void weak_oops_do(OopClosure* f); // weak roots
- static void oops_do(OopClosure* f); // strong root(s)
// Balance each of the discovered lists.
void balance_all_queues();
@@ -340,7 +344,6 @@ class ReferenceProcessor : public CHeapObj {
// debugging
void verify_no_references_recorded() PRODUCT_RETURN;
void verify_referent(oop obj) PRODUCT_RETURN;
- static void verify();
// clear the discovered lists (unlinking each entry).
void clear_discovered_references() PRODUCT_RETURN;
@@ -524,12 +527,10 @@ protected:
EnqueueTask(ReferenceProcessor& ref_processor,
DiscoveredList refs_lists[],
HeapWord* pending_list_addr,
- oop sentinel_ref,
int n_queues)
: _ref_processor(ref_processor),
_refs_lists(refs_lists),
_pending_list_addr(pending_list_addr),
- _sentinel_ref(sentinel_ref),
_n_queues(n_queues)
{ }
@@ -540,7 +541,6 @@ protected:
ReferenceProcessor& _ref_processor;
DiscoveredList* _refs_lists;
HeapWord* _pending_list_addr;
- oop _sentinel_ref;
int _n_queues;
};
diff --git a/hotspot/src/share/vm/memory/resourceArea.cpp b/hotspot/src/share/vm/memory/resourceArea.cpp
index 90c1e6e..28d5943 100644
--- a/hotspot/src/share/vm/memory/resourceArea.cpp
+++ b/hotspot/src/share/vm/memory/resourceArea.cpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
//------------------------------ResourceMark-----------------------------------
debug_only(int ResourceArea::_warned;) // to suppress multiple warnings
diff --git a/hotspot/src/share/vm/memory/resourceArea.hpp b/hotspot/src/share/vm/memory/resourceArea.hpp
index 728a12f..3d31248 100644
--- a/hotspot/src/share/vm/memory/resourceArea.hpp
+++ b/hotspot/src/share/vm/memory/resourceArea.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// The resource area holds temporary data structures in the VM.
// The actual allocation areas are thread local. Typical usage:
@@ -52,6 +55,7 @@
class ResourceArea: public Arena {
friend class ResourceMark;
friend class DeoptResourceMark;
+ friend class VMStructs;
debug_only(int _nesting;) // current # of nested ResourceMarks
debug_only(static int _warned;) // to suppress multiple warnings
diff --git a/hotspot/src/share/vm/memory/sharedHeap.cpp b/hotspot/src/share/vm/memory/sharedHeap.cpp
index e386e72..15d8eaa 100644
--- a/hotspot/src/share/vm/memory/sharedHeap.cpp
+++ b/hotspot/src/share/vm/memory/sharedHeap.cpp
@@ -146,7 +146,6 @@ void SharedHeap::process_strong_roots(bool activate_scope,
assert(_strong_roots_parity != 0, "must have called prologue code");
if (!_process_strong_tasks->is_task_claimed(SH_PS_Universe_oops_do)) {
Universe::oops_do(roots);
- ReferenceProcessor::oops_do(roots);
// Consider perm-gen discovered lists to be strong.
perm_gen()->ref_processor()->weak_oops_do(roots);
}
diff --git a/hotspot/src/share/vm/memory/space.hpp b/hotspot/src/share/vm/memory/space.hpp
index 3693b64..ef7e231 100644
--- a/hotspot/src/share/vm/memory/space.hpp
+++ b/hotspot/src/share/vm/memory/space.hpp
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// A space is an abstraction for the "storage units" backing
// up the generation abstraction. It includes specific
diff --git a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
index 74f2c44..03d6e6b 100644
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
+++ b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Thread-Local Edens support
diff --git a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp
index 4b88835..1b8bb0a 100644
--- a/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp
+++ b/hotspot/src/share/vm/memory/threadLocalAllocBuffer.hpp
@@ -124,16 +124,7 @@ public:
// Reserve space at the end of TLAB
static size_t end_reserve() {
int reserve_size = typeArrayOopDesc::header_size(T_INT);
- if (AllocatePrefetchStyle == 3) {
- // BIS is used to prefetch - we need a space for it.
- // +1 for rounding up to next cache line +1 to be safe
- int lines = AllocatePrefetchLines + 2;
- int step_size = AllocatePrefetchStepSize;
- int distance = AllocatePrefetchDistance;
- int prefetch_end = (distance + step_size*lines)/(int)HeapWordSize;
- reserve_size = MAX2(reserve_size, prefetch_end);
- }
- return reserve_size;
+ return MAX2(reserve_size, VM_Version::reserve_for_allocation_prefetch());
}
static size_t alignment_reserve() { return align_object_size(end_reserve()); }
static size_t alignment_reserve_in_bytes() { return alignment_reserve() * HeapWordSize; }
diff --git a/hotspot/src/share/vm/memory/universe.cpp b/hotspot/src/share/vm/memory/universe.cpp
index ff14097..4652b40 100644
--- a/hotspot/src/share/vm/memory/universe.cpp
+++ b/hotspot/src/share/vm/memory/universe.cpp
@@ -89,6 +89,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
#include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
@@ -1177,7 +1180,7 @@ void Universe::flush_dependents_on(instanceKlassHandle dependee) {
// stopped dring the safepoint so CodeCache will be safe to update without
// holding the CodeCache_lock.
- DepChange changes(dependee);
+ KlassDepChange changes(dependee);
// Compute the dependent nmethods
if (CodeCache::mark_for_deoptimization(changes) > 0) {
@@ -1187,6 +1190,37 @@ void Universe::flush_dependents_on(instanceKlassHandle dependee) {
}
}
+// Flushes compiled methods dependent on a particular CallSite
+// instance when its target is different than the given MethodHandle.
+void Universe::flush_dependents_on(Handle call_site, Handle method_handle) {
+ assert_lock_strong(Compile_lock);
+
+ if (CodeCache::number_of_nmethods_with_dependencies() == 0) return;
+
+ // CodeCache can only be updated by a thread_in_VM and they will all be
+ // stopped dring the safepoint so CodeCache will be safe to update without
+ // holding the CodeCache_lock.
+
+ CallSiteDepChange changes(call_site(), method_handle());
+
+ // Compute the dependent nmethods that have a reference to a
+ // CallSite object. We use instanceKlass::mark_dependent_nmethod
+ // directly instead of CodeCache::mark_for_deoptimization because we
+ // want dependents on the call site class only not all classes in
+ // the ContextStream.
+ int marked = 0;
+ {
+ MutexLockerEx mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
+ instanceKlass* call_site_klass = instanceKlass::cast(call_site->klass());
+ marked = call_site_klass->mark_dependent_nmethods(changes);
+ }
+ if (marked > 0) {
+ // At least one nmethod has been marked for deoptimization
+ VM_Deoptimize op;
+ VMThread::execute(&op);
+ }
+}
+
#ifdef HOTSWAP
// Flushes compiled methods dependent on dependee in the evolutionary sense
void Universe::flush_evol_dependents_on(instanceKlassHandle ev_k_h) {
diff --git a/hotspot/src/share/vm/memory/universe.hpp b/hotspot/src/share/vm/memory/universe.hpp
index 04f289a..0f90ff5 100644
--- a/hotspot/src/share/vm/memory/universe.hpp
+++ b/hotspot/src/share/vm/memory/universe.hpp
@@ -439,6 +439,7 @@ class Universe: AllStatic {
// Flushing and deoptimization
static void flush_dependents_on(instanceKlassHandle dependee);
+ static void flush_dependents_on(Handle call_site, Handle method_handle);
#ifdef HOTSWAP
// Flushing and deoptimization in case of evolution
static void flush_evol_dependents_on(instanceKlassHandle dependee);
diff --git a/hotspot/src/share/vm/oops/constMethodKlass.cpp b/hotspot/src/share/vm/oops/constMethodKlass.cpp
index 6e06531..509b411 100644
--- a/hotspot/src/share/vm/oops/constMethodKlass.cpp
+++ b/hotspot/src/share/vm/oops/constMethodKlass.cpp
@@ -172,11 +172,6 @@ void constMethodKlass::oop_push_contents(PSPromotionManager* pm, oop obj) {
int constMethodKlass::oop_update_pointers(ParCompactionManager* cm, oop obj) {
assert(obj->is_constMethod(), "should be constMethod");
constMethodOop cm_oop = constMethodOop(obj);
-#if 0
- PSParallelCompact::adjust_pointer(cm_oop->adr_method());
- PSParallelCompact::adjust_pointer(cm_oop->adr_exception_table());
- PSParallelCompact::adjust_pointer(cm_oop->adr_stackmap_data());
-#endif
oop* const beg_oop = cm_oop->oop_block_beg();
oop* const end_oop = cm_oop->oop_block_end();
for (oop* cur_oop = beg_oop; cur_oop < end_oop; ++cur_oop) {
diff --git a/hotspot/src/share/vm/oops/constantPoolKlass.cpp b/hotspot/src/share/vm/oops/constantPoolKlass.cpp
index 362e275..0b3a67a 100644
--- a/hotspot/src/share/vm/oops/constantPoolKlass.cpp
+++ b/hotspot/src/share/vm/oops/constantPoolKlass.cpp
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/parNew/parOopClosures.inline.hpp"
#include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
diff --git a/hotspot/src/share/vm/oops/constantPoolOop.cpp b/hotspot/src/share/vm/oops/constantPoolOop.cpp
index a46f4eb..87280c6 100644
--- a/hotspot/src/share/vm/oops/constantPoolOop.cpp
+++ b/hotspot/src/share/vm/oops/constantPoolOop.cpp
@@ -1355,7 +1355,7 @@ static void print_cpool_bytes(jint cnt, u1 *bytes) {
}
case JVM_CONSTANT_Long: {
u8 val = Bytes::get_Java_u8(bytes);
- printf("long "INT64_FORMAT, *(jlong *) &val);
+ printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
ent_size = 8;
idx++; // Long takes two cpool slots
break;
diff --git a/hotspot/src/share/vm/oops/cpCacheKlass.cpp b/hotspot/src/share/vm/oops/cpCacheKlass.cpp
index 86d9dc0..843f095 100644
--- a/hotspot/src/share/vm/oops/cpCacheKlass.cpp
+++ b/hotspot/src/share/vm/oops/cpCacheKlass.cpp
@@ -63,8 +63,10 @@ constantPoolCacheOop constantPoolCacheKlass::allocate(int length,
// CollectedHeap::permanent_obj_allocate(klass, size, CHECK_NULL);
oop obj = CollectedHeap::permanent_obj_allocate_no_klass_install(klass, size, CHECK_NULL);
- NOT_PRODUCT(Universe::heap()->check_for_bad_heap_word_value((HeapWord*) obj,
- size));
+#ifndef PRODUCT
+ const size_t hs = oopDesc::header_size();
+ Universe::heap()->check_for_bad_heap_word_value(((HeapWord*) obj)+hs, size-hs);
+#endif
constantPoolCacheOop cache = (constantPoolCacheOop) obj;
assert(!UseConcMarkSweepGC || obj->klass_or_null() == NULL,
"klass should be NULL here when using CMS");
diff --git a/hotspot/src/share/vm/oops/cpCacheOop.cpp b/hotspot/src/share/vm/oops/cpCacheOop.cpp
index 087c8a1..678bc13 100644
--- a/hotspot/src/share/vm/oops/cpCacheOop.cpp
+++ b/hotspot/src/share/vm/oops/cpCacheOop.cpp
@@ -128,17 +128,13 @@ bool ConstantPoolCacheEntry::same_methodOop(oop cur_f1, oop f1) {
void ConstantPoolCacheEntry::set_field(Bytecodes::Code get_code,
Bytecodes::Code put_code,
KlassHandle field_holder,
- int orig_field_index,
+ int field_index,
int field_offset,
TosState field_type,
bool is_final,
bool is_volatile) {
set_f1(field_holder()->java_mirror());
set_f2(field_offset);
- // The field index is used by jvm/ti and is the index into fields() array
- // in holder instanceKlass. This is scaled by instanceKlass::next_offset.
- assert((orig_field_index % instanceKlass::next_offset) == 0, "wierd index");
- const int field_index = orig_field_index / instanceKlass::next_offset;
assert(field_index <= field_index_mask,
"field index does not fit in low flag bits");
set_flags(as_flags(field_type, is_final, false, is_volatile, false, false) |
@@ -149,7 +145,7 @@ void ConstantPoolCacheEntry::set_field(Bytecodes::Code get_code,
}
int ConstantPoolCacheEntry::field_index() const {
- return (_flags & field_index_mask) * instanceKlass::next_offset;
+ return (_flags & field_index_mask);
}
void ConstantPoolCacheEntry::set_method(Bytecodes::Code invoke_code,
diff --git a/hotspot/src/share/vm/oops/fieldInfo.hpp b/hotspot/src/share/vm/oops/fieldInfo.hpp
new file mode 100644
index 0000000..69de3ae
--- /dev/null
+++ b/hotspot/src/share/vm/oops/fieldInfo.hpp
@@ -0,0 +1,132 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_OOPS_FIELDINFO_HPP
+#define SHARE_VM_OOPS_FIELDINFO_HPP
+
+#include "oops/typeArrayOop.hpp"
+#include "classfile/vmSymbols.hpp"
+
+// This class represents the field information contained in the fields
+// array of an instanceKlass. Currently it's laid on top an array of
+// Java shorts but in the future it could simply be used as a real
+// array type. FieldInfo generally shouldn't be used directly.
+// Fields should be queried either through instanceKlass or through
+// the various FieldStreams.
+class FieldInfo VALUE_OBJ_CLASS_SPEC {
+ friend class fieldDescriptor;
+ friend class JavaFieldStream;
+ friend class ClassFileParser;
+
+ public:
+ // fields
+ // Field info extracted from the class file and stored
+ // as an array of 7 shorts
+ enum FieldOffset {
+ access_flags_offset = 0,
+ name_index_offset = 1,
+ signature_index_offset = 2,
+ initval_index_offset = 3,
+ low_offset = 4,
+ high_offset = 5,
+ generic_signature_offset = 6,
+ field_slots = 7
+ };
+
+ private:
+ u2 _shorts[field_slots];
+
+ void set_name_index(u2 val) { _shorts[name_index_offset] = val; }
+ void set_signature_index(u2 val) { _shorts[signature_index_offset] = val; }
+ void set_initval_index(u2 val) { _shorts[initval_index_offset] = val; }
+ void set_generic_signature_index(u2 val) { _shorts[generic_signature_offset] = val; }
+
+ u2 name_index() const { return _shorts[name_index_offset]; }
+ u2 signature_index() const { return _shorts[signature_index_offset]; }
+ u2 initval_index() const { return _shorts[initval_index_offset]; }
+ u2 generic_signature_index() const { return _shorts[generic_signature_offset]; }
+
+ public:
+ static FieldInfo* from_field_array(typeArrayOop fields, int index) {
+ return ((FieldInfo*)fields->short_at_addr(index * field_slots));
+ }
+
+ void initialize(u2 access_flags,
+ u2 name_index,
+ u2 signature_index,
+ u2 initval_index,
+ u2 generic_signature_index,
+ u4 offset) {
+ _shorts[access_flags_offset] = access_flags;
+ _shorts[name_index_offset] = name_index;
+ _shorts[signature_index_offset] = signature_index;
+ _shorts[initval_index_offset] = initval_index;
+ _shorts[generic_signature_offset] = generic_signature_index;
+ set_offset(offset);
+ }
+
+ u2 access_flags() const { return _shorts[access_flags_offset]; }
+ u4 offset() const { return build_int_from_shorts(_shorts[low_offset], _shorts[high_offset]); }
+
+ Symbol* name(constantPoolHandle cp) const {
+ int index = name_index();
+ if (is_internal()) {
+ return lookup_symbol(index);
+ }
+ return cp->symbol_at(index);
+ }
+
+ Symbol* signature(constantPoolHandle cp) const {
+ int index = signature_index();
+ if (is_internal()) {
+ return lookup_symbol(index);
+ }
+ return cp->symbol_at(index);
+ }
+
+ Symbol* generic_signature(constantPoolHandle cp) const {
+ int index = generic_signature_index();
+ if (index == 0) {
+ return NULL;
+ }
+ return cp->symbol_at(index);
+ }
+
+ void set_access_flags(u2 val) { _shorts[access_flags_offset] = val; }
+ void set_offset(u4 val) {
+ _shorts[low_offset] = extract_low_short_from_int(val);
+ _shorts[high_offset] = extract_high_short_from_int(val);
+ }
+
+ bool is_internal() const {
+ return (access_flags() & JVM_ACC_FIELD_INTERNAL) != 0;
+ }
+
+ Symbol* lookup_symbol(int symbol_index) const {
+ assert(is_internal(), "only internal fields");
+ return vmSymbols::symbol_at((vmSymbols::SID)symbol_index);
+ }
+};
+
+#endif // SHARE_VM_OOPS_FIELDINFO_HPP
diff --git a/hotspot/src/share/vm/oops/fieldStreams.hpp b/hotspot/src/share/vm/oops/fieldStreams.hpp
new file mode 100644
index 0000000..07c28f3
--- /dev/null
+++ b/hotspot/src/share/vm/oops/fieldStreams.hpp
@@ -0,0 +1,174 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_OOPS_FIELDSTREAMS_HPP
+#define SHARE_VM_OOPS_FIELDSTREAMS_HPP
+
+#include "oops/instanceKlass.hpp"
+#include "oops/fieldInfo.hpp"
+
+// The is the base class for iteration over the fields array
+// describing the declared fields in the class. Several subclasses
+// are provided depending on the kind of iteration required. The
+// JavaFieldStream is for iterating over regular Java fields and it
+// generally the preferred iterator. InternalFieldStream only
+// iterates over fields that have been injected by the JVM.
+// AllFieldStream exposes all fields and should only be used in rare
+// cases.
+class FieldStreamBase : public StackObj {
+ protected:
+ typeArrayHandle _fields;
+ constantPoolHandle _constants;
+ int _index;
+ int _limit;
+
+ FieldInfo* field() const { return FieldInfo::from_field_array(_fields(), _index); }
+
+ FieldStreamBase(typeArrayHandle fields, constantPoolHandle constants, int start, int limit) {
+ _fields = fields;
+ _constants = constants;
+ _index = start;
+ _limit = limit;
+ }
+
+ FieldStreamBase(typeArrayHandle fields, constantPoolHandle constants) {
+ _fields = fields;
+ _constants = constants;
+ _index = 0;
+ _limit = fields->length() / FieldInfo::field_slots;
+ }
+
+ public:
+ FieldStreamBase(instanceKlass* klass) {
+ _fields = klass->fields();
+ _constants = klass->constants();
+ _index = 0;
+ _limit = klass->java_fields_count();
+ }
+ FieldStreamBase(instanceKlassHandle klass) {
+ _fields = klass->fields();
+ _constants = klass->constants();
+ _index = 0;
+ _limit = klass->java_fields_count();
+ }
+
+ // accessors
+ int index() const { return _index; }
+
+ void next() { _index += 1; }
+ bool done() const { return _index >= _limit; }
+
+ // Accessors for current field
+ AccessFlags access_flags() const {
+ AccessFlags flags;
+ flags.set_flags(field()->access_flags());
+ return flags;
+ }
+
+ void set_access_flags(u2 flags) const {
+ field()->set_access_flags(flags);
+ }
+
+ void set_access_flags(AccessFlags flags) const {
+ set_access_flags(flags.as_short());
+ }
+
+ Symbol* name() const {
+ return field()->name(_constants);
+ }
+
+ Symbol* signature() const {
+ return field()->signature(_constants);
+ }
+
+ Symbol* generic_signature() const {
+ return field()->generic_signature(_constants);
+ }
+
+ int offset() const {
+ return field()->offset();
+ }
+
+ void set_offset(int offset) {
+ field()->set_offset(offset);
+ }
+};
+
+// Iterate over only the internal fields
+class JavaFieldStream : public FieldStreamBase {
+ public:
+ JavaFieldStream(instanceKlass* k): FieldStreamBase(k->fields(), k->constants(), 0, k->java_fields_count()) {}
+ JavaFieldStream(instanceKlassHandle k): FieldStreamBase(k->fields(), k->constants(), 0, k->java_fields_count()) {}
+
+ int name_index() const {
+ assert(!field()->is_internal(), "regular only");
+ return field()->name_index();
+ }
+ void set_name_index(int index) {
+ assert(!field()->is_internal(), "regular only");
+ field()->set_name_index(index);
+ }
+ int signature_index() const {
+ assert(!field()->is_internal(), "regular only");
+ return field()->signature_index();
+ }
+ void set_signature_index(int index) {
+ assert(!field()->is_internal(), "regular only");
+ field()->set_signature_index(index);
+ }
+ int generic_signature_index() const {
+ assert(!field()->is_internal(), "regular only");
+ return field()->generic_signature_index();
+ }
+ void set_generic_signature_index(int index) {
+ assert(!field()->is_internal(), "regular only");
+ field()->set_generic_signature_index(index);
+ }
+ int initval_index() const {
+ assert(!field()->is_internal(), "regular only");
+ return field()->initval_index();
+ }
+ void set_initval_index(int index) {
+ assert(!field()->is_internal(), "regular only");
+ return field()->set_initval_index(index);
+ }
+};
+
+
+// Iterate over only the internal fields
+class InternalFieldStream : public FieldStreamBase {
+ public:
+ InternalFieldStream(instanceKlass* k): FieldStreamBase(k->fields(), k->constants(), k->java_fields_count(), k->all_fields_count()) {}
+ InternalFieldStream(instanceKlassHandle k): FieldStreamBase(k->fields(), k->constants(), k->java_fields_count(), k->all_fields_count()) {}
+};
+
+
+class AllFieldStream : public FieldStreamBase {
+ public:
+ AllFieldStream(typeArrayHandle fields, constantPoolHandle constants): FieldStreamBase(fields, constants) {}
+ AllFieldStream(instanceKlass* k): FieldStreamBase(k->fields(), k->constants()) {}
+ AllFieldStream(instanceKlassHandle k): FieldStreamBase(k->fields(), k->constants()) {}
+};
+
+#endif // SHARE_VM_OOPS_FIELDSTREAMS_HPP
diff --git a/hotspot/src/share/vm/oops/generateOopMap.cpp b/hotspot/src/share/vm/oops/generateOopMap.cpp
index 10b39c6..58ef931 100644
--- a/hotspot/src/share/vm/oops/generateOopMap.cpp
+++ b/hotspot/src/share/vm/oops/generateOopMap.cpp
@@ -963,10 +963,21 @@ void GenerateOopMap::init_basic_blocks() {
// initialize the CellTypeState-related information.
init_state();
- // We allocate space for all state-vectors for all basicblocks in one huge chuck.
- // Then in the next part of the code, we set a pointer in each _basic_block that
- // points to each piece.
- CellTypeState *basicBlockState = NEW_RESOURCE_ARRAY(CellTypeState, bbNo * _state_len);
+ // We allocate space for all state-vectors for all basicblocks in one huge
+ // chunk. Then in the next part of the code, we set a pointer in each
+ // _basic_block that points to each piece.
+
+ // The product of bbNo and _state_len can get large if there are lots of
+ // basic blocks and stack/locals/monitors. Need to check to make sure
+ // we don't overflow the capacity of a pointer.
+ if ((unsigned)bbNo > UINTPTR_MAX / sizeof(CellTypeState) / _state_len) {
+ report_error("The amount of memory required to analyze this method "
+ "exceeds addressable range");
+ return;
+ }
+
+ CellTypeState *basicBlockState =
+ NEW_RESOURCE_ARRAY(CellTypeState, bbNo * _state_len);
memset(basicBlockState, 0, bbNo * _state_len * sizeof(CellTypeState));
// Make a pass over the basicblocks and assign their state vectors.
@@ -1556,9 +1567,7 @@ void GenerateOopMap::interp1(BytecodeStream *itr) {
case Bytecodes::_jsr: do_jsr(itr->dest()); break;
case Bytecodes::_jsr_w: do_jsr(itr->dest_w()); break;
- case Bytecodes::_getstatic: do_field(true, true,
- itr->get_index_u2_cpcache(),
- itr->bci()); break;
+ case Bytecodes::_getstatic: do_field(true, true, itr->get_index_u2_cpcache(), itr->bci()); break;
case Bytecodes::_putstatic: do_field(false, true, itr->get_index_u2_cpcache(), itr->bci()); break;
case Bytecodes::_getfield: do_field(true, false, itr->get_index_u2_cpcache(), itr->bci()); break;
case Bytecodes::_putfield: do_field(false, false, itr->get_index_u2_cpcache(), itr->bci()); break;
diff --git a/hotspot/src/share/vm/oops/instanceKlass.cpp b/hotspot/src/share/vm/oops/instanceKlass.cpp
index ddc91c2..20b0a96 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp
@@ -36,6 +36,7 @@
#include "memory/genOopClosures.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/permGen.hpp"
+#include "oops/fieldStreams.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/instanceMirrorKlass.hpp"
#include "oops/instanceOop.hpp"
@@ -60,6 +61,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
#include "gc_implementation/g1/g1OopClosures.inline.hpp"
@@ -782,14 +786,11 @@ void instanceKlass::mask_for(methodHandle method, int bci,
bool instanceKlass::find_local_field(Symbol* name, Symbol* sig, fieldDescriptor* fd) const {
- const int n = fields()->length();
- for (int i = 0; i < n; i += next_offset ) {
- int name_index = fields()->ushort_at(i + name_index_offset);
- int sig_index = fields()->ushort_at(i + signature_index_offset);
- Symbol* f_name = constants()->symbol_at(name_index);
- Symbol* f_sig = constants()->symbol_at(sig_index);
+ for (JavaFieldStream fs(as_klassOop()); !fs.done(); fs.next()) {
+ Symbol* f_name = fs.name();
+ Symbol* f_sig = fs.signature();
if (f_name == name && f_sig == sig) {
- fd->initialize(as_klassOop(), i);
+ fd->initialize(as_klassOop(), fs.index());
return true;
}
}
@@ -803,11 +804,10 @@ void instanceKlass::shared_symbols_iterate(SymbolClosure* closure) {
closure->do_symbol(&_source_file_name);
closure->do_symbol(&_source_debug_extension);
- const int n = fields()->length();
- for (int i = 0; i < n; i += next_offset ) {
- int name_index = fields()->ushort_at(i + name_index_offset);
+ for (JavaFieldStream fs(this); !fs.done(); fs.next()) {
+ int name_index = fs.name_index();
closure->do_symbol(constants()->symbol_at_addr(name_index));
- int sig_index = fields()->ushort_at(i + signature_index_offset);
+ int sig_index = fs.signature_index();
closure->do_symbol(constants()->symbol_at_addr(sig_index));
}
}
@@ -872,10 +872,9 @@ klassOop instanceKlass::find_field(Symbol* name, Symbol* sig, bool is_static, fi
bool instanceKlass::find_local_field_from_offset(int offset, bool is_static, fieldDescriptor* fd) const {
- int length = fields()->length();
- for (int i = 0; i < length; i += next_offset) {
- if (offset_from_fields( i ) == offset) {
- fd->initialize(as_klassOop(), i);
+ for (JavaFieldStream fs(as_klassOop()); !fs.done(); fs.next()) {
+ if (fs.offset() == offset) {
+ fd->initialize(as_klassOop(), fs.index());
if (fd->is_static() == is_static) return true;
}
}
@@ -906,11 +905,12 @@ void instanceKlass::methods_do(void f(methodOop method)) {
void instanceKlass::do_local_static_fields(FieldClosure* cl) {
- fieldDescriptor fd;
- int length = fields()->length();
- for (int i = 0; i < length; i += next_offset) {
- fd.initialize(as_klassOop(), i);
- if (fd.is_static()) cl->do_field(&fd);
+ for (JavaFieldStream fs(this); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_static()) {
+ fieldDescriptor fd;
+ fd.initialize(as_klassOop(), fs.index());
+ cl->do_field(&fd);
+ }
}
}
@@ -922,11 +922,12 @@ void instanceKlass::do_local_static_fields(void f(fieldDescriptor*, TRAPS), TRAP
void instanceKlass::do_local_static_fields_impl(instanceKlassHandle this_oop, void f(fieldDescriptor* fd, TRAPS), TRAPS) {
- fieldDescriptor fd;
- int length = this_oop->fields()->length();
- for (int i = 0; i < length; i += next_offset) {
- fd.initialize(this_oop(), i);
- if (fd.is_static()) { f(&fd, CHECK); } // Do NOT remove {}! (CHECK macro expands into several statements)
+ for (JavaFieldStream fs(this_oop()); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_static()) {
+ fieldDescriptor fd;
+ fd.initialize(this_oop(), fs.index());
+ f(&fd, CHECK);
+ }
}
}
@@ -941,11 +942,11 @@ void instanceKlass::do_nonstatic_fields(FieldClosure* cl) {
super->do_nonstatic_fields(cl);
}
fieldDescriptor fd;
- int length = fields()->length();
+ int length = java_fields_count();
// In DebugInfo nonstatic fields are sorted by offset.
int* fields_sorted = NEW_C_HEAP_ARRAY(int, 2*(length+1));
int j = 0;
- for (int i = 0; i < length; i += next_offset) {
+ for (int i = 0; i < length; i += 1) {
fd.initialize(as_klassOop(), i);
if (!fd.is_static()) {
fields_sorted[j + 0] = fd.offset();
@@ -1374,39 +1375,8 @@ int instanceKlass::cached_itable_index(size_t idnum) {
//
-// nmethodBucket is used to record dependent nmethods for
-// deoptimization. nmethod dependencies are actually <klass, method>
-// pairs but we really only care about the klass part for purposes of
-// finding nmethods which might need to be deoptimized. Instead of
-// recording the method, a count of how many times a particular nmethod
-// was recorded is kept. This ensures that any recording errors are
-// noticed since an nmethod should be removed as many times are it's
-// added.
-//
-class nmethodBucket {
- private:
- nmethod* _nmethod;
- int _count;
- nmethodBucket* _next;
-
- public:
- nmethodBucket(nmethod* nmethod, nmethodBucket* next) {
- _nmethod = nmethod;
- _next = next;
- _count = 1;
- }
- int count() { return _count; }
- int increment() { _count += 1; return _count; }
- int decrement() { _count -= 1; assert(_count >= 0, "don't underflow"); return _count; }
- nmethodBucket* next() { return _next; }
- void set_next(nmethodBucket* b) { _next = b; }
- nmethod* get_nmethod() { return _nmethod; }
-};
-
-
-//
// Walk the list of dependent nmethods searching for nmethods which
-// are dependent on the klassOop that was passed in and mark them for
+// are dependent on the changes that were passed in and mark them for
// deoptimization. Returns the number of nmethods found.
//
int instanceKlass::mark_dependent_nmethods(DepChange& changes) {
@@ -2411,43 +2381,6 @@ void instanceKlass::oop_verify_on(oop obj, outputStream* st) {
oop_oop_iterate(obj, &blk);
}
-#ifndef PRODUCT
-
-void instanceKlass::verify_class_klass_nonstatic_oop_maps(klassOop k) {
- // This verification code is disabled. JDK_Version::is_gte_jdk14x_version()
- // cannot be called since this function is called before the VM is
- // able to determine what JDK version is running with.
- // The check below always is false since 1.4.
- return;
-
- // This verification code temporarily disabled for the 1.4
- // reflection implementation since java.lang.Class now has
- // Java-level instance fields. Should rewrite this to handle this
- // case.
- if (!(JDK_Version::is_gte_jdk14x_version() && UseNewReflection)) {
- // Verify that java.lang.Class instances have a fake oop field added.
- instanceKlass* ik = instanceKlass::cast(k);
-
- // Check that we have the right class
- static bool first_time = true;
- guarantee(k == SystemDictionary::Class_klass() && first_time, "Invalid verify of maps");
- first_time = false;
- const int extra = java_lang_Class::number_of_fake_oop_fields;
- guarantee(ik->nonstatic_field_size() == extra, "just checking");
- guarantee(ik->nonstatic_oop_map_count() == 1, "just checking");
- guarantee(ik->size_helper() == align_object_size(instanceOopDesc::header_size() + extra), "just checking");
-
- // Check that the map is (2,extra)
- int offset = java_lang_Class::klass_offset;
-
- OopMapBlock* map = ik->start_of_nonstatic_oop_maps();
- guarantee(map->offset() == offset && map->count() == (unsigned int) extra,
- "sanity");
- }
-}
-
-#endif // ndef PRODUCT
-
// JNIid class for jfieldIDs only
// Note to reviewers:
// These JNI functions are just moved over to column 1 and not changed
diff --git a/hotspot/src/share/vm/oops/instanceKlass.hpp b/hotspot/src/share/vm/oops/instanceKlass.hpp
index 1aa663c..a87448a 100644
--- a/hotspot/src/share/vm/oops/instanceKlass.hpp
+++ b/hotspot/src/share/vm/oops/instanceKlass.hpp
@@ -27,6 +27,7 @@
#include "oops/constMethodOop.hpp"
#include "oops/constantPoolOop.hpp"
+#include "oops/fieldInfo.hpp"
#include "oops/instanceOop.hpp"
#include "oops/klassOop.hpp"
#include "oops/klassVtable.hpp"
@@ -228,6 +229,7 @@ class instanceKlass: public Klass {
int _static_field_size; // number words used by static fields (oop and non-oop) in this klass
int _static_oop_field_count;// number of static oop fields in this klass
int _nonstatic_oop_map_size;// size in words of nonstatic oop map blocks
+ int _java_fields_count; // The number of declared Java fields
bool _is_marked_dependent; // used for marking during flushing and deoptimization
bool _rewritten; // methods rewritten.
bool _has_nonstatic_fields; // for sizing with UseCompressedOops
@@ -307,27 +309,28 @@ class instanceKlass: public Klass {
objArrayOop transitive_interfaces() const { return _transitive_interfaces; }
void set_transitive_interfaces(objArrayOop a) { oop_store_without_check((oop*) &_transitive_interfaces, (oop) a); }
- // fields
- // Field info extracted from the class file and stored
- // as an array of 7 shorts
- enum FieldOffset {
- access_flags_offset = 0,
- name_index_offset = 1,
- signature_index_offset = 2,
- initval_index_offset = 3,
- low_offset = 4,
- high_offset = 5,
- generic_signature_offset = 6,
- next_offset = 7
- };
+ private:
+ friend class fieldDescriptor;
+ FieldInfo* field(int index) const { return FieldInfo::from_field_array(_fields, index); }
+
+ public:
+ int field_offset (int index) const { return field(index)->offset(); }
+ int field_access_flags(int index) const { return field(index)->access_flags(); }
+ Symbol* field_name (int index) const { return field(index)->name(constants()); }
+ Symbol* field_signature (int index) const { return field(index)->signature(constants()); }
+
+ // Number of Java declared fields
+ int java_fields_count() const { return _java_fields_count; }
+
+ // Number of fields including any injected fields
+ int all_fields_count() const { return _fields->length() / sizeof(FieldInfo::field_slots); }
typeArrayOop fields() const { return _fields; }
- int offset_from_fields( int index ) const {
- return build_int_from_shorts( fields()->ushort_at(index + low_offset),
- fields()->ushort_at(index + high_offset) );
- }
- void set_fields(typeArrayOop f) { oop_store_without_check((oop*) &_fields, (oop) f); }
+ void set_fields(typeArrayOop f, int java_fields_count) {
+ oop_store_without_check((oop*) &_fields, (oop) f);
+ _java_fields_count = java_fields_count;
+ }
// inner classes
typeArrayOop inner_classes() const { return _inner_classes; }
@@ -842,10 +845,6 @@ public:
// Verification
const char* internal_name() const;
void oop_verify_on(oop obj, outputStream* st);
-
-#ifndef PRODUCT
- static void verify_class_klass_nonstatic_oop_maps(klassOop k) PRODUCT_RETURN;
-#endif
};
inline methodOop instanceKlass::method_at_vtable(int index) {
@@ -1013,4 +1012,36 @@ class PreviousVersionWalker : public StackObj {
PreviousVersionInfo* next_previous_version();
};
+
+//
+// nmethodBucket is used to record dependent nmethods for
+// deoptimization. nmethod dependencies are actually <klass, method>
+// pairs but we really only care about the klass part for purposes of
+// finding nmethods which might need to be deoptimized. Instead of
+// recording the method, a count of how many times a particular nmethod
+// was recorded is kept. This ensures that any recording errors are
+// noticed since an nmethod should be removed as many times are it's
+// added.
+//
+class nmethodBucket: public CHeapObj {
+ friend class VMStructs;
+ private:
+ nmethod* _nmethod;
+ int _count;
+ nmethodBucket* _next;
+
+ public:
+ nmethodBucket(nmethod* nmethod, nmethodBucket* next) {
+ _nmethod = nmethod;
+ _next = next;
+ _count = 1;
+ }
+ int count() { return _count; }
+ int increment() { _count += 1; return _count; }
+ int decrement() { _count -= 1; assert(_count >= 0, "don't underflow"); return _count; }
+ nmethodBucket* next() { return _next; }
+ void set_next(nmethodBucket* b) { _next = b; }
+ nmethod* get_nmethod() { return _nmethod; }
+};
+
#endif // SHARE_VM_OOPS_INSTANCEKLASS_HPP
diff --git a/hotspot/src/share/vm/oops/instanceKlassKlass.cpp b/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
index dc2cd6c..fa13f17 100644
--- a/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceKlassKlass.cpp
@@ -386,7 +386,7 @@ instanceKlassKlass::allocate_instance_klass(Symbol* name, int vtable_len, int it
ik->set_local_interfaces(NULL);
ik->set_transitive_interfaces(NULL);
ik->init_implementor();
- ik->set_fields(NULL);
+ ik->set_fields(NULL, 0);
ik->set_constants(NULL);
ik->set_class_loader(NULL);
ik->set_protection_domain(NULL);
diff --git a/hotspot/src/share/vm/oops/instanceRefKlass.cpp b/hotspot/src/share/vm/oops/instanceRefKlass.cpp
index 12c9d33..71a7a1f 100644
--- a/hotspot/src/share/vm/oops/instanceRefKlass.cpp
+++ b/hotspot/src/share/vm/oops/instanceRefKlass.cpp
@@ -45,7 +45,7 @@
#endif
template <class T>
-static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
+void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj);
T heap_oop = oopDesc::load_heap_oop(referent_addr);
debug_only(
@@ -56,9 +56,8 @@ static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
if (!oopDesc::is_null(heap_oop)) {
oop referent = oopDesc::decode_heap_oop_not_null(heap_oop);
if (!referent->is_gc_marked() &&
- MarkSweep::ref_processor()->
- discover_reference(obj, ref->reference_type())) {
- // reference already enqueued, referent will be traversed later
+ MarkSweep::ref_processor()->discover_reference(obj, ref->reference_type())) {
+ // reference was discovered, referent will be traversed later
ref->instanceKlass::oop_follow_contents(obj);
debug_only(
if(TraceReferenceGC && PrintGCDetails) {
@@ -76,8 +75,34 @@ static void specialized_oop_follow_contents(instanceRefKlass* ref, oop obj) {
MarkSweep::mark_and_push(referent_addr);
}
}
- // treat next as normal oop. next is a link in the pending list.
T* next_addr = (T*)java_lang_ref_Reference::next_addr(obj);
+ if (ReferenceProcessor::pending_list_uses_discovered_field()) {
+ // Treat discovered as normal oop, if ref is not "active",
+ // i.e. if next is non-NULL.
+ T next_oop = oopDesc::load_heap_oop(next_addr);
+ if (!oopDesc::is_null(next_oop)) { // i.e. ref is not "active"
+ T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr(obj);
+ debug_only(
+ if(TraceReferenceGC && PrintGCDetails) {
+ gclog_or_tty->print_cr(" Process discovered as normal "
+ INTPTR_FORMAT, discovered_addr);
+ }
+ )
+ MarkSweep::mark_and_push(discovered_addr);
+ }
+ } else {
+#ifdef ASSERT
+ // In the case of older JDKs which do not use the discovered
+ // field for the pending list, an inactive ref (next != NULL)
+ // must always have a NULL discovered field.
+ oop next = oopDesc::load_decode_heap_oop(next_addr);
+ oop discovered = java_lang_ref_Reference::discovered(obj);
+ assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
+ err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
+ (oopDesc*)obj));
+#endif
+ }
+ // treat next as normal oop. next is a link in the reference queue.
debug_only(
if(TraceReferenceGC && PrintGCDetails) {
gclog_or_tty->print_cr(" Process next as normal " INTPTR_FORMAT, next_addr);
@@ -130,13 +155,33 @@ void specialized_oop_follow_contents(instanceRefKlass* ref,
PSParallelCompact::mark_and_push(cm, referent_addr);
}
}
- // treat next as normal oop. next is a link in the pending list.
T* next_addr = (T*)java_lang_ref_Reference::next_addr(obj);
- debug_only(
- if(TraceReferenceGC && PrintGCDetails) {
- gclog_or_tty->print_cr(" Process next as normal " INTPTR_FORMAT, next_addr);
+ if (ReferenceProcessor::pending_list_uses_discovered_field()) {
+ // Treat discovered as normal oop, if ref is not "active",
+ // i.e. if next is non-NULL.
+ T next_oop = oopDesc::load_heap_oop(next_addr);
+ if (!oopDesc::is_null(next_oop)) { // i.e. ref is not "active"
+ T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr(obj);
+ debug_only(
+ if(TraceReferenceGC && PrintGCDetails) {
+ gclog_or_tty->print_cr(" Process discovered as normal "
+ INTPTR_FORMAT, discovered_addr);
+ }
+ )
+ PSParallelCompact::mark_and_push(cm, discovered_addr);
}
- )
+ } else {
+#ifdef ASSERT
+ // In the case of older JDKs which do not use the discovered
+ // field for the pending list, an inactive ref (next != NULL)
+ // must always have a NULL discovered field.
+ T next = oopDesc::load_heap_oop(next_addr);
+ oop discovered = java_lang_ref_Reference::discovered(obj);
+ assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
+ err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
+ (oopDesc*)obj));
+#endif
+ }
PSParallelCompact::mark_and_push(cm, next_addr);
ref->instanceKlass::oop_follow_contents(cm, obj);
}
@@ -197,27 +242,53 @@ int instanceRefKlass::oop_adjust_pointers(oop obj) {
}
#define InstanceRefKlass_SPECIALIZED_OOP_ITERATE(T, nv_suffix, contains) \
+ T* disc_addr = (T*)java_lang_ref_Reference::discovered_addr(obj); \
if (closure->apply_to_weak_ref_discovered_field()) { \
- T* disc_addr = (T*)java_lang_ref_Reference::discovered_addr(obj); \
closure->do_oop##nv_suffix(disc_addr); \
} \
\
T* referent_addr = (T*)java_lang_ref_Reference::referent_addr(obj); \
T heap_oop = oopDesc::load_heap_oop(referent_addr); \
- if (!oopDesc::is_null(heap_oop) && contains(referent_addr)) { \
- ReferenceProcessor* rp = closure->_ref_processor; \
+ ReferenceProcessor* rp = closure->_ref_processor; \
+ if (!oopDesc::is_null(heap_oop)) { \
oop referent = oopDesc::decode_heap_oop_not_null(heap_oop); \
if (!referent->is_gc_marked() && (rp != NULL) && \
rp->discover_reference(obj, reference_type())) { \
return size; \
- } else { \
+ } else if (contains(referent_addr)) { \
/* treat referent as normal oop */ \
SpecializationStats::record_do_oop_call##nv_suffix(SpecializationStats::irk);\
closure->do_oop##nv_suffix(referent_addr); \
} \
} \
- /* treat next as normal oop */ \
T* next_addr = (T*)java_lang_ref_Reference::next_addr(obj); \
+ if (ReferenceProcessor::pending_list_uses_discovered_field()) { \
+ T next_oop = oopDesc::load_heap_oop(next_addr); \
+ /* Treat discovered as normal oop, if ref is not "active" (next non-NULL) */\
+ if (!oopDesc::is_null(next_oop) && contains(disc_addr)) { \
+ /* i.e. ref is not "active" */ \
+ debug_only( \
+ if(TraceReferenceGC && PrintGCDetails) { \
+ gclog_or_tty->print_cr(" Process discovered as normal " \
+ INTPTR_FORMAT, disc_addr); \
+ } \
+ ) \
+ SpecializationStats::record_do_oop_call##nv_suffix(SpecializationStats::irk);\
+ closure->do_oop##nv_suffix(disc_addr); \
+ } \
+ } else { \
+ /* In the case of older JDKs which do not use the discovered field for */ \
+ /* the pending list, an inactive ref (next != NULL) must always have a */ \
+ /* NULL discovered field. */ \
+ debug_only( \
+ T next_oop = oopDesc::load_heap_oop(next_addr); \
+ T disc_oop = oopDesc::load_heap_oop(disc_addr); \
+ assert(oopDesc::is_null(next_oop) || oopDesc::is_null(disc_oop), \
+ err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL" \
+ "discovered field", (oopDesc*)obj)); \
+ ) \
+ } \
+ /* treat next as normal oop */ \
if (contains(next_addr)) { \
SpecializationStats::record_do_oop_call##nv_suffix(SpecializationStats::irk); \
closure->do_oop##nv_suffix(next_addr); \
@@ -306,8 +377,37 @@ void specialized_oop_push_contents(instanceRefKlass *ref,
pm->claim_or_forward_depth(referent_addr);
}
}
- // treat next as normal oop
+ // Treat discovered as normal oop, if ref is not "active",
+ // i.e. if next is non-NULL.
T* next_addr = (T*)java_lang_ref_Reference::next_addr(obj);
+ if (ReferenceProcessor::pending_list_uses_discovered_field()) {
+ T next_oop = oopDesc::load_heap_oop(next_addr);
+ if (!oopDesc::is_null(next_oop)) { // i.e. ref is not "active"
+ T* discovered_addr = (T*)java_lang_ref_Reference::discovered_addr(obj);
+ debug_only(
+ if(TraceReferenceGC && PrintGCDetails) {
+ gclog_or_tty->print_cr(" Process discovered as normal "
+ INTPTR_FORMAT, discovered_addr);
+ }
+ )
+ if (PSScavenge::should_scavenge(discovered_addr)) {
+ pm->claim_or_forward_depth(discovered_addr);
+ }
+ }
+ } else {
+#ifdef ASSERT
+ // In the case of older JDKs which do not use the discovered
+ // field for the pending list, an inactive ref (next != NULL)
+ // must always have a NULL discovered field.
+ oop next = oopDesc::load_decode_heap_oop(next_addr);
+ oop discovered = java_lang_ref_Reference::discovered(obj);
+ assert(oopDesc::is_null(next) || oopDesc::is_null(discovered),
+ err_msg("Found an inactive reference " PTR_FORMAT " with a non-NULL discovered field",
+ (oopDesc*)obj));
+#endif
+ }
+
+ // Treat next as normal oop; next is a link in the reference queue.
if (PSScavenge::should_scavenge(next_addr)) {
pm->claim_or_forward_depth(next_addr);
}
diff --git a/hotspot/src/share/vm/oops/klassOop.hpp b/hotspot/src/share/vm/oops/klassOop.hpp
index 7617b85..25dca1d 100644
--- a/hotspot/src/share/vm/oops/klassOop.hpp
+++ b/hotspot/src/share/vm/oops/klassOop.hpp
@@ -53,8 +53,10 @@ class klassOopDesc : public oopDesc {
private:
// These have no implementation since klassOop should never be accessed in this fashion
oop obj_field(int offset) const;
+ volatile oop obj_field_volatile(int offset) const;
void obj_field_put(int offset, oop value);
- void obj_field_raw_put(int offset, oop value);
+ void obj_field_put_raw(int offset, oop value);
+ void obj_field_put_volatile(int offset, oop value);
jbyte byte_field(int offset) const;
void byte_field_put(int offset, jbyte contents);
diff --git a/hotspot/src/share/vm/oops/markOop.cpp b/hotspot/src/share/vm/oops/markOop.cpp
index 5be365e..5e85944 100644
--- a/hotspot/src/share/vm/oops/markOop.cpp
+++ b/hotspot/src/share/vm/oops/markOop.cpp
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
void markOopDesc::print_on(outputStream* st) const {
diff --git a/hotspot/src/share/vm/oops/methodDataOop.hpp b/hotspot/src/share/vm/oops/methodDataOop.hpp
index 97c80a9..350590a 100644
--- a/hotspot/src/share/vm/oops/methodDataOop.hpp
+++ b/hotspot/src/share/vm/oops/methodDataOop.hpp
@@ -600,6 +600,11 @@ public:
uint taken() {
return uint_at(taken_off_set);
}
+
+ void set_taken(uint cnt) {
+ set_uint_at(taken_off_set, cnt);
+ }
+
// Saturating counter
uint inc_taken() {
uint cnt = taken() + 1;
@@ -926,6 +931,10 @@ public:
return uint_at(not_taken_off_set);
}
+ void set_not_taken(uint cnt) {
+ set_uint_at(not_taken_off_set, cnt);
+ }
+
uint inc_not_taken() {
uint cnt = not_taken() + 1;
// Did we wrap? Will compiler screw us??
diff --git a/hotspot/src/share/vm/oops/methodOop.cpp b/hotspot/src/share/vm/oops/methodOop.cpp
index 6575679..879ec01 100644
--- a/hotspot/src/share/vm/oops/methodOop.cpp
+++ b/hotspot/src/share/vm/oops/methodOop.cpp
@@ -914,6 +914,7 @@ methodHandle methodOopDesc::make_invoke_method(KlassHandle holder,
Symbol* name,
Symbol* signature,
Handle method_type, TRAPS) {
+ ResourceMark rm;
methodHandle empty;
assert(holder() == SystemDictionary::MethodHandle_klass(),
@@ -1267,12 +1268,19 @@ static void reorder_based_on_method_index(objArrayOop methods,
// Comparer for sorting an object array containing
// methodOops.
-template <class T>
-static int method_comparator(T a, T b) {
+// Used non-template method_comparator methods since
+// Visual Studio 2003 compiler generates incorrect
+// optimized code for it.
+static int method_comparator_narrowOop(narrowOop a, narrowOop b) {
methodOop m = (methodOop)oopDesc::decode_heap_oop_not_null(a);
methodOop n = (methodOop)oopDesc::decode_heap_oop_not_null(b);
return m->name()->fast_compare(n->name());
}
+static int method_comparator_oop(oop a, oop b) {
+ methodOop m = (methodOop)a;
+ methodOop n = (methodOop)b;
+ return m->name()->fast_compare(n->name());
+}
// This is only done during class loading, so it is OK to assume method_idnum matches the methods() array
void methodOopDesc::sort_methods(objArrayOop methods,
@@ -1298,9 +1306,9 @@ void methodOopDesc::sort_methods(objArrayOop methods,
{
No_Safepoint_Verifier nsv;
if (UseCompressedOops) {
- QuickSort::sort<narrowOop>((narrowOop*)(methods->base()), length, method_comparator<narrowOop>, idempotent);
+ QuickSort::sort<narrowOop>((narrowOop*)(methods->base()), length, method_comparator_narrowOop, idempotent);
} else {
- QuickSort::sort<oop>((oop*)(methods->base()), length, method_comparator<oop>, idempotent);
+ QuickSort::sort<oop>((oop*)(methods->base()), length, method_comparator_oop, idempotent);
}
if (UseConcMarkSweepGC) {
// For CMS we need to dirty the cards for the array
diff --git a/hotspot/src/share/vm/oops/oop.cpp b/hotspot/src/share/vm/oops/oop.cpp
index d8fa9b0..f836fb7 100644
--- a/hotspot/src/share/vm/oops/oop.cpp
+++ b/hotspot/src/share/vm/oops/oop.cpp
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
bool always_do_update_barrier = false;
diff --git a/hotspot/src/share/vm/oops/oop.hpp b/hotspot/src/share/vm/oops/oop.hpp
index c778f0d..4d2f453 100644
--- a/hotspot/src/share/vm/oops/oop.hpp
+++ b/hotspot/src/share/vm/oops/oop.hpp
@@ -214,8 +214,10 @@ class oopDesc {
// Access to fields in a instanceOop through these methods.
oop obj_field(int offset) const;
+ volatile oop obj_field_volatile(int offset) const;
void obj_field_put(int offset, oop value);
- void obj_field_raw_put(int offset, oop value);
+ void obj_field_put_raw(int offset, oop value);
+ void obj_field_put_volatile(int offset, oop value);
jbyte byte_field(int offset) const;
void byte_field_put(int offset, jbyte contents);
diff --git a/hotspot/src/share/vm/oops/oop.inline.hpp b/hotspot/src/share/vm/oops/oop.inline.hpp
index 01f001c..a050f96 100644
--- a/hotspot/src/share/vm/oops/oop.inline.hpp
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp
@@ -321,15 +321,25 @@ inline oop oopDesc::obj_field(int offset) const {
load_decode_heap_oop(obj_field_addr<narrowOop>(offset)) :
load_decode_heap_oop(obj_field_addr<oop>(offset));
}
+inline volatile oop oopDesc::obj_field_volatile(int offset) const {
+ volatile oop value = obj_field(offset);
+ OrderAccess::acquire();
+ return value;
+}
inline void oopDesc::obj_field_put(int offset, oop value) {
UseCompressedOops ? oop_store(obj_field_addr<narrowOop>(offset), value) :
oop_store(obj_field_addr<oop>(offset), value);
}
-inline void oopDesc::obj_field_raw_put(int offset, oop value) {
+inline void oopDesc::obj_field_put_raw(int offset, oop value) {
UseCompressedOops ?
encode_store_heap_oop(obj_field_addr<narrowOop>(offset), value) :
encode_store_heap_oop(obj_field_addr<oop>(offset), value);
}
+inline void oopDesc::obj_field_put_volatile(int offset, oop value) {
+ OrderAccess::release();
+ obj_field_put(offset, value);
+ OrderAccess::fence();
+}
inline jbyte oopDesc::byte_field(int offset) const { return (jbyte) *byte_field_addr(offset); }
inline void oopDesc::byte_field_put(int offset, jbyte contents) { *byte_field_addr(offset) = (jint) contents; }
diff --git a/hotspot/src/share/vm/oops/oopsHierarchy.cpp b/hotspot/src/share/vm/oops/oopsHierarchy.cpp
index 9509806..b7d2c35 100644
--- a/hotspot/src/share/vm/oops/oopsHierarchy.cpp
+++ b/hotspot/src/share/vm/oops/oopsHierarchy.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef CHECK_UNHANDLED_OOPS
diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.cpp b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
index 6338417..a3c58cd 100644
--- a/hotspot/src/share/vm/oops/typeArrayKlass.cpp
+++ b/hotspot/src/share/vm/oops/typeArrayKlass.cpp
@@ -76,7 +76,7 @@ klassOop typeArrayKlass::create_klass(BasicType type, int scale,
return k();
}
-typeArrayOop typeArrayKlass::allocate(int length, TRAPS) {
+typeArrayOop typeArrayKlass::allocate_common(int length, bool do_zero, TRAPS) {
assert(log2_element_size() >= 0, "bad scale");
if (length >= 0) {
if (length <= max_length()) {
@@ -84,7 +84,11 @@ typeArrayOop typeArrayKlass::allocate(int length, TRAPS) {
KlassHandle h_k(THREAD, as_klassOop());
typeArrayOop t;
CollectedHeap* ch = Universe::heap();
- t = (typeArrayOop)CollectedHeap::array_allocate(h_k, (int)size, length, CHECK_NULL);
+ if (do_zero) {
+ t = (typeArrayOop)CollectedHeap::array_allocate(h_k, (int)size, length, CHECK_NULL);
+ } else {
+ t = (typeArrayOop)CollectedHeap::array_allocate_nozero(h_k, (int)size, length, CHECK_NULL);
+ }
assert(t->is_parsable(), "Don't publish unless parsable");
return t;
} else {
diff --git a/hotspot/src/share/vm/oops/typeArrayKlass.hpp b/hotspot/src/share/vm/oops/typeArrayKlass.hpp
index 78a26be..0f53066 100644
--- a/hotspot/src/share/vm/oops/typeArrayKlass.hpp
+++ b/hotspot/src/share/vm/oops/typeArrayKlass.hpp
@@ -56,7 +56,8 @@ class typeArrayKlass : public arrayKlass {
bool compute_is_subtype_of(klassOop k);
// Allocation
- typeArrayOop allocate(int length, TRAPS);
+ typeArrayOop allocate_common(int length, bool do_zero, TRAPS);
+ typeArrayOop allocate(int length, TRAPS) { return allocate_common(length, true, THREAD); }
typeArrayOop allocate_permanent(int length, TRAPS); // used for class file structures
oop multi_allocate(int rank, jint* sizes, TRAPS);
diff --git a/hotspot/src/share/vm/oops/typeArrayOop.hpp b/hotspot/src/share/vm/oops/typeArrayOop.hpp
index e0133fd..292609e 100644
--- a/hotspot/src/share/vm/oops/typeArrayOop.hpp
+++ b/hotspot/src/share/vm/oops/typeArrayOop.hpp
@@ -51,6 +51,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "orderAccess_linux_ppc.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "orderAccess_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "orderAccess_bsd_zero.inline.hpp"
+#endif
// A typeArrayOop is an array containing basic types (non oop elements).
// It is used for arrays of {characters, singles, doubles, bytes, shorts, integers, longs}
diff --git a/hotspot/src/share/vm/opto/block.cpp b/hotspot/src/share/vm/opto/block.cpp
index 5514b97..02ef7f9 100644
--- a/hotspot/src/share/vm/opto/block.cpp
+++ b/hotspot/src/share/vm/opto/block.cpp
@@ -80,35 +80,37 @@ void Block_List::print() {
uint Block::code_alignment() {
// Check for Root block
- if( _pre_order == 0 ) return CodeEntryAlignment;
+ if (_pre_order == 0) return CodeEntryAlignment;
// Check for Start block
- if( _pre_order == 1 ) return InteriorEntryAlignment;
+ if (_pre_order == 1) return InteriorEntryAlignment;
// Check for loop alignment
- if (has_loop_alignment()) return loop_alignment();
+ if (has_loop_alignment()) return loop_alignment();
- return 1; // no particular alignment
+ return relocInfo::addr_unit(); // no particular alignment
}
uint Block::compute_loop_alignment() {
Node *h = head();
- if( h->is_Loop() && h->as_Loop()->is_inner_loop() ) {
+ int unit_sz = relocInfo::addr_unit();
+ if (h->is_Loop() && h->as_Loop()->is_inner_loop()) {
// Pre- and post-loops have low trip count so do not bother with
// NOPs for align loop head. The constants are hidden from tuning
// but only because my "divide by 4" heuristic surely gets nearly
// all possible gain (a "do not align at all" heuristic has a
// chance of getting a really tiny gain).
- if( h->is_CountedLoop() && (h->as_CountedLoop()->is_pre_loop() ||
- h->as_CountedLoop()->is_post_loop()) )
- return (OptoLoopAlignment > 4) ? (OptoLoopAlignment>>2) : 1;
+ if (h->is_CountedLoop() && (h->as_CountedLoop()->is_pre_loop() ||
+ h->as_CountedLoop()->is_post_loop())) {
+ return (OptoLoopAlignment > 4*unit_sz) ? (OptoLoopAlignment>>2) : unit_sz;
+ }
// Loops with low backedge frequency should not be aligned.
Node *n = h->in(LoopNode::LoopBackControl)->in(0);
- if( n->is_MachIf() && n->as_MachIf()->_prob < 0.01 ) {
- return 1; // Loop does not loop, more often than not!
+ if (n->is_MachIf() && n->as_MachIf()->_prob < 0.01) {
+ return unit_sz; // Loop does not loop, more often than not!
}
return OptoLoopAlignment; // Otherwise align loop head
}
- return 1; // no particular alignment
+ return unit_sz; // no particular alignment
}
//-----------------------------------------------------------------------------
@@ -165,7 +167,7 @@ int Block::is_Empty() const {
int end_idx = _nodes.size()-1;
// Check for ending goto
- if ((end_idx > 0) && (_nodes[end_idx]->is_Goto())) {
+ if ((end_idx > 0) && (_nodes[end_idx]->is_MachGoto())) {
success_result = empty_with_goto;
end_idx--;
}
@@ -197,11 +199,11 @@ int Block::is_Empty() const {
bool Block::has_uncommon_code() const {
Node* en = end();
- if (en->is_Goto())
+ if (en->is_MachGoto())
en = en->in(0);
if (en->is_Catch())
en = en->in(0);
- if (en->is_Proj() && en->in(0)->is_MachCall()) {
+ if (en->is_MachProj() && en->in(0)->is_MachCall()) {
MachCallNode* call = en->in(0)->as_MachCall();
if (call->cnt() != COUNT_UNKNOWN && call->cnt() <= PROB_UNLIKELY_MAG(4)) {
// This is true for slow-path stubs like new_{instance,array},
@@ -271,55 +273,55 @@ bool Block::is_uncommon( Block_Array &bbs ) const {
//------------------------------dump-------------------------------------------
#ifndef PRODUCT
-void Block::dump_bidx(const Block* orig) const {
- if (_pre_order) tty->print("B%d",_pre_order);
- else tty->print("N%d", head()->_idx);
+void Block::dump_bidx(const Block* orig, outputStream* st) const {
+ if (_pre_order) st->print("B%d",_pre_order);
+ else st->print("N%d", head()->_idx);
if (Verbose && orig != this) {
// Dump the original block's idx
- tty->print(" (");
- orig->dump_bidx(orig);
- tty->print(")");
+ st->print(" (");
+ orig->dump_bidx(orig, st);
+ st->print(")");
}
}
-void Block::dump_pred(const Block_Array *bbs, Block* orig) const {
+void Block::dump_pred(const Block_Array *bbs, Block* orig, outputStream* st) const {
if (is_connector()) {
for (uint i=1; i<num_preds(); i++) {
Block *p = ((*bbs)[pred(i)->_idx]);
- p->dump_pred(bbs, orig);
+ p->dump_pred(bbs, orig, st);
}
} else {
- dump_bidx(orig);
- tty->print(" ");
+ dump_bidx(orig, st);
+ st->print(" ");
}
}
-void Block::dump_head( const Block_Array *bbs ) const {
+void Block::dump_head( const Block_Array *bbs, outputStream* st ) const {
// Print the basic block
- dump_bidx(this);
- tty->print(": #\t");
+ dump_bidx(this, st);
+ st->print(": #\t");
// Print the incoming CFG edges and the outgoing CFG edges
for( uint i=0; i<_num_succs; i++ ) {
- non_connector_successor(i)->dump_bidx(_succs[i]);
- tty->print(" ");
+ non_connector_successor(i)->dump_bidx(_succs[i], st);
+ st->print(" ");
}
- tty->print("<- ");
+ st->print("<- ");
if( head()->is_block_start() ) {
for (uint i=1; i<num_preds(); i++) {
Node *s = pred(i);
if (bbs) {
Block *p = (*bbs)[s->_idx];
- p->dump_pred(bbs, p);
+ p->dump_pred(bbs, p, st);
} else {
while (!s->is_block_start())
s = s->in(0);
- tty->print("N%d ", s->_idx );
+ st->print("N%d ", s->_idx );
}
}
} else
- tty->print("BLOCK HEAD IS JUNK ");
+ st->print("BLOCK HEAD IS JUNK ");
// Print loop, if any
const Block *bhead = this; // Head of self-loop
@@ -330,24 +332,24 @@ void Block::dump_head( const Block_Array *bbs ) const {
while (bx->is_connector()) {
bx = (*bbs)[bx->pred(1)->_idx];
}
- tty->print("\tLoop: B%d-B%d ", bhead->_pre_order, bx->_pre_order);
+ st->print("\tLoop: B%d-B%d ", bhead->_pre_order, bx->_pre_order);
// Dump any loop-specific bits, especially for CountedLoops.
- loop->dump_spec(tty);
+ loop->dump_spec(st);
} else if (has_loop_alignment()) {
- tty->print(" top-of-loop");
+ st->print(" top-of-loop");
}
- tty->print(" Freq: %g",_freq);
+ st->print(" Freq: %g",_freq);
if( Verbose || WizardMode ) {
- tty->print(" IDom: %d/#%d", _idom ? _idom->_pre_order : 0, _dom_depth);
- tty->print(" RegPressure: %d",_reg_pressure);
- tty->print(" IHRP Index: %d",_ihrp_index);
- tty->print(" FRegPressure: %d",_freg_pressure);
- tty->print(" FHRP Index: %d",_fhrp_index);
+ st->print(" IDom: %d/#%d", _idom ? _idom->_pre_order : 0, _dom_depth);
+ st->print(" RegPressure: %d",_reg_pressure);
+ st->print(" IHRP Index: %d",_ihrp_index);
+ st->print(" FRegPressure: %d",_freg_pressure);
+ st->print(" FHRP Index: %d",_fhrp_index);
}
- tty->print_cr("");
+ st->print_cr("");
}
-void Block::dump() const { dump(0); }
+void Block::dump() const { dump(NULL); }
void Block::dump( const Block_Array *bbs ) const {
dump_head(bbs);
@@ -441,9 +443,9 @@ uint PhaseCFG::build_cfg() {
Block *bb = new (_bbs._arena) Block(_bbs._arena,p);
_bbs.map(p->_idx,bb);
_bbs.map(x->_idx,bb);
- if( x != p ) // Only for root is x == p
+ if( x != p ) { // Only for root is x == p
bb->_nodes.push((Node*)x);
-
+ }
// Now handle predecessors
++sum; // Count 1 for self block
uint cnt = bb->num_preds();
@@ -837,7 +839,7 @@ void PhaseCFG::fixup_flow() {
// Make sure we TRUE branch to the target
if( proj0->Opcode() == Op_IfFalse ) {
- iff->negate();
+ iff->as_MachIf()->negate();
}
b->_nodes.pop(); // Remove IfFalse & IfTrue projections
@@ -945,8 +947,8 @@ void PhaseCFG::verify( ) const {
assert( bp, "last instruction must be a block proj" );
assert( bp == b->_nodes[j], "wrong number of successors for this block" );
if( bp->is_Catch() ) {
- while( b->_nodes[--j]->Opcode() == Op_MachProj ) ;
- assert( b->_nodes[j]->is_Call(), "CatchProj must follow call" );
+ while( b->_nodes[--j]->is_MachProj() ) ;
+ assert( b->_nodes[j]->is_MachCall(), "CatchProj must follow call" );
}
else if( bp->is_Mach() && bp->as_Mach()->ideal_Opcode() == Op_If ) {
assert( b->_num_succs == 2, "Conditional branch must have two targets");
@@ -1105,7 +1107,7 @@ static int edge_order(CFGEdge **e0, CFGEdge **e1) {
//------------------------------trace_frequency_order--------------------------
// Comparison function for edges
-static int trace_frequency_order(const void *p0, const void *p1) {
+extern "C" int trace_frequency_order(const void *p0, const void *p1) {
Trace *tr0 = *(Trace **) p0;
Trace *tr1 = *(Trace **) p1;
Block *b0 = tr0->first_block();
diff --git a/hotspot/src/share/vm/opto/block.hpp b/hotspot/src/share/vm/opto/block.hpp
index bb87812..51869c8 100644
--- a/hotspot/src/share/vm/opto/block.hpp
+++ b/hotspot/src/share/vm/opto/block.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -45,6 +45,7 @@ struct Tarjan;
// Note that the constructor just zeros things, and since I use Arena
// allocation I do not need a destructor to reclaim storage.
class Block_Array : public ResourceObj {
+ friend class VMStructs;
uint _size; // allocated size, as opposed to formal limit
debug_only(uint _limit;) // limit to formal domain
protected:
@@ -72,6 +73,7 @@ public:
class Block_List : public Block_Array {
+ friend class VMStructs;
public:
uint _cnt;
Block_List() : Block_Array(Thread::current()->resource_area()), _cnt(0) {}
@@ -87,6 +89,7 @@ public:
class CFGElement : public ResourceObj {
+ friend class VMStructs;
public:
float _freq; // Execution frequency (estimate)
@@ -102,6 +105,7 @@ class CFGElement : public ResourceObj {
// Basic blocks are used during the output routines, and are not used during
// any optimization pass. They are created late in the game.
class Block : public CFGElement {
+ friend class VMStructs;
public:
// Nodes in this block, in order
Node_List _nodes;
@@ -329,10 +333,10 @@ class Block : public CFGElement {
#ifndef PRODUCT
// Debugging print of basic block
- void dump_bidx(const Block* orig) const;
- void dump_pred(const Block_Array *bbs, Block* orig) const;
- void dump_head( const Block_Array *bbs ) const;
- void dump( ) const;
+ void dump_bidx(const Block* orig, outputStream* st = tty) const;
+ void dump_pred(const Block_Array *bbs, Block* orig, outputStream* st = tty) const;
+ void dump_head( const Block_Array *bbs, outputStream* st = tty ) const;
+ void dump() const;
void dump( const Block_Array *bbs ) const;
#endif
};
@@ -341,6 +345,7 @@ class Block : public CFGElement {
//------------------------------PhaseCFG---------------------------------------
// Build an array of Basic Block pointers, one per Node.
class PhaseCFG : public Phase {
+ friend class VMStructs;
private:
// Build a proper looking cfg. Return count of basic blocks
uint build_cfg();
@@ -515,6 +520,7 @@ public:
//------------------------------CFGLoop-------------------------------------------
class CFGLoop : public CFGElement {
+ friend class VMStructs;
int _id;
int _depth;
CFGLoop *_parent; // root of loop tree is the method level "pseudo" loop, it's parent is null
@@ -566,6 +572,7 @@ class CFGLoop : public CFGElement {
// A edge between two basic blocks that will be embodied by a branch or a
// fall-through.
class CFGEdge : public ResourceObj {
+ friend class VMStructs;
private:
Block * _from; // Source basic block
Block * _to; // Destination basic block
@@ -702,6 +709,7 @@ class Trace : public ResourceObj {
//------------------------------PhaseBlockLayout-------------------------------
// Rearrange blocks into some canonical order, based on edges and their frequencies
class PhaseBlockLayout : public Phase {
+ friend class VMStructs;
PhaseCFG &_cfg; // Control flow graph
GrowableArray<CFGEdge *> *edges;
diff --git a/hotspot/src/share/vm/opto/bytecodeInfo.cpp b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
index 398f8f8..7175427 100644
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp
@@ -45,7 +45,7 @@ InlineTree::InlineTree(Compile* c,
_method(callee),
_site_invoke_ratio(site_invoke_ratio),
_max_inline_level(max_inline_level),
- _count_inline_bcs(method()->code_size())
+ _count_inline_bcs(method()->code_size_for_inlining())
{
NOT_PRODUCT(_count_inlines = 0;)
if (_caller_jvms != NULL) {
@@ -107,7 +107,7 @@ const char* InlineTree::should_inline(ciMethod* callee_method, ciMethod* caller_
// positive filter: should send be inlined? returns NULL (--> yes)
// or rejection msg
- int size = callee_method->code_size();
+ int size = callee_method->code_size_for_inlining();
// Check for too many throws (and not too huge)
if(callee_method->interpreter_throwout_count() > InlineThrowCount &&
@@ -141,7 +141,21 @@ const char* InlineTree::should_inline(ciMethod* callee_method, ciMethod* caller_
assert(mha_profile, "must exist");
CounterData* cd = mha_profile->as_CounterData();
invoke_count = cd->count();
- call_site_count = invoke_count; // use the same value
+ if (invoke_count == 0) {
+ return "method handle not reached";
+ }
+
+ if (_caller_jvms != NULL && _caller_jvms->method() != NULL &&
+ _caller_jvms->method()->method_data() != NULL &&
+ !_caller_jvms->method()->method_data()->is_empty()) {
+ ciMethodData* mdo = _caller_jvms->method()->method_data();
+ ciProfileData* mha_profile = mdo->bci_to_data(_caller_jvms->bci());
+ assert(mha_profile, "must exist");
+ CounterData* cd = mha_profile->as_CounterData();
+ call_site_count = cd->count();
+ } else {
+ call_site_count = invoke_count; // use the same value
+ }
}
assert(invoke_count != 0, "require invocation count greater than zero");
@@ -244,7 +258,7 @@ const char* InlineTree::should_not_inline(ciMethod *callee_method, ciMethod* cal
}
// use frequency-based objections only for non-trivial methods
- if (callee_method->code_size() <= MaxTrivialSize) return NULL;
+ if (callee_method->code_size_for_inlining() <= MaxTrivialSize) return NULL;
// don't use counts with -Xcomp or CTW
if (UseInterpreter && !CompileTheWorld) {
@@ -305,7 +319,7 @@ const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_
}
// suppress a few checks for accessors and trivial methods
- if (callee_method->code_size() > MaxTrivialSize) {
+ if (callee_method->code_size_for_inlining() > MaxTrivialSize) {
// don't inline into giant methods
if (C->unique() > (uint)NodeCountInliningCutoff) {
@@ -349,7 +363,7 @@ const char* InlineTree::try_to_inline(ciMethod* callee_method, ciMethod* caller_
}
}
- int size = callee_method->code_size();
+ int size = callee_method->code_size_for_inlining();
if (UseOldInlining && ClipInlining
&& (int)count_inline_bcs() + size >= DesiredMethodLimit) {
@@ -394,6 +408,16 @@ bool pass_initial_checks(ciMethod* caller_method, int caller_bci, ciMethod* call
return true;
}
+//------------------------------check_can_parse--------------------------------
+const char* InlineTree::check_can_parse(ciMethod* callee) {
+ // Certain methods cannot be parsed at all:
+ if ( callee->is_native()) return "native method";
+ if (!callee->can_be_compiled()) return "not compilable (disabled)";
+ if (!callee->has_balanced_monitors()) return "not compilable (unbalanced monitors)";
+ if ( callee->get_flow_analysis()->failing()) return "not compilable (flow analysis failed)";
+ return NULL;
+}
+
//------------------------------print_inlining---------------------------------
// Really, the failure_msg can be a success message also.
void InlineTree::print_inlining(ciMethod* callee_method, int caller_bci, const char* failure_msg) const {
@@ -423,14 +447,22 @@ WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms,
int caller_bci = jvms->bci();
ciMethod *caller_method = jvms->method();
- if( !pass_initial_checks(caller_method, caller_bci, callee_method)) {
- if( PrintInlining ) {
+ // Do some initial checks.
+ if (!pass_initial_checks(caller_method, caller_bci, callee_method)) {
+ if (PrintInlining) {
failure_msg = "failed_initial_checks";
- print_inlining( callee_method, caller_bci, failure_msg);
+ print_inlining(callee_method, caller_bci, failure_msg);
}
return NULL;
}
+ // Do some parse checks.
+ failure_msg = check_can_parse(callee_method);
+ if (failure_msg != NULL) {
+ if (PrintInlining) print_inlining(callee_method, caller_bci, failure_msg);
+ return NULL;
+ }
+
// Check if inlining policy says no.
WarmCallInfo wci = *(initial_wci);
failure_msg = try_to_inline(callee_method, caller_method, caller_bci, profile, &wci);
@@ -471,7 +503,7 @@ WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms,
if (failure_msg == NULL) failure_msg = "inline (hot)";
// Inline!
- if( PrintInlining ) print_inlining( callee_method, caller_bci, failure_msg);
+ if (PrintInlining) print_inlining(callee_method, caller_bci, failure_msg);
if (UseOldInlining)
build_inline_tree_for_callee(callee_method, jvms, caller_bci);
if (InlineWarmCalls && !wci.is_hot())
@@ -481,7 +513,7 @@ WarmCallInfo* InlineTree::ok_to_inline(ciMethod* callee_method, JVMState* jvms,
// Do not inline
if (failure_msg == NULL) failure_msg = "too cold to inline";
- if( PrintInlining ) print_inlining( callee_method, caller_bci, failure_msg);
+ if (PrintInlining) print_inlining(callee_method, caller_bci, failure_msg);
return NULL;
}
@@ -578,3 +610,22 @@ InlineTree* InlineTree::find_subtree_from_root(InlineTree* root, JVMState* jvms,
}
return iltp;
}
+
+
+
+#ifndef PRODUCT
+void InlineTree::print_impl(outputStream* st, int indent) const {
+ for (int i = 0; i < indent; i++) st->print(" ");
+ st->print(" @ %d ", caller_bci());
+ method()->print_short_name(st);
+ st->cr();
+
+ for (int i = 0 ; i < _subtrees.length(); i++) {
+ _subtrees.at(i)->print_impl(st, indent + 2);
+ }
+}
+
+void InlineTree::print_value_on(outputStream* st) const {
+ print_impl(st, 2);
+}
+#endif
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index 84a7d02..827e76e 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "c2_globals_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "c2_globals_bsd.hpp"
+#endif
//
// Defines all globals flags used by the server compiler.
diff --git a/hotspot/src/share/vm/opto/callGenerator.cpp b/hotspot/src/share/vm/opto/callGenerator.cpp
index fb91f57..150aa92 100644
--- a/hotspot/src/share/vm/opto/callGenerator.cpp
+++ b/hotspot/src/share/vm/opto/callGenerator.cpp
@@ -24,6 +24,7 @@
#include "precompiled.hpp"
#include "ci/bcEscapeAnalyzer.hpp"
+#include "ci/ciCallSite.hpp"
#include "ci/ciCPCache.hpp"
#include "ci/ciMethodHandle.hpp"
#include "classfile/javaClasses.hpp"
@@ -60,12 +61,9 @@ public:
{
_is_osr = is_osr;
_expected_uses = expected_uses;
- assert(can_parse(method, is_osr), "parse must be possible");
+ assert(InlineTree::check_can_parse(method) == NULL, "parse must be possible");
}
- // Can we build either an OSR or a regular parser for this method?
- static bool can_parse(ciMethod* method, int is_osr = false);
-
virtual bool is_parse() const { return true; }
virtual JVMState* generate(JVMState* jvms);
int is_osr() { return _is_osr; }
@@ -151,7 +149,6 @@ JVMState* DirectCallGenerator::generate(JVMState* jvms) {
call->set_optimized_virtual(true);
if (method()->is_method_handle_invoke()) {
call->set_method_handle_invoke(true);
- kit.C->set_has_method_handle_invokes(true);
}
}
kit.set_arguments_for_java_call(call);
@@ -209,7 +206,6 @@ JVMState* DynamicCallGenerator::generate(JVMState* jvms) {
call->set_optimized_virtual(true);
// Take extra care (in the presence of argument motion) not to trash the SP:
call->set_method_handle_invoke(true);
- kit.C->set_has_method_handle_invokes(true);
// Pass the target MethodHandle as first argument and shift the
// other arguments.
@@ -302,20 +298,8 @@ JVMState* VirtualCallGenerator::generate(JVMState* jvms) {
return kit.transfer_exceptions_into_jvms();
}
-bool ParseGenerator::can_parse(ciMethod* m, int entry_bci) {
- // Certain methods cannot be parsed at all:
- if (!m->can_be_compiled()) return false;
- if (!m->has_balanced_monitors()) return false;
- if (m->get_flow_analysis()->failing()) return false;
-
- // (Methods may bail out for other reasons, after the parser is run.
- // We try to avoid this, but if forced, we must return (Node*)NULL.
- // The user of the CallGenerator must check for this condition.)
- return true;
-}
-
CallGenerator* CallGenerator::for_inline(ciMethod* m, float expected_uses) {
- if (!ParseGenerator::can_parse(m)) return NULL;
+ if (InlineTree::check_can_parse(m) != NULL) return NULL;
return new ParseGenerator(m, expected_uses);
}
@@ -323,7 +307,7 @@ CallGenerator* CallGenerator::for_inline(ciMethod* m, float expected_uses) {
// for the method execution already in progress, not just the JVMS
// of the caller. Thus, this CallGenerator cannot be mixed with others!
CallGenerator* CallGenerator::for_osr(ciMethod* m, int osr_bci) {
- if (!ParseGenerator::can_parse(m, true)) return NULL;
+ if (InlineTree::check_can_parse(m) != NULL) return NULL;
float past_uses = m->interpreter_invocation_count();
float expected_uses = past_uses;
return new ParseGenerator(m, expected_uses, true);
@@ -335,7 +319,7 @@ CallGenerator* CallGenerator::for_direct_call(ciMethod* m, bool separate_io_proj
}
CallGenerator* CallGenerator::for_dynamic_call(ciMethod* m) {
- assert(m->is_method_handle_invoke(), "for_dynamic_call mismatch");
+ assert(m->is_method_handle_invoke() || m->is_method_handle_adapter(), "for_dynamic_call mismatch");
return new DynamicCallGenerator(m);
}
@@ -714,24 +698,63 @@ CallGenerator* CallGenerator::for_method_handle_inline(Node* method_handle, JVMS
// Get an adapter for the MethodHandle.
ciMethod* target_method = method_handle->get_method_handle_adapter();
if (target_method != NULL) {
- CallGenerator* hit_cg = Compile::current()->call_generator(target_method, -1, false, jvms, true, 1);
- if (hit_cg != NULL && hit_cg->is_inline())
- return hit_cg;
+ CallGenerator* cg = Compile::current()->call_generator(target_method, -1, false, jvms, true, PROB_ALWAYS);
+ if (cg != NULL && cg->is_inline())
+ return cg;
}
} else if (method_handle->Opcode() == Op_Phi && method_handle->req() == 3 &&
method_handle->in(1)->Opcode() == Op_ConP && method_handle->in(2)->Opcode() == Op_ConP) {
+ float prob = PROB_FAIR;
+ Node* meth_region = method_handle->in(0);
+ if (meth_region->is_Region() &&
+ meth_region->in(1)->is_Proj() && meth_region->in(2)->is_Proj() &&
+ meth_region->in(1)->in(0) == meth_region->in(2)->in(0) &&
+ meth_region->in(1)->in(0)->is_If()) {
+ // If diamond, so grab the probability of the test to drive the inlining below
+ prob = meth_region->in(1)->in(0)->as_If()->_prob;
+ if (meth_region->in(1)->is_IfTrue()) {
+ prob = 1 - prob;
+ }
+ }
+
// selectAlternative idiom merging two constant MethodHandles.
// Generate a guard so that each can be inlined. We might want to
// do more inputs at later point but this gets the most common
// case.
- const TypeOopPtr* oop_ptr = method_handle->in(1)->bottom_type()->is_oopptr();
- ciObject* const_oop = oop_ptr->const_oop();
- ciMethodHandle* mh = const_oop->as_method_handle();
-
- CallGenerator* cg1 = for_method_handle_inline(method_handle->in(1), jvms, caller, callee, profile);
- CallGenerator* cg2 = for_method_handle_inline(method_handle->in(2), jvms, caller, callee, profile);
+ CallGenerator* cg1 = for_method_handle_inline(method_handle->in(1), jvms, caller, callee, profile.rescale(1.0 - prob));
+ CallGenerator* cg2 = for_method_handle_inline(method_handle->in(2), jvms, caller, callee, profile.rescale(prob));
if (cg1 != NULL && cg2 != NULL) {
- return new PredictedDynamicCallGenerator(mh, cg2, cg1, PROB_FAIR);
+ const TypeOopPtr* oop_ptr = method_handle->in(1)->bottom_type()->is_oopptr();
+ ciObject* const_oop = oop_ptr->const_oop();
+ ciMethodHandle* mh = const_oop->as_method_handle();
+ return new PredictedDynamicCallGenerator(mh, cg2, cg1, prob);
+ }
+ }
+ return NULL;
+}
+
+
+CallGenerator* CallGenerator::for_invokedynamic_inline(ciCallSite* call_site, JVMState* jvms,
+ ciMethod* caller, ciMethod* callee, ciCallProfile profile) {
+ ciMethodHandle* method_handle = call_site->get_target();
+
+ // Set the callee to have access to the class and signature in the
+ // MethodHandleCompiler.
+ method_handle->set_callee(callee);
+ method_handle->set_caller(caller);
+ method_handle->set_call_profile(profile);
+
+ // Get an adapter for the MethodHandle.
+ ciMethod* target_method = method_handle->get_invokedynamic_adapter();
+ if (target_method != NULL) {
+ Compile *C = Compile::current();
+ CallGenerator* cg = C->call_generator(target_method, -1, false, jvms, true, PROB_ALWAYS);
+ if (cg != NULL && cg->is_inline()) {
+ // Add a dependence for invalidation of the optimization.
+ if (!call_site->is_constant_call_site()) {
+ C->dependencies()->assert_call_site_target_value(call_site, method_handle);
+ }
+ return cg;
}
}
return NULL;
diff --git a/hotspot/src/share/vm/opto/callGenerator.hpp b/hotspot/src/share/vm/opto/callGenerator.hpp
index cdefb59..d95ba2b 100644
--- a/hotspot/src/share/vm/opto/callGenerator.hpp
+++ b/hotspot/src/share/vm/opto/callGenerator.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -111,7 +111,8 @@ class CallGenerator : public ResourceObj {
static CallGenerator* for_dynamic_call(ciMethod* m); // invokedynamic
static CallGenerator* for_virtual_call(ciMethod* m, int vtable_index); // virtual, interface
- static CallGenerator* for_method_handle_inline(Node* method_handle, JVMState* jvms, ciMethod* caller, ciMethod* callee, ciCallProfile profile);
+ static CallGenerator* for_method_handle_inline(Node* method_handle, JVMState* jvms, ciMethod* caller, ciMethod* callee, ciCallProfile profile);
+ static CallGenerator* for_invokedynamic_inline(ciCallSite* call_site, JVMState* jvms, ciMethod* caller, ciMethod* callee, ciCallProfile profile);
// How to generate a replace a direct call with an inline version
static CallGenerator* for_late_inline(ciMethod* m, CallGenerator* inline_cg);
diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/hotspot/src/share/vm/opto/callnode.hpp
index 774b4b8..6e81a7e 100644
--- a/hotspot/src/share/vm/opto/callnode.hpp
+++ b/hotspot/src/share/vm/opto/callnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -67,7 +67,6 @@ public:
const TypeTuple *_domain;
StartNode( Node *root, const TypeTuple *domain ) : MultiNode(2), _domain(domain) {
init_class_id(Class_Start);
- init_flags(Flag_is_block_start);
init_req(0,this);
init_req(1,root);
}
@@ -188,6 +187,7 @@ public:
// This provides a way to map the optimized program back into the interpreter,
// or to let the GC mark the stack.
class JVMState : public ResourceObj {
+ friend class VMStructs;
public:
typedef enum {
Reexecute_Undefined = -1, // not defined -- will be translated into false later
@@ -501,6 +501,7 @@ public:
// Call nodes now subsume the function of debug nodes at callsites, so they
// contain the functionality of a full scope chain of debug nodes.
class CallNode : public SafePointNode {
+ friend class VMStructs;
public:
const TypeFunc *_tf; // Function type
address _entry_point; // Address of method being called
@@ -513,7 +514,6 @@ public:
_cnt(COUNT_UNKNOWN)
{
init_class_id(Class_Call);
- init_flags(Flag_is_Call);
}
const TypeFunc* tf() const { return _tf; }
@@ -567,6 +567,7 @@ public:
// convention. (The "Java" calling convention is the compiler's calling
// convention, as opposed to the interpreter's or that of native C.)
class CallJavaNode : public CallNode {
+ friend class VMStructs;
protected:
virtual uint cmp( const Node &n ) const;
virtual uint size_of() const; // Size is bigger
diff --git a/hotspot/src/share/vm/opto/cfgnode.cpp b/hotspot/src/share/vm/opto/cfgnode.cpp
index 49d3070..c8e45b6 100644
--- a/hotspot/src/share/vm/opto/cfgnode.cpp
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp
@@ -1349,17 +1349,9 @@ static Node* is_absolute( PhaseGVN *phase, PhiNode *phi_root, int true_path) {
static void split_once(PhaseIterGVN *igvn, Node *phi, Node *val, Node *n, Node *newn) {
igvn->hash_delete(n); // Remove from hash before hacking edges
- Node* predicate_proj = NULL;
uint j = 1;
for (uint i = phi->req()-1; i > 0; i--) {
if (phi->in(i) == val) { // Found a path with val?
- if (n->is_Region()) {
- Node* proj = PhaseIdealLoop::find_predicate(n->in(i));
- if (proj != NULL) {
- assert(predicate_proj == NULL, "only one predicate entry expected");
- predicate_proj = proj;
- }
- }
// Add to NEW Region/Phi, no DU info
newn->set_req( j++, n->in(i) );
// Remove from OLD Region/Phi
@@ -1371,11 +1363,6 @@ static void split_once(PhaseIterGVN *igvn, Node *phi, Node *val, Node *n, Node *
// entire Region/Phi conglomerate has been hacked as a single huge transform.
igvn->register_new_node_with_optimizer( newn );
- // Clone loop predicates
- if (predicate_proj != NULL) {
- newn = igvn->clone_loop_predicates(predicate_proj, newn, !n->is_CountedLoop());
- }
-
// Now I can point to the new node.
n->add_req(newn);
igvn->_worklist.push(n);
@@ -1404,13 +1391,18 @@ static Node* split_flow_path(PhaseGVN *phase, PhiNode *phi) {
Node *val = phi->in(i); // Constant to split for
uint hit = 0; // Number of times it occurs
+ Node *r = phi->region();
for( ; i < phi->req(); i++ ){ // Count occurrences of constant
Node *n = phi->in(i);
if( !n ) return NULL;
if( phase->type(n) == Type::TOP ) return NULL;
- if( phi->in(i) == val )
+ if( phi->in(i) == val ) {
hit++;
+ if (PhaseIdealLoop::find_predicate(r->in(i)) != NULL) {
+ return NULL; // don't split loop entry path
+ }
+ }
}
if( hit <= 1 || // Make sure we find 2 or more
@@ -1420,7 +1412,6 @@ static Node* split_flow_path(PhaseGVN *phase, PhiNode *phi) {
// Now start splitting out the flow paths that merge the same value.
// Split first the RegionNode.
PhaseIterGVN *igvn = phase->is_IterGVN();
- Node *r = phi->region();
RegionNode *newr = new (phase->C, hit+1) RegionNode(hit+1);
split_once(igvn, phi, val, r, newr);
diff --git a/hotspot/src/share/vm/opto/cfgnode.hpp b/hotspot/src/share/vm/opto/cfgnode.hpp
index 71bc2ab..a51d78b 100644
--- a/hotspot/src/share/vm/opto/cfgnode.hpp
+++ b/hotspot/src/share/vm/opto/cfgnode.hpp
@@ -217,9 +217,7 @@ public:
// GotoNodes perform direct branches.
class GotoNode : public Node {
public:
- GotoNode( Node *control ) : Node(control) {
- init_flags(Flag_is_Goto);
- }
+ GotoNode( Node *control ) : Node(control) {}
virtual int Opcode() const;
virtual bool pinned() const { return true; }
virtual bool is_CFG() const { return true; }
diff --git a/hotspot/src/share/vm/opto/chaitin.hpp b/hotspot/src/share/vm/opto/chaitin.hpp
index e379c0c..999a792 100644
--- a/hotspot/src/share/vm/opto/chaitin.hpp
+++ b/hotspot/src/share/vm/opto/chaitin.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -50,6 +50,7 @@ class PhaseChaitin;
//------------------------------LRG--------------------------------------------
// Live-RanGe structure.
class LRG : public ResourceObj {
+ friend class VMStructs;
public:
enum { SPILL_REG=29999 }; // Register number of a spilled LRG
@@ -181,6 +182,7 @@ public:
// Map Node indices to Live RanGe indices.
// Array lookup in the optimized case.
class LRG_List : public ResourceObj {
+ friend class VMStructs;
uint _cnt, _max;
uint* _lidxs;
ReallocMark _nesting; // assertion check for reallocations
@@ -211,6 +213,7 @@ public:
// abstract! It needs abstraction so I can fiddle with the implementation to
// get even more speed.
class PhaseIFG : public Phase {
+ friend class VMStructs;
// Current implementation: a triangular adjacency list.
// Array of adjacency-lists, indexed by live-range number
@@ -294,6 +297,7 @@ public:
//------------------------------Chaitin----------------------------------------
// Briggs-Chaitin style allocation, mostly.
class PhaseChaitin : public PhaseRegAlloc {
+ friend class VMStructs;
int _trip_cnt;
int _alternate;
@@ -482,6 +486,7 @@ private:
}
int yank_if_dead( Node *old, Block *current_block, Node_List *value, Node_List *regnd );
+ int yank( Node *old, Block *current_block, Node_List *value, Node_List *regnd );
int elide_copy( Node *n, int k, Block *current_block, Node_List &value, Node_List ®nd, bool can_change_regs );
int use_prior_register( Node *copy, uint idx, Node *def, Block *current_block, Node_List &value, Node_List ®nd );
bool may_be_copy_of_callee( Node *def ) const;
diff --git a/hotspot/src/share/vm/opto/classes.hpp b/hotspot/src/share/vm/opto/classes.hpp
index 46f1b84..dbece76 100644
--- a/hotspot/src/share/vm/opto/classes.hpp
+++ b/hotspot/src/share/vm/opto/classes.hpp
@@ -161,8 +161,10 @@ macro(Mach)
macro(MachProj)
macro(MaxI)
macro(MemBarAcquire)
+macro(MemBarAcquireLock)
macro(MemBarCPUOrder)
macro(MemBarRelease)
+macro(MemBarReleaseLock)
macro(MemBarVolatile)
macro(MergeMem)
macro(MinI)
@@ -194,6 +196,7 @@ macro(Phi)
macro(PopCountI)
macro(PopCountL)
macro(PowD)
+macro(PrefetchAllocation)
macro(PrefetchRead)
macro(PrefetchWrite)
macro(Proj)
diff --git a/hotspot/src/share/vm/opto/coalesce.cpp b/hotspot/src/share/vm/opto/coalesce.cpp
index bc4d1fd..0811ea0 100644
--- a/hotspot/src/share/vm/opto/coalesce.cpp
+++ b/hotspot/src/share/vm/opto/coalesce.cpp
@@ -139,7 +139,7 @@ int PhaseChaitin::clone_projs( Block *b, uint idx, Node *con, Node *copy, uint &
Block *bcon = _cfg._bbs[con->_idx];
uint cindex = bcon->find_node(con);
Node *con_next = bcon->_nodes[cindex+1];
- if( con_next->in(0) != con || con_next->Opcode() != Op_MachProj )
+ if( con_next->in(0) != con || !con_next->is_MachProj() )
return false; // No MachProj's follow
// Copy kills after the cloned constant
@@ -312,7 +312,7 @@ void PhaseAggressiveCoalesce::insert_copy_with_overlap( Block *b, Node *copy, ui
// parallel renaming effort.
if( n->_idx < _unique ) break;
uint idx = n->is_Copy();
- assert( idx || n->is_Con() || n->Opcode() == Op_MachProj, "Only copies during parallel renaming" );
+ assert( idx || n->is_Con() || n->is_MachProj(), "Only copies during parallel renaming" );
if( idx && _phc.Find(n->in(idx)) == dst_name ) break;
i--;
}
@@ -329,7 +329,7 @@ void PhaseAggressiveCoalesce::insert_copy_with_overlap( Block *b, Node *copy, ui
// Check for end of virtual copies; this is also the end of the
// parallel renaming effort.
if( n->_idx < _unique ) break;
- assert( n->is_Copy() || n->is_Con() || n->Opcode() == Op_MachProj, "Only copies during parallel renaming" );
+ assert( n->is_Copy() || n->is_Con() || n->is_MachProj(), "Only copies during parallel renaming" );
if( _phc.Find(n) == src_name ) {
kill_src_idx = i;
break;
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index bfaa98b..2f0f294 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -517,7 +517,20 @@ uint Compile::scratch_emit_size(const Node* n) {
buf.stubs()->initialize_shared_locs( &locs_buf[lsize * 2], lsize);
// Do the emission.
+
+ Label fakeL; // Fake label for branch instructions.
+ Label* saveL = NULL;
+ uint save_bnum = 0;
+ bool is_branch = n->is_MachBranch();
+ if (is_branch) {
+ MacroAssembler masm(&buf);
+ masm.bind(fakeL);
+ n->as_MachBranch()->save_label(&saveL, &save_bnum);
+ n->as_MachBranch()->label_set(&fakeL, 0);
+ }
n->emit(buf, this->regalloc());
+ if (is_branch) // Restore label.
+ n->as_MachBranch()->label_set(saveL, save_bnum);
// End scratch_emit_size section.
set_in_scratch_emit_size(false);
@@ -804,7 +817,6 @@ Compile::Compile( ciEnv* ci_env, C2Compiler* compiler, ciMethod* target, int osr
&_handler_table, &_inc_table,
compiler,
env()->comp_level(),
- true, /*has_debug_info*/
has_unsafe_access()
);
}
diff --git a/hotspot/src/share/vm/opto/compile.hpp b/hotspot/src/share/vm/opto/compile.hpp
index b2d8189..82e33a9 100644
--- a/hotspot/src/share/vm/opto/compile.hpp
+++ b/hotspot/src/share/vm/opto/compile.hpp
@@ -80,6 +80,8 @@ class WarmCallInfo;
// This class defines a top-level Compiler invocation.
class Compile : public Phase {
+ friend class VMStructs;
+
public:
// Fixed alias indexes. (See also MergeMemNode.)
enum {
@@ -785,11 +787,14 @@ class Compile : public Phase {
// Process an OopMap Element while emitting nodes
void Process_OopMap_Node(MachNode *mach, int code_offset);
+ // Initialize code buffer
+ CodeBuffer* init_buffer(uint* blk_starts);
+
// Write out basic block data to code buffer
- void Fill_buffer();
+ void fill_buffer(CodeBuffer* cb, uint* blk_starts);
// Determine which variable sized branches can be shortened
- void Shorten_branches(Label *labels, int& code_size, int& reloc_size, int& stub_size);
+ void shorten_branches(uint* blk_starts, int& code_size, int& reloc_size, int& stub_size);
// Compute the size of first NumberOfLoopInstrToAlign instructions
// at the head of a loop.
diff --git a/hotspot/src/share/vm/opto/connode.hpp b/hotspot/src/share/vm/opto/connode.hpp
index 9d3e094..78a4427 100644
--- a/hotspot/src/share/vm/opto/connode.hpp
+++ b/hotspot/src/share/vm/opto/connode.hpp
@@ -496,14 +496,6 @@ public:
virtual bool depends_only_on_test() const { return false; }
};
-//------------------------------MemMoveNode------------------------------------
-// Memory to memory move. Inserted very late, after allocation.
-class MemMoveNode : public Node {
-public:
- MemMoveNode( Node *dst, Node *src ) : Node(0,dst,src) {}
- virtual int Opcode() const;
-};
-
//------------------------------ThreadLocalNode--------------------------------
// Ideal Node which returns the base of ThreadLocalStorage.
class ThreadLocalNode : public Node {
diff --git a/hotspot/src/share/vm/opto/doCall.cpp b/hotspot/src/share/vm/opto/doCall.cpp
index c1b25d8..b3c405f 100644
--- a/hotspot/src/share/vm/opto/doCall.cpp
+++ b/hotspot/src/share/vm/opto/doCall.cpp
@@ -114,7 +114,7 @@ CallGenerator* Compile::call_generator(ciMethod* call_method, int vtable_index,
if (cg != NULL) return cg;
}
- // Do MethodHandle calls.
+ // Do method handle calls.
// NOTE: This must happen before normal inlining logic below since
// MethodHandle.invoke* are native methods which obviously don't
// have bytecodes and so normal inlining fails.
@@ -127,33 +127,19 @@ CallGenerator* Compile::call_generator(ciMethod* call_method, int vtable_index,
if (cg != NULL) {
return cg;
}
-
return CallGenerator::for_direct_call(call_method);
}
else {
- // Get the MethodHandle from the CallSite.
+ // Get the CallSite object.
ciMethod* caller_method = jvms->method();
ciBytecodeStream str(caller_method);
str.force_bci(jvms->bci()); // Set the stream to the invokedynamic bci.
- ciCallSite* call_site = str.get_call_site();
- ciMethodHandle* method_handle = call_site->get_target();
-
- // Set the callee to have access to the class and signature in
- // the MethodHandleCompiler.
- method_handle->set_callee(call_method);
- method_handle->set_caller(caller);
- method_handle->set_call_profile(profile);
-
- // Get an adapter for the MethodHandle.
- ciMethod* target_method = method_handle->get_invokedynamic_adapter();
- if (target_method != NULL) {
- CallGenerator* hit_cg = this->call_generator(target_method, vtable_index, false, jvms, true, prof_factor);
- if (hit_cg != NULL && hit_cg->is_inline()) {
- CallGenerator* miss_cg = CallGenerator::for_dynamic_call(call_method);
- return CallGenerator::for_predicted_dynamic_call(method_handle, miss_cg, hit_cg, prof_factor);
- }
- }
+ ciCallSite* call_site = str.get_call_site();
+ CallGenerator* cg = CallGenerator::for_invokedynamic_inline(call_site, jvms, caller, call_method, profile);
+ if (cg != NULL) {
+ return cg;
+ }
// If something failed, generate a normal dynamic call.
return CallGenerator::for_dynamic_call(call_method);
}
diff --git a/hotspot/src/share/vm/opto/gcm.cpp b/hotspot/src/share/vm/opto/gcm.cpp
index f714d01..b504ea5 100644
--- a/hotspot/src/share/vm/opto/gcm.cpp
+++ b/hotspot/src/share/vm/opto/gcm.cpp
@@ -1137,7 +1137,7 @@ void PhaseCFG::schedule_late(VectorSet &visited, Node_List &stack) {
// No uses, just terminate
if (self->outcnt() == 0) {
- assert(self->Opcode() == Op_MachProj, "sanity");
+ assert(self->is_MachProj(), "sanity");
continue; // Must be a dead machine projection
}
diff --git a/hotspot/src/share/vm/opto/graphKit.cpp b/hotspot/src/share/vm/opto/graphKit.cpp
index db61258..4971729 100644
--- a/hotspot/src/share/vm/opto/graphKit.cpp
+++ b/hotspot/src/share/vm/opto/graphKit.cpp
@@ -2856,7 +2856,7 @@ FastLockNode* GraphKit::shared_lock(Node* obj) {
// lock has no side-effects, sets few values
set_predefined_output_for_runtime_call(lock, mem, TypeRawPtr::BOTTOM);
- insert_mem_bar(Op_MemBarAcquire);
+ insert_mem_bar(Op_MemBarAcquireLock);
// Add this to the worklist so that the lock can be eliminated
record_for_igvn(lock);
@@ -2889,7 +2889,7 @@ void GraphKit::shared_unlock(Node* box, Node* obj) {
}
// Memory barrier to avoid floating things down past the locked region
- insert_mem_bar(Op_MemBarRelease);
+ insert_mem_bar(Op_MemBarReleaseLock);
const TypeFunc *tf = OptoRuntime::complete_monitor_exit_Type();
UnlockNode *unlock = new (C, tf->domain()->cnt()) UnlockNode(C, tf);
diff --git a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
index 829673a..a5a0c65 100644
--- a/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
+++ b/hotspot/src/share/vm/opto/idealGraphPrinter.cpp
@@ -375,9 +375,9 @@ intptr_t IdealGraphPrinter::get_node_id(Node *n) {
return (intptr_t)(n);
}
-void IdealGraphPrinter::visit_node(Node *n, void *param) {
+void IdealGraphPrinter::visit_node(Node *n, bool edges, VectorSet* temp_set) {
- if(param) {
+ if (edges) {
// Output edge
intptr_t dest_id = get_node_id(n);
@@ -426,9 +426,6 @@ void IdealGraphPrinter::visit_node(Node *n, void *param) {
if (flags & Node::Flag_is_Copy) {
print_prop("is_copy", "true");
}
- if (flags & Node::Flag_is_Call) {
- print_prop("is_call", "true");
- }
if (flags & Node::Flag_rematerialize) {
print_prop("rematerialize", "true");
}
@@ -444,27 +441,12 @@ void IdealGraphPrinter::visit_node(Node *n, void *param) {
if (flags & Node::Flag_is_cisc_alternate) {
print_prop("is_cisc_alternate", "true");
}
- if (flags & Node::Flag_is_Branch) {
- print_prop("is_branch", "true");
- }
- if (flags & Node::Flag_is_block_start) {
- print_prop("is_block_start", "true");
- }
- if (flags & Node::Flag_is_Goto) {
- print_prop("is_goto", "true");
- }
if (flags & Node::Flag_is_dead_loop_safe) {
print_prop("is_dead_loop_safe", "true");
}
if (flags & Node::Flag_may_be_short_branch) {
print_prop("may_be_short_branch", "true");
}
- if (flags & Node::Flag_is_safepoint_node) {
- print_prop("is_safepoint_node", "true");
- }
- if (flags & Node::Flag_is_pc_relative) {
- print_prop("is_pc_relative", "true");
- }
if (C->matcher() != NULL) {
if (C->matcher()->is_shared(node)) {
@@ -617,16 +599,11 @@ void IdealGraphPrinter::visit_node(Node *n, void *param) {
#ifdef ASSERT
if (node->debug_orig() != NULL) {
+ temp_set->Clear();
stringStream dorigStream;
Node* dorig = node->debug_orig();
- if (dorig) {
+ while (dorig && temp_set->test_set(dorig->_idx)) {
dorigStream.print("%d ", dorig->_idx);
- Node* first = dorig;
- dorig = first->debug_orig();
- while (dorig && dorig != first) {
- dorigStream.print("%d ", dorig->_idx);
- dorig = dorig->debug_orig();
- }
}
print_prop("debug_orig", dorigStream.as_string());
}
@@ -647,7 +624,7 @@ void IdealGraphPrinter::visit_node(Node *n, void *param) {
}
}
-void IdealGraphPrinter::walk_nodes(Node *start, void *param) {
+void IdealGraphPrinter::walk_nodes(Node *start, bool edges, VectorSet* temp_set) {
VectorSet visited(Thread::current()->resource_area());
@@ -668,7 +645,7 @@ void IdealGraphPrinter::walk_nodes(Node *start, void *param) {
while(nodeStack.length() > 0) {
Node *n = nodeStack.pop();
- visit_node(n, param);
+ visit_node(n, edges, temp_set);
if (_traverse_outs) {
for (DUIterator i = n->outs(); n->has_out(i); i++) {
@@ -707,12 +684,14 @@ void IdealGraphPrinter::print(Compile* compile, const char *name, Node *node, in
print_attr(GRAPH_NAME_PROPERTY, (const char *)name);
end_head();
+ VectorSet temp_set(Thread::current()->resource_area());
+
head(NODES_ELEMENT);
- walk_nodes(node, NULL);
+ walk_nodes(node, false, &temp_set);
tail(NODES_ELEMENT);
head(EDGES_ELEMENT);
- walk_nodes(node, (void *)1);
+ walk_nodes(node, true, &temp_set);
tail(EDGES_ELEMENT);
if (C->cfg() != NULL) {
head(CONTROL_FLOW_ELEMENT);
diff --git a/hotspot/src/share/vm/opto/idealGraphPrinter.hpp b/hotspot/src/share/vm/opto/idealGraphPrinter.hpp
index 6115e6d..7d1863f 100644
--- a/hotspot/src/share/vm/opto/idealGraphPrinter.hpp
+++ b/hotspot/src/share/vm/opto/idealGraphPrinter.hpp
@@ -104,8 +104,8 @@ private:
void print_indent();
void print_method(ciMethod *method, int bci, InlineTree *tree);
void print_inline_tree(InlineTree *tree);
- void visit_node(Node *n, void *param);
- void walk_nodes(Node *start, void *param);
+ void visit_node(Node *n, bool edges, VectorSet* temp_set);
+ void walk_nodes(Node *start, bool edges, VectorSet* temp_set);
void begin_elem(const char *s);
void end_elem();
void begin_head(const char *s);
diff --git a/hotspot/src/share/vm/opto/ifnode.cpp b/hotspot/src/share/vm/opto/ifnode.cpp
index a7e7ebd..ce84f64 100644
--- a/hotspot/src/share/vm/opto/ifnode.cpp
+++ b/hotspot/src/share/vm/opto/ifnode.cpp
@@ -255,6 +255,14 @@ static Node* split_if(IfNode *iff, PhaseIterGVN *igvn) {
predicate_x = predicate_proj;
}
}
+ if (predicate_c != NULL && (req_c > 1)) {
+ assert(predicate_x == NULL, "only one predicate entry expected");
+ predicate_c = NULL; // Do not clone predicate below merge point
+ }
+ if (predicate_x != NULL && ((len - req_c) > 2)) {
+ assert(predicate_c == NULL, "only one predicate entry expected");
+ predicate_x = NULL; // Do not clone predicate below merge point
+ }
// Register the new RegionNodes but do not transform them. Cannot
// transform until the entire Region/Phi conglomerate has been hacked
@@ -1009,6 +1017,13 @@ void IfNode::dominated_by( Node *prev_dom, PhaseIterGVN *igvn ) {
int prev_op = prev_dom->Opcode();
Node *top = igvn->C->top(); // Shortcut to top
+ // Loop predicates may have depending checks which should not
+ // be skipped. For example, range check predicate has two checks
+ // for lower and upper bounds.
+ ProjNode* unc_proj = proj_out(1 - prev_dom->as_Proj()->_con)->as_Proj();
+ if (PhaseIdealLoop::is_uncommon_trap_proj(unc_proj, Deoptimization::Reason_predicate))
+ prev_dom = idom;
+
// Now walk the current IfNode's projections.
// Loop ends when 'this' has no more uses.
for (DUIterator_Last imin, i = last_outs(imin); i >= imin; --i) {
@@ -1019,9 +1034,9 @@ void IfNode::dominated_by( Node *prev_dom, PhaseIterGVN *igvn ) {
// or TOP if the dominating projection is of opposite type.
// Data-target will be used as the new control edge for the non-CFG
// nodes like Casts and Loads.
- Node *data_target = (ifp->Opcode() == prev_op ) ? prev_dom : top;
+ Node *data_target = (ifp->Opcode() == prev_op) ? prev_dom : top;
// Control-target is just the If's immediate dominator or TOP.
- Node *ctrl_target = (ifp->Opcode() == prev_op ) ? idom : top;
+ Node *ctrl_target = (ifp->Opcode() == prev_op) ? idom : top;
// For each child of an IfTrue/IfFalse projection, reroute.
// Loop ends when projection has no more uses.
diff --git a/hotspot/src/share/vm/opto/lcm.cpp b/hotspot/src/share/vm/opto/lcm.cpp
index af75a8d..425e10b 100644
--- a/hotspot/src/share/vm/opto/lcm.cpp
+++ b/hotspot/src/share/vm/opto/lcm.cpp
@@ -325,7 +325,7 @@ void Block::implicit_null_check(PhaseCFG *cfg, Node *proj, Node *val, int allowe
// that also need to be hoisted.
for (DUIterator_Fast jmax, j = val->fast_outs(jmax); j < jmax; j++) {
Node* n = val->fast_out(j);
- if( n->Opcode() == Op_MachProj ) {
+ if( n->is_MachProj() ) {
cfg->_bbs[n->_idx]->find_remove(n);
this->add_inst(n);
cfg->_bbs.map(n->_idx,this);
@@ -347,7 +347,7 @@ void Block::implicit_null_check(PhaseCFG *cfg, Node *proj, Node *val, int allowe
// Should be DU safe because no edge updates.
for (DUIterator_Fast jmax, j = best->fast_outs(jmax); j < jmax; j++) {
Node* n = best->fast_out(j);
- if( n->Opcode() == Op_MachProj ) {
+ if( n->is_MachProj() ) {
cfg->_bbs[n->_idx]->find_remove(n);
add_inst(n);
cfg->_bbs.map(n->_idx,this);
@@ -539,7 +539,7 @@ void Block::needed_for_next_call(Node *this_call, VectorSet &next_call, Block_Ar
Node* m = this_call->fast_out(i);
if( bbs[m->_idx] == this && // Local-block user
m != this_call && // Not self-start node
- m->is_Call() )
+ m->is_MachCall() )
call = m;
break;
}
@@ -557,7 +557,7 @@ uint Block::sched_call( Matcher &matcher, Block_Array &bbs, uint node_cnt, Node_
// Collect all the defined registers.
for (DUIterator_Fast imax, i = mcall->fast_outs(imax); i < imax; i++) {
Node* n = mcall->fast_out(i);
- assert( n->Opcode()==Op_MachProj, "" );
+ assert( n->is_MachProj(), "" );
--ready_cnt[n->_idx];
assert( !ready_cnt[n->_idx], "" );
// Schedule next to call
@@ -975,8 +975,8 @@ void Block::call_catch_cleanup(Block_Array &bbs) {
if( !_nodes[end]->is_Catch() ) return;
// Start of region to clone
uint beg = end;
- while( _nodes[beg-1]->Opcode() != Op_MachProj ||
- !_nodes[beg-1]->in(0)->is_Call() ) {
+ while(!_nodes[beg-1]->is_MachProj() ||
+ !_nodes[beg-1]->in(0)->is_MachCall() ) {
beg--;
assert(beg > 0,"Catch cleanup walking beyond block boundary");
}
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index 8179f37..d5ad00e 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -4658,6 +4658,7 @@ LibraryCallKit::generate_arraycopy(const TypePtr* adr_type,
// "You break it, you buy it."
InitializeNode* init = alloc->initialization();
assert(init->is_complete(), "we just did this");
+ init->set_complete_with_arraycopy();
assert(dest->is_CheckCastPP(), "sanity");
assert(dest->in(0)->in(0) == init, "dest pinned");
adr_type = TypeRawPtr::BOTTOM; // all initializations are into raw memory
diff --git a/hotspot/src/share/vm/opto/loopPredicate.cpp b/hotspot/src/share/vm/opto/loopPredicate.cpp
index c5227c2..d4a575d 100644
--- a/hotspot/src/share/vm/opto/loopPredicate.cpp
+++ b/hotspot/src/share/vm/opto/loopPredicate.cpp
@@ -327,81 +327,20 @@ ProjNode* PhaseIdealLoop::clone_predicate(ProjNode* predicate_proj, Node* new_en
return new_predicate_proj;
}
-//--------------------------move_predicate-----------------------
-// Cut predicate from old place and move it to new.
-ProjNode* PhaseIdealLoop::move_predicate(ProjNode* predicate_proj, Node* new_entry,
- Deoptimization::DeoptReason reason,
- PhaseIdealLoop* loop_phase,
- PhaseIterGVN* igvn) {
- assert(new_entry != NULL, "must be");
- assert(predicate_proj->in(0)->in(1)->in(1)->Opcode()==Op_Opaque1, "must be");
- IfNode* iff = predicate_proj->in(0)->as_If();
- Node* old_entry = iff->in(0);
-
- // Cut predicate from old place.
- Node* old = predicate_proj;
- igvn->_worklist.push(old);
- for (DUIterator_Last imin, i = old->last_outs(imin); i >= imin;) {
- Node* use = old->last_out(i); // for each use...
- igvn->hash_delete(use);
- igvn->_worklist.push(use);
- // Update use-def info
- uint uses_found = 0;
- for (uint j = 0; j < use->req(); j++) {
- if (use->in(j) == old) {
- use->set_req(j, old_entry);
- uses_found++;
- if (loop_phase != NULL) {
- if (use->is_CFG()) {
- // When called from beautify_loops() idom is not constructed yet.
- if (loop_phase->_idom != NULL)
- loop_phase->set_idom(use, old_entry, loop_phase->dom_depth(use));
- } else {
- loop_phase->set_ctrl(use, old_entry);
- }
- }
- }
- }
- i -= uses_found; // we deleted 1 or more copies of this edge
- }
-
- // Move predicate.
- igvn->hash_delete(iff);
- iff->set_req(0, new_entry);
- igvn->_worklist.push(iff);
-
- if (loop_phase != NULL) {
- // Fix up idom and ctrl.
- loop_phase->set_ctrl(iff->in(1), new_entry);
- loop_phase->set_ctrl(iff->in(1)->in(1), new_entry);
- // When called from beautify_loops() idom is not constructed yet.
- if (loop_phase->_idom != NULL)
- loop_phase->set_idom(iff, new_entry, loop_phase->dom_depth(iff));
- }
-
- return predicate_proj;
-}
//--------------------------clone_loop_predicates-----------------------
// Interface from IGVN
Node* PhaseIterGVN::clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
- return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, false, clone_limit_check, NULL, this);
-}
-Node* PhaseIterGVN::move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
- return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, true, clone_limit_check, NULL, this);
+ return PhaseIdealLoop::clone_loop_predicates(old_entry, new_entry, clone_limit_check, NULL, this);
}
// Interface from PhaseIdealLoop
Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
- return clone_loop_predicates(old_entry, new_entry, false, clone_limit_check, this, &this->_igvn);
-}
-Node* PhaseIdealLoop::move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check) {
- return clone_loop_predicates(old_entry, new_entry, true, clone_limit_check, this, &this->_igvn);
+ return clone_loop_predicates(old_entry, new_entry, clone_limit_check, this, &this->_igvn);
}
// Clone loop predicates to cloned loops (peeled, unswitched, split_if).
Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry,
- bool move_predicates,
bool clone_limit_check,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn) {
@@ -424,20 +363,13 @@ Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry,
if (UseLoopPredicate) {
ProjNode* predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
if (predicate_proj != NULL) { // right pattern that can be used by loop predication
- if (move_predicates) {
- new_entry = move_predicate(predicate_proj, new_entry,
- Deoptimization::Reason_predicate,
- loop_phase, igvn);
- assert(new_entry == predicate_proj, "old predicate fall through projection");
- } else {
- // clone predicate
- new_entry = clone_predicate(predicate_proj, new_entry,
- Deoptimization::Reason_predicate,
- loop_phase, igvn);
- assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone predicate");
- }
+ // clone predicate
+ new_entry = clone_predicate(predicate_proj, new_entry,
+ Deoptimization::Reason_predicate,
+ loop_phase, igvn);
+ assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone predicate");
if (TraceLoopPredicate) {
- tty->print_cr("Loop Predicate %s: ", move_predicates ? "moved" : "cloned");
+ tty->print("Loop Predicate cloned: ");
debug_only( new_entry->in(0)->dump(); )
}
}
@@ -446,45 +378,18 @@ Node* PhaseIdealLoop::clone_loop_predicates(Node* old_entry, Node* new_entry,
// Clone loop limit check last to insert it before loop.
// Don't clone a limit check which was already finalized
// for this counted loop (only one limit check is needed).
- if (move_predicates) {
- new_entry = move_predicate(limit_check_proj, new_entry,
- Deoptimization::Reason_loop_limit_check,
- loop_phase, igvn);
- assert(new_entry == limit_check_proj, "old limit check fall through projection");
- } else {
- new_entry = clone_predicate(limit_check_proj, new_entry,
- Deoptimization::Reason_loop_limit_check,
- loop_phase, igvn);
- assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone limit check");
- }
+ new_entry = clone_predicate(limit_check_proj, new_entry,
+ Deoptimization::Reason_loop_limit_check,
+ loop_phase, igvn);
+ assert(new_entry != NULL && new_entry->is_Proj(), "IfTrue or IfFalse after clone limit check");
if (TraceLoopLimitCheck) {
- tty->print_cr("Loop Limit Check %s: ", move_predicates ? "moved" : "cloned");
+ tty->print("Loop Limit Check cloned: ");
debug_only( new_entry->in(0)->dump(); )
}
}
return new_entry;
}
-//--------------------------eliminate_loop_predicates-----------------------
-void PhaseIdealLoop::eliminate_loop_predicates(Node* entry) {
- if (LoopLimitCheck) {
- Node* predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_loop_limit_check);
- if (predicate != NULL) {
- entry = entry->in(0)->in(0);
- }
- }
- if (UseLoopPredicate) {
- ProjNode* predicate_proj = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
- if (predicate_proj != NULL) { // right pattern that can be used by loop predication
- Node* n = entry->in(0)->in(1)->in(1);
- assert(n->Opcode()==Op_Opaque1, "must be");
- // Remove Opaque1 node from predicates list.
- // IGVN will remove this predicate check.
- _igvn.replace_node(n, n->in(1));
- }
- }
-}
-
//--------------------------skip_loop_predicates------------------------------
// Skip related predicates.
Node* PhaseIdealLoop::skip_loop_predicates(Node* entry) {
@@ -813,10 +718,14 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTree *loop) {
}
CountedLoopNode *cl = NULL;
- if (head->is_CountedLoop()) {
+ if (head->is_valid_counted_loop()) {
cl = head->as_CountedLoop();
// do nothing for iteration-splitted loops
if (!cl->is_normal_loop()) return false;
+ // Avoid RCE if Counted loop's test is '!='.
+ BoolTest::mask bt = cl->loopexit()->test_trip();
+ if (bt != BoolTest::lt && bt != BoolTest::gt)
+ cl = NULL;
}
Node* entry = head->in(LoopNode::EntryControl);
@@ -958,7 +867,7 @@ bool PhaseIdealLoop::loop_predication_impl(IdealLoopTree *loop) {
if (TraceLoopPredicate) tty->print_cr("lower bound check if: %d", lower_bound_iff->_idx);
// Test the upper bound
- Node* upper_bound_bol = rc_predicate(loop, ctrl, scale, offset, init, limit, stride, rng, true);
+ Node* upper_bound_bol = rc_predicate(loop, lower_bound_proj, scale, offset, init, limit, stride, rng, true);
IfNode* upper_bound_iff = upper_bound_proj->in(0)->as_If();
_igvn.hash_delete(upper_bound_iff);
upper_bound_iff->set_req(1, upper_bound_bol);
diff --git a/hotspot/src/share/vm/opto/loopTransform.cpp b/hotspot/src/share/vm/opto/loopTransform.cpp
index 7ef2d13..eee153a 100644
--- a/hotspot/src/share/vm/opto/loopTransform.cpp
+++ b/hotspot/src/share/vm/opto/loopTransform.cpp
@@ -509,14 +509,13 @@ void PhaseIdealLoop::do_peeling( IdealLoopTree *loop, Node_List &old_new ) {
// backedges) and then map to the new peeled iteration. This leaves
// the pre-loop with only 1 user (the new peeled iteration), but the
// peeled-loop backedge has 2 users.
- Node* new_exit_value = old_new[head->in(LoopNode::LoopBackControl)->_idx];
- new_exit_value = move_loop_predicates(entry, new_exit_value, !counted_loop);
+ Node* new_entry = old_new[head->in(LoopNode::LoopBackControl)->_idx];
_igvn.hash_delete(head);
- head->set_req(LoopNode::EntryControl, new_exit_value);
+ head->set_req(LoopNode::EntryControl, new_entry);
for (DUIterator_Fast jmax, j = head->fast_outs(jmax); j < jmax; j++) {
Node* old = head->fast_out(j);
if (old->in(0) == loop->_head && old->req() == 3 && old->is_Phi()) {
- new_exit_value = old_new[old->in(LoopNode::LoopBackControl)->_idx];
+ Node* new_exit_value = old_new[old->in(LoopNode::LoopBackControl)->_idx];
if (!new_exit_value ) // Backedge value is ALSO loop invariant?
// Then loop body backedge value remains the same.
new_exit_value = old->in(LoopNode::LoopBackControl);
@@ -710,10 +709,13 @@ bool IdealLoopTree::policy_unroll( PhaseIdealLoop *phase ) const {
// Adjust body_size to determine if we unroll or not
uint body_size = _body.size();
+ // Key test to unroll loop in CRC32 java code
+ int xors_in_loop = 0;
// Also count ModL, DivL and MulL which expand mightly
for (uint k = 0; k < _body.size(); k++) {
Node* n = _body.at(k);
switch (n->Opcode()) {
+ case Op_XorI: xors_in_loop++; break; // CRC32 java code
case Op_ModL: body_size += 30; break;
case Op_DivL: body_size += 30; break;
case Op_MulL: body_size += 10; break;
@@ -730,7 +732,8 @@ bool IdealLoopTree::policy_unroll( PhaseIdealLoop *phase ) const {
// Check for being too big
if (body_size > (uint)LoopUnrollLimit) {
- // Normal case: loop too big
+ if (xors_in_loop >= 4 && body_size < (uint)LoopUnrollLimit*4) return true;
+ // Normal case: loop too big
return false;
}
@@ -2100,7 +2103,7 @@ bool IdealLoopTree::policy_do_remove_empty_loop( PhaseIdealLoop *phase ) {
if (!_head->is_CountedLoop())
return false; // Dead loop
CountedLoopNode *cl = _head->as_CountedLoop();
- if (!cl->loopexit())
+ if (!cl->is_valid_counted_loop())
return false; // Malformed loop
if (!phase->is_member(this, phase->get_ctrl(cl->loopexit()->in(CountedLoopEndNode::TestValue))))
return false; // Infinite loop
@@ -2256,7 +2259,7 @@ bool IdealLoopTree::iteration_split_impl( PhaseIdealLoop *phase, Node_List &old_
}
CountedLoopNode *cl = _head->as_CountedLoop();
- if (!cl->loopexit()) return true; // Ignore various kinds of broken loops
+ if (!cl->is_valid_counted_loop()) return true; // Ignore various kinds of broken loops
// Do nothing special to pre- and post- loops
if (cl->is_pre_loop() || cl->is_post_loop()) return true;
@@ -2637,7 +2640,7 @@ bool PhaseIdealLoop::intrinsify_fill(IdealLoopTree* lpt) {
// Must have constant stride
CountedLoopNode* head = lpt->_head->as_CountedLoop();
- if (!head->stride_is_con() || !head->is_normal_loop()) {
+ if (!head->is_valid_counted_loop() || !head->is_normal_loop()) {
return false;
}
diff --git a/hotspot/src/share/vm/opto/loopUnswitch.cpp b/hotspot/src/share/vm/opto/loopUnswitch.cpp
index 9fa6421..20ddf78 100644
--- a/hotspot/src/share/vm/opto/loopUnswitch.cpp
+++ b/hotspot/src/share/vm/opto/loopUnswitch.cpp
@@ -255,7 +255,7 @@ ProjNode* PhaseIdealLoop::create_slow_version_of_loop(IdealLoopTree *loop,
_igvn._worklist.push(head);
// Slow (false) control
- Node* ifslow_pred = move_loop_predicates(entry, ifslow, !counted_loop);
+ Node* ifslow_pred = clone_loop_predicates(entry, ifslow, !counted_loop);
LoopNode* slow_head = old_new[head->_idx]->as_Loop();
_igvn.hash_delete(slow_head);
slow_head->set_req(LoopNode::EntryControl, ifslow_pred);
diff --git a/hotspot/src/share/vm/opto/loopnode.cpp b/hotspot/src/share/vm/opto/loopnode.cpp
index eb138f5..2243c39 100644
--- a/hotspot/src/share/vm/opto/loopnode.cpp
+++ b/hotspot/src/share/vm/opto/loopnode.cpp
@@ -582,20 +582,25 @@ bool PhaseIdealLoop::is_counted_loop( Node *x, IdealLoopTree *loop ) {
// Build a canonical trip test.
// Clone code, as old values may be in use.
- Node* nphi = PhiNode::make(x, init_trip, TypeInt::INT);
- nphi = _igvn.register_new_node_with_optimizer(nphi);
- set_ctrl(nphi, get_ctrl(phi));
-
incr = incr->clone();
- incr->set_req(1,nphi);
+ incr->set_req(1,phi);
incr->set_req(2,stride);
incr = _igvn.register_new_node_with_optimizer(incr);
set_early_ctrl( incr );
-
- nphi->set_req(LoopNode::LoopBackControl, incr);
- _igvn.replace_node(phi, nphi);
- phi = nphi->as_Phi();
-
+ _igvn.hash_delete(phi);
+ phi->set_req_X( LoopNode::LoopBackControl, incr, &_igvn );
+
+ // If phi type is more restrictive than Int, raise to
+ // Int to prevent (almost) infinite recursion in igvn
+ // which can only handle integer types for constants or minint..maxint.
+ if (!TypeInt::INT->higher_equal(phi->bottom_type())) {
+ Node* nphi = PhiNode::make(phi->in(0), phi->in(LoopNode::EntryControl), TypeInt::INT);
+ nphi->set_req(LoopNode::LoopBackControl, phi->in(LoopNode::LoopBackControl));
+ nphi = _igvn.register_new_node_with_optimizer(nphi);
+ set_ctrl(nphi, get_ctrl(phi));
+ _igvn.replace_node(phi, nphi);
+ phi = nphi->as_Phi();
+ }
cmp = cmp->clone();
cmp->set_req(1,incr);
cmp->set_req(2,limit);
@@ -689,6 +694,7 @@ bool PhaseIdealLoop::is_counted_loop( Node *x, IdealLoopTree *loop ) {
Node* PhaseIdealLoop::exact_limit( IdealLoopTree *loop ) {
assert(loop->_head->is_CountedLoop(), "");
CountedLoopNode *cl = loop->_head->as_CountedLoop();
+ assert(cl->is_valid_counted_loop(), "");
if (!LoopLimitCheck || ABS(cl->stride_con()) == 1 ||
cl->limit()->Opcode() == Op_LoopLimit) {
@@ -1167,9 +1173,8 @@ void IdealLoopTree::split_outer_loop( PhaseIdealLoop *phase ) {
outer = igvn.register_new_node_with_optimizer(outer, _head);
phase->set_created_loop_node();
- Node* pred = phase->clone_loop_predicates(ctl, outer, true);
// Outermost loop falls into '_head' loop
- _head->set_req(LoopNode::EntryControl, pred);
+ _head->set_req(LoopNode::EntryControl, outer);
_head->del_req(outer_idx);
// Split all the Phis up between '_head' loop and 'outer' loop.
for (DUIterator_Fast jmax, j = _head->fast_outs(jmax); j < jmax; j++) {
@@ -1609,18 +1614,15 @@ bool PhaseIdealLoop::is_deleteable_safept(Node* sfpt) {
void PhaseIdealLoop::replace_parallel_iv(IdealLoopTree *loop) {
assert(loop->_head->is_CountedLoop(), "");
CountedLoopNode *cl = loop->_head->as_CountedLoop();
+ if (!cl->is_valid_counted_loop())
+ return; // skip malformed counted loop
Node *incr = cl->incr();
if (incr == NULL)
return; // Dead loop?
Node *init = cl->init_trip();
Node *phi = cl->phi();
- // protect against stride not being a constant
- if (!cl->stride_is_con())
- return;
int stride_con = cl->stride_con();
- PhaseGVN *gvn = &_igvn;
-
// Visit all children, looking for Phis
for (DUIterator i = cl->outs(); cl->has_out(i); i++) {
Node *out = cl->out(i);
@@ -1656,25 +1658,31 @@ void PhaseIdealLoop::replace_parallel_iv(IdealLoopTree *loop) {
int ratio_con = stride_con2/stride_con;
if ((ratio_con * stride_con) == stride_con2) { // Check for exact
+#ifndef PRODUCT
+ if (TraceLoopOpts) {
+ tty->print("Parallel IV: %d ", phi2->_idx);
+ loop->dump_head();
+ }
+#endif
// Convert to using the trip counter. The parallel induction
// variable differs from the trip counter by a loop-invariant
// amount, the difference between their respective initial values.
// It is scaled by the 'ratio_con'.
- // Perform local Ideal transformation since in most cases ratio == 1.
Node* ratio = _igvn.intcon(ratio_con);
set_ctrl(ratio, C->root());
- Node* hook = new (C, 3) Node(3);
- Node* ratio_init = gvn->transform(new (C, 3) MulINode(init, ratio));
- hook->init_req(0, ratio_init);
- Node* diff = gvn->transform(new (C, 3) SubINode(init2, ratio_init));
- hook->init_req(1, diff);
- Node* ratio_idx = gvn->transform(new (C, 3) MulINode(phi, ratio));
- hook->init_req(2, ratio_idx);
- Node* add = gvn->transform(new (C, 3) AddINode(ratio_idx, diff));
- set_subtree_ctrl(add);
+ Node* ratio_init = new (C, 3) MulINode(init, ratio);
+ _igvn.register_new_node_with_optimizer(ratio_init, init);
+ set_early_ctrl(ratio_init);
+ Node* diff = new (C, 3) SubINode(init2, ratio_init);
+ _igvn.register_new_node_with_optimizer(diff, init2);
+ set_early_ctrl(diff);
+ Node* ratio_idx = new (C, 3) MulINode(phi, ratio);
+ _igvn.register_new_node_with_optimizer(ratio_idx, phi);
+ set_ctrl(ratio_idx, cl);
+ Node* add = new (C, 3) AddINode(ratio_idx, diff);
+ _igvn.register_new_node_with_optimizer(add);
+ set_ctrl(add, cl);
_igvn.replace_node( phi2, add );
- // Free up intermediate goo
- _igvn.remove_dead_node(hook);
// Sometimes an induction variable is unused
if (add->outcnt() == 0) {
_igvn.remove_dead_node(add);
diff --git a/hotspot/src/share/vm/opto/loopnode.hpp b/hotspot/src/share/vm/opto/loopnode.hpp
index 07d13de..817124b 100644
--- a/hotspot/src/share/vm/opto/loopnode.hpp
+++ b/hotspot/src/share/vm/opto/loopnode.hpp
@@ -877,19 +877,13 @@ public:
Deoptimization::DeoptReason reason,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn);
- static ProjNode* move_predicate(ProjNode* predicate_proj, Node* new_entry,
- Deoptimization::DeoptReason reason,
- PhaseIdealLoop* loop_phase,
- PhaseIterGVN* igvn);
+
static Node* clone_loop_predicates(Node* old_entry, Node* new_entry,
- bool move_predicates,
bool clone_limit_check,
PhaseIdealLoop* loop_phase,
PhaseIterGVN* igvn);
Node* clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
- Node* move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
- void eliminate_loop_predicates(Node* entry);
static Node* skip_loop_predicates(Node* entry);
// Find a good location to insert a predicate
@@ -1009,7 +1003,7 @@ public:
Node *has_local_phi_input( Node *n );
// Mark an IfNode as being dominated by a prior test,
// without actually altering the CFG (and hence IDOM info).
- void dominated_by( Node *prevdom, Node *iff, bool flip = false );
+ void dominated_by( Node *prevdom, Node *iff, bool flip = false, bool exclude_loop_predicate = false );
// Split Node 'n' through merge point
Node *split_thru_region( Node *n, Node *region );
diff --git a/hotspot/src/share/vm/opto/loopopts.cpp b/hotspot/src/share/vm/opto/loopopts.cpp
index 6498d3c..c693deb 100644
--- a/hotspot/src/share/vm/opto/loopopts.cpp
+++ b/hotspot/src/share/vm/opto/loopopts.cpp
@@ -194,7 +194,7 @@ Node *PhaseIdealLoop::split_thru_phi( Node *n, Node *region, int policy ) {
// Replace the dominated test with an obvious true or false. Place it on the
// IGVN worklist for later cleanup. Move control-dependent data Nodes on the
// live path up to the dominating control.
-void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip ) {
+void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip, bool exclude_loop_predicate ) {
#ifndef PRODUCT
if (VerifyLoopOptimizations && PrintOpto) tty->print_cr("dominating test");
#endif
@@ -228,7 +228,16 @@ void PhaseIdealLoop::dominated_by( Node *prevdom, Node *iff, bool flip ) {
// Make control-dependent data Nodes on the live path (path that will remain
// once the dominated IF is removed) become control-dependent on the
// dominating projection.
- Node* dp = ((IfNode*)iff)->proj_out(pop == Op_IfTrue);
+ Node* dp = iff->as_If()->proj_out(pop == Op_IfTrue);
+
+ // Loop predicates may have depending checks which should not
+ // be skipped. For example, range check predicate has two checks
+ // for lower and upper bounds.
+ ProjNode* unc_proj = iff->as_If()->proj_out(1 - dp->as_Proj()->_con)->as_Proj();
+ if (exclude_loop_predicate &&
+ is_uncommon_trap_proj(unc_proj, Deoptimization::Reason_predicate))
+ return; // Let IGVN transformation change control dependence.
+
IdealLoopTree *old_loop = get_loop(dp);
for (DUIterator_Fast imax, i = dp->fast_outs(imax); i < imax; i++) {
@@ -859,7 +868,7 @@ void PhaseIdealLoop::split_if_with_blocks_post( Node *n ) {
// Replace the dominated test with an obvious true or false.
// Place it on the IGVN worklist for later cleanup.
C->set_major_progress();
- dominated_by( prevdom, n );
+ dominated_by( prevdom, n, false, true );
#ifndef PRODUCT
if( VerifyLoopOptimizations ) verify();
#endif
diff --git a/hotspot/src/share/vm/opto/machnode.cpp b/hotspot/src/share/vm/opto/machnode.cpp
index 6242c66..dd6c3c0 100644
--- a/hotspot/src/share/vm/opto/machnode.cpp
+++ b/hotspot/src/share/vm/opto/machnode.cpp
@@ -389,12 +389,6 @@ int MachNode::operand_index( uint operand ) const {
}
-//------------------------------negate-----------------------------------------
-// Negate conditional branches. Error for non-branch Nodes
-void MachNode::negate() {
- ShouldNotCallThis();
-}
-
//------------------------------peephole---------------------------------------
// Apply peephole rule(s) to this instruction
MachNode *MachNode::peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C ) {
@@ -407,12 +401,6 @@ void MachNode::add_case_label( int index_num, Label* blockLabel) {
ShouldNotCallThis();
}
-//------------------------------label_set--------------------------------------
-// Set the Label for a LabelOper, if an operand for this instruction
-void MachNode::label_set( Label& label, uint block_num ) {
- ShouldNotCallThis();
-}
-
//------------------------------method_set-------------------------------------
// Set the absolute address of a method
void MachNode::method_set( intptr_t addr ) {
@@ -514,6 +502,12 @@ void MachNullCheckNode::format( PhaseRegAlloc *ra_, outputStream *st ) const {
void MachNullCheckNode::emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const {
// only emits entries in the null-pointer exception handler table
}
+void MachNullCheckNode::label_set(Label* label, uint block_num) {
+ // Nothing to emit
+}
+void MachNullCheckNode::save_label( Label** label, uint* block_num ) {
+ // Nothing to emit
+}
const RegMask &MachNullCheckNode::in_RegMask( uint idx ) const {
if( idx == 0 ) return RegMask::Empty;
diff --git a/hotspot/src/share/vm/opto/machnode.hpp b/hotspot/src/share/vm/opto/machnode.hpp
index d947bb8..c44c8d0 100644
--- a/hotspot/src/share/vm/opto/machnode.hpp
+++ b/hotspot/src/share/vm/opto/machnode.hpp
@@ -185,9 +185,11 @@ public:
virtual void use_cisc_RegMask();
// Support for short branches
- virtual MachNode *short_branch_version(Compile* C) { return NULL; }
bool may_be_short_branch() const { return (flags() & Flag_may_be_short_branch) != 0; }
+ // Avoid back to back some instructions on some CPUs.
+ bool avoid_back_to_back() const { return (flags() & Flag_avoid_back_to_back) != 0; }
+
// First index in _in[] corresponding to operand, or -1 if there is none
int operand_index(uint operand) const;
@@ -269,21 +271,12 @@ public:
// Call "get_base_and_disp" to decide which category of memory is used here.
virtual const class TypePtr *adr_type() const;
- // Negate conditional branches. Error for non-branch Nodes
- virtual void negate();
-
// Apply peephole rule(s) to this instruction
virtual MachNode *peephole( Block *block, int block_index, PhaseRegAlloc *ra_, int &deleted, Compile* C );
- // Check for PC-Relative addressing
- bool is_pc_relative() const { return (flags() & Flag_is_pc_relative) != 0; }
-
// Top-level ideal Opcode matched
virtual int ideal_Opcode() const { return Op_Node; }
- // Set the branch inside jump MachNodes. Error for non-branch Nodes.
- virtual void label_set( Label& label, uint block_num );
-
// Adds the label for the case
virtual void add_case_label( int switch_val, Label* blockLabel);
@@ -514,24 +507,41 @@ public:
#endif
};
+//------------------------------MachBranchNode--------------------------------
+// Abstract machine branch Node
+class MachBranchNode : public MachIdealNode {
+public:
+ MachBranchNode() : MachIdealNode() {
+ init_class_id(Class_MachBranch);
+ }
+ virtual void label_set(Label* label, uint block_num) = 0;
+ virtual void save_label(Label** label, uint* block_num) = 0;
+
+ // Support for short branches
+ virtual MachNode *short_branch_version(Compile* C) { return NULL; }
+
+ virtual bool pinned() const { return true; };
+};
+
//------------------------------MachNullChkNode--------------------------------
// Machine-dependent null-pointer-check Node. Points a real MachNode that is
// also some kind of memory op. Turns the indicated MachNode into a
// conditional branch with good latency on the ptr-not-null path and awful
// latency on the pointer-is-null path.
-class MachNullCheckNode : public MachIdealNode {
+class MachNullCheckNode : public MachBranchNode {
public:
const uint _vidx; // Index of memop being tested
- MachNullCheckNode( Node *ctrl, Node *memop, uint vidx ) : MachIdealNode(), _vidx(vidx) {
+ MachNullCheckNode( Node *ctrl, Node *memop, uint vidx ) : MachBranchNode(), _vidx(vidx) {
init_class_id(Class_MachNullCheck);
- init_flags(Flag_is_Branch | Flag_is_pc_relative);
add_req(ctrl);
add_req(memop);
}
+ virtual uint size_of() const { return sizeof(*this); }
virtual void emit(CodeBuffer &cbuf, PhaseRegAlloc *ra_) const;
- virtual bool pinned() const { return true; };
+ virtual void label_set(Label* label, uint block_num);
+ virtual void save_label(Label** label, uint* block_num);
virtual void negate() { }
virtual const class Type *bottom_type() const { return TypeTuple::IFBOTH; }
virtual uint ideal_reg() const { return NotAMachineReg; }
@@ -553,7 +563,9 @@ public:
// occasional callbacks to the machine model for important info.
class MachProjNode : public ProjNode {
public:
- MachProjNode( Node *multi, uint con, const RegMask &out, uint ideal_reg ) : ProjNode(multi,con), _rout(out), _ideal_reg(ideal_reg) {}
+ MachProjNode( Node *multi, uint con, const RegMask &out, uint ideal_reg ) : ProjNode(multi,con), _rout(out), _ideal_reg(ideal_reg) {
+ init_class_id(Class_MachProj);
+ }
RegMask _rout;
const uint _ideal_reg;
enum projType {
@@ -575,19 +587,30 @@ public:
//------------------------------MachIfNode-------------------------------------
// Machine-specific versions of IfNodes
-class MachIfNode : public MachNode {
+class MachIfNode : public MachBranchNode {
virtual uint size_of() const { return sizeof(*this); } // Size is bigger
public:
float _prob; // Probability branch goes either way
float _fcnt; // Frequency counter
- MachIfNode() : MachNode() {
+ MachIfNode() : MachBranchNode() {
init_class_id(Class_MachIf);
}
+ // Negate conditional branches.
+ virtual void negate() = 0;
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
#endif
};
+//------------------------------MachGotoNode-----------------------------------
+// Machine-specific versions of GotoNodes
+class MachGotoNode : public MachBranchNode {
+public:
+ MachGotoNode() : MachBranchNode() {
+ init_class_id(Class_MachGoto);
+ }
+};
+
//------------------------------MachFastLockNode-------------------------------------
// Machine-specific versions of FastLockNodes
class MachFastLockNode : public MachNode {
@@ -630,14 +653,12 @@ public:
MachSafePointNode() : MachReturnNode(), _oop_map(NULL), _jvms(NULL), _jvmadj(0) {
init_class_id(Class_MachSafePoint);
- init_flags(Flag_is_safepoint_node);
}
virtual JVMState* jvms() const { return _jvms; }
void set_jvms(JVMState* s) {
_jvms = s;
}
- bool is_safepoint_node() const { return (flags() & Flag_is_safepoint_node) != 0; }
virtual const Type *bottom_type() const;
virtual const RegMask &in_RegMask(uint) const;
@@ -701,7 +722,6 @@ public:
MachCallNode() : MachSafePointNode() {
init_class_id(Class_MachCall);
- init_flags(Flag_is_Call);
}
virtual const Type *bottom_type() const;
@@ -853,7 +873,7 @@ public:
virtual MachOper *clone(Compile* C) const;
- virtual Label *label() const { return _label; }
+ virtual Label *label() const { assert(_label != NULL, "need Label"); return _label; }
virtual uint opcode() const;
diff --git a/hotspot/src/share/vm/opto/macro.cpp b/hotspot/src/share/vm/opto/macro.cpp
index e7b9013..b5f6453 100644
--- a/hotspot/src/share/vm/opto/macro.cpp
+++ b/hotspot/src/share/vm/opto/macro.cpp
@@ -1590,7 +1590,7 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
prefetch_adr = new (C, 4) AddPNode( old_pf_wm, new_pf_wmt,
_igvn.MakeConX(distance) );
transform_later(prefetch_adr);
- prefetch = new (C, 3) PrefetchWriteNode( i_o, prefetch_adr );
+ prefetch = new (C, 3) PrefetchAllocationNode( i_o, prefetch_adr );
transform_later(prefetch);
distance += step_size;
i_o = prefetch;
@@ -1611,13 +1611,14 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
contended_phi_rawmem = pf_phi_rawmem;
i_o = pf_phi_abio;
} else if( UseTLAB && AllocatePrefetchStyle == 3 ) {
- // Insert a prefetch for each allocation only on the fast-path
+ // Insert a prefetch for each allocation.
+ // This code is used for Sparc with BIS.
Node *pf_region = new (C, 3) RegionNode(3);
Node *pf_phi_rawmem = new (C, 3) PhiNode( pf_region, Type::MEMORY,
TypeRawPtr::BOTTOM );
- // Generate several prefetch instructions only for arrays.
- uint lines = (length != NULL) ? AllocatePrefetchLines : 1;
+ // Generate several prefetch instructions.
+ uint lines = (length != NULL) ? AllocatePrefetchLines : AllocateInstancePrefetchLines;
uint step_size = AllocatePrefetchStepSize;
uint distance = AllocatePrefetchDistance;
@@ -1634,7 +1635,7 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
transform_later(cache_adr);
// Prefetch
- Node *prefetch = new (C, 3) PrefetchWriteNode( contended_phi_rawmem, cache_adr );
+ Node *prefetch = new (C, 3) PrefetchAllocationNode( contended_phi_rawmem, cache_adr );
prefetch->set_req(0, needgc_false);
transform_later(prefetch);
contended_phi_rawmem = prefetch;
@@ -1644,7 +1645,7 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
prefetch_adr = new (C, 4) AddPNode( cache_adr, cache_adr,
_igvn.MakeConX(distance) );
transform_later(prefetch_adr);
- prefetch = new (C, 3) PrefetchWriteNode( contended_phi_rawmem, prefetch_adr );
+ prefetch = new (C, 3) PrefetchAllocationNode( contended_phi_rawmem, prefetch_adr );
transform_later(prefetch);
distance += step_size;
contended_phi_rawmem = prefetch;
@@ -1653,15 +1654,15 @@ Node* PhaseMacroExpand::prefetch_allocation(Node* i_o, Node*& needgc_false,
// Insert a prefetch for each allocation only on the fast-path
Node *prefetch_adr;
Node *prefetch;
- // Generate several prefetch instructions only for arrays.
- uint lines = (length != NULL) ? AllocatePrefetchLines : 1;
+ // Generate several prefetch instructions.
+ uint lines = (length != NULL) ? AllocatePrefetchLines : AllocateInstancePrefetchLines;
uint step_size = AllocatePrefetchStepSize;
uint distance = AllocatePrefetchDistance;
for ( uint i = 0; i < lines; i++ ) {
prefetch_adr = new (C, 4) AddPNode( old_eden_top, new_eden_top,
_igvn.MakeConX(distance) );
transform_later(prefetch_adr);
- prefetch = new (C, 3) PrefetchWriteNode( i_o, prefetch_adr );
+ prefetch = new (C, 3) PrefetchAllocationNode( i_o, prefetch_adr );
// Do not let it float too high, since if eden_top == eden_end,
// both might be null.
if( i == 0 ) { // Set control for first prefetch, next follows it
@@ -1684,9 +1685,21 @@ void PhaseMacroExpand::expand_allocate(AllocateNode *alloc) {
void PhaseMacroExpand::expand_allocate_array(AllocateArrayNode *alloc) {
Node* length = alloc->in(AllocateNode::ALength);
+ InitializeNode* init = alloc->initialization();
+ Node* klass_node = alloc->in(AllocateNode::KlassNode);
+ ciKlass* k = _igvn.type(klass_node)->is_klassptr()->klass();
+ address slow_call_address; // Address of slow call
+ if (init != NULL && init->is_complete_with_arraycopy() &&
+ k->is_type_array_klass()) {
+ // Don't zero type array during slow allocation in VM since
+ // it will be initialized later by arraycopy in compiled code.
+ slow_call_address = OptoRuntime::new_array_nozero_Java();
+ } else {
+ slow_call_address = OptoRuntime::new_array_Java();
+ }
expand_allocate_common(alloc, length,
OptoRuntime::new_array_Type(),
- OptoRuntime::new_array_Java());
+ slow_call_address);
}
//-----------------------mark_eliminated_locking_nodes-----------------------
@@ -1816,9 +1829,9 @@ bool PhaseMacroExpand::eliminate_locking_node(AbstractLockNode *alock) {
// The input to a Lock is merged memory, so extract its RawMem input
// (unless the MergeMem has been optimized away.)
if (alock->is_Lock()) {
- // Seach for MemBarAcquire node and delete it also.
+ // Seach for MemBarAcquireLock node and delete it also.
MemBarNode* membar = fallthroughproj->unique_ctrl_out()->as_MemBar();
- assert(membar != NULL && membar->Opcode() == Op_MemBarAcquire, "");
+ assert(membar != NULL && membar->Opcode() == Op_MemBarAcquireLock, "");
Node* ctrlproj = membar->proj_out(TypeFunc::Control);
Node* memproj = membar->proj_out(TypeFunc::Memory);
_igvn.replace_node(ctrlproj, fallthroughproj);
@@ -1833,11 +1846,11 @@ bool PhaseMacroExpand::eliminate_locking_node(AbstractLockNode *alock) {
}
}
- // Seach for MemBarRelease node and delete it also.
+ // Seach for MemBarReleaseLock node and delete it also.
if (alock->is_Unlock() && ctrl != NULL && ctrl->is_Proj() &&
ctrl->in(0)->is_MemBar()) {
MemBarNode* membar = ctrl->in(0)->as_MemBar();
- assert(membar->Opcode() == Op_MemBarRelease &&
+ assert(membar->Opcode() == Op_MemBarReleaseLock &&
mem->is_Proj() && membar == mem->in(0), "");
_igvn.replace_node(fallthroughproj, ctrl);
_igvn.replace_node(memproj_fallthrough, mem);
diff --git a/hotspot/src/share/vm/opto/matcher.cpp b/hotspot/src/share/vm/opto/matcher.cpp
index bf24f9b..3244a94 100644
--- a/hotspot/src/share/vm/opto/matcher.cpp
+++ b/hotspot/src/share/vm/opto/matcher.cpp
@@ -501,6 +501,12 @@ void Matcher::init_first_stack_mask() {
idealreg2spillmask[Op_RegP]->OR(*idealreg2regmask[Op_RegD]);
#else
idealreg2spillmask[Op_RegP]->OR(*idealreg2regmask[Op_RegF]);
+#ifdef ARM
+ // ARM has support for moving 64bit values between a pair of
+ // integer registers and a double register
+ idealreg2spillmask[Op_RegL]->OR(*idealreg2regmask[Op_RegD]);
+ idealreg2spillmask[Op_RegD]->OR(*idealreg2regmask[Op_RegL]);
+#endif
#endif
}
@@ -826,6 +832,7 @@ static void match_alias_type(Compile* C, Node* n, Node* m) {
switch (n->Opcode()) {
case Op_PrefetchRead:
case Op_PrefetchWrite:
+ case Op_PrefetchAllocation:
nidx = Compile::AliasIdxRaw;
nat = TypeRawPtr::BOTTOM;
break;
@@ -1105,6 +1112,9 @@ MachNode *Matcher::match_sfpt( SafePointNode *sfpt ) {
mcall_java->_optimized_virtual = call_java->is_optimized_virtual();
is_method_handle_invoke = call_java->is_method_handle_invoke();
mcall_java->_method_handle_invoke = is_method_handle_invoke;
+ if (is_method_handle_invoke) {
+ C->set_has_method_handle_invokes(true);
+ }
if( mcall_java->is_MachCallStaticJava() )
mcall_java->as_MachCallStaticJava()->_name =
call_java->as_CallStaticJava()->_name;
@@ -2230,57 +2240,6 @@ void Matcher::validate_null_checks( ) {
}
}
-
-// Used by the DFA in dfa_sparc.cpp. Check for a prior FastLock
-// acting as an Acquire and thus we don't need an Acquire here. We
-// retain the Node to act as a compiler ordering barrier.
-bool Matcher::prior_fast_lock( const Node *acq ) {
- Node *r = acq->in(0);
- if( !r->is_Region() || r->req() <= 1 ) return false;
- Node *proj = r->in(1);
- if( !proj->is_Proj() ) return false;
- Node *call = proj->in(0);
- if( !call->is_Call() || call->as_Call()->entry_point() != OptoRuntime::complete_monitor_locking_Java() )
- return false;
-
- return true;
-}
-
-// Used by the DFA in dfa_sparc.cpp. Check for a following FastUnLock
-// acting as a Release and thus we don't need a Release here. We
-// retain the Node to act as a compiler ordering barrier.
-bool Matcher::post_fast_unlock( const Node *rel ) {
- Compile *C = Compile::current();
- assert( rel->Opcode() == Op_MemBarRelease, "" );
- const MemBarReleaseNode *mem = (const MemBarReleaseNode*)rel;
- DUIterator_Fast imax, i = mem->fast_outs(imax);
- Node *ctrl = NULL;
- while( true ) {
- ctrl = mem->fast_out(i); // Throw out-of-bounds if proj not found
- assert( ctrl->is_Proj(), "only projections here" );
- ProjNode *proj = (ProjNode*)ctrl;
- if( proj->_con == TypeFunc::Control &&
- !C->node_arena()->contains(ctrl) ) // Unmatched old-space only
- break;
- i++;
- }
- Node *iff = NULL;
- for( DUIterator_Fast jmax, j = ctrl->fast_outs(jmax); j < jmax; j++ ) {
- Node *x = ctrl->fast_out(j);
- if( x->is_If() && x->req() > 1 &&
- !C->node_arena()->contains(x) ) { // Unmatched old-space only
- iff = x;
- break;
- }
- }
- if( !iff ) return false;
- Node *bol = iff->in(1);
- // The iff might be some random subclass of If or bol might be Con-Top
- if (!bol->is_Bool()) return false;
- assert( bol->req() > 1, "" );
- return (bol->in(1)->Opcode() == Op_FastUnlock);
-}
-
// Used by the DFA in dfa_xxx.cpp. Check for a following barrier or
// atomic instruction acting as a store_load barrier without any
// intervening volatile load, and thus we don't need a barrier here.
diff --git a/hotspot/src/share/vm/opto/matcher.hpp b/hotspot/src/share/vm/opto/matcher.hpp
index 5a34bea..39b00b0 100644
--- a/hotspot/src/share/vm/opto/matcher.hpp
+++ b/hotspot/src/share/vm/opto/matcher.hpp
@@ -351,7 +351,7 @@ public:
virtual int regnum_to_fpu_offset(int regnum);
// Is this branch offset small enough to be addressed by a short branch?
- bool is_short_branch_offset(int rule, int offset);
+ bool is_short_branch_offset(int rule, int br_size, int offset);
// Optional scaling for the parameter to the ClearArray/CopyArray node.
static const bool init_array_count_is_in_bytes;
@@ -441,16 +441,6 @@ public:
else { fatal("SoftMatchFailure is not allowed except in product"); }
}
- // Used by the DFA in dfa_sparc.cpp. Check for a prior FastLock
- // acting as an Acquire and thus we don't need an Acquire here. We
- // retain the Node to act as a compiler ordering barrier.
- static bool prior_fast_lock( const Node *acq );
-
- // Used by the DFA in dfa_sparc.cpp. Check for a following
- // FastUnLock acting as a Release and thus we don't need a Release
- // here. We retain the Node to act as a compiler ordering barrier.
- static bool post_fast_unlock( const Node *rel );
-
// Check for a following volatile memory barrier without an
// intervening load and thus we don't need a barrier here. We
// retain the Node to act as a compiler ordering barrier.
diff --git a/hotspot/src/share/vm/opto/memnode.cpp b/hotspot/src/share/vm/opto/memnode.cpp
index 5f49c03..4f6dc08 100644
--- a/hotspot/src/share/vm/opto/memnode.cpp
+++ b/hotspot/src/share/vm/opto/memnode.cpp
@@ -925,8 +925,9 @@ Node* MemNode::can_see_stored_value(Node* st, PhaseTransform* phase) const {
// a synchronized region.
while (current->is_Proj()) {
int opc = current->in(0)->Opcode();
- if ((final && opc == Op_MemBarAcquire) ||
- opc == Op_MemBarRelease || opc == Op_MemBarCPUOrder) {
+ if ((final && (opc == Op_MemBarAcquire || opc == Op_MemBarAcquireLock)) ||
+ opc == Op_MemBarRelease || opc == Op_MemBarCPUOrder ||
+ opc == Op_MemBarReleaseLock) {
Node* mem = current->in(0)->in(TypeFunc::Memory);
if (mem->is_MergeMem()) {
MergeMemNode* merge = mem->as_MergeMem();
@@ -1492,6 +1493,7 @@ const Type *LoadNode::Value( PhaseTransform *phase ) const {
if (tp == NULL || tp->empty()) return Type::TOP;
int off = tp->offset();
assert(off != Type::OffsetTop, "case covered by TypePtr::empty");
+ Compile* C = phase->C;
// Try to guess loaded type from pointer type
if (tp->base() == Type::AryPtr) {
@@ -1535,7 +1537,7 @@ const Type *LoadNode::Value( PhaseTransform *phase ) const {
Node* base = adr->in(AddPNode::Base);
if (base != NULL &&
!phase->type(base)->higher_equal(TypePtr::NULL_PTR)) {
- Compile::AliasType* atp = phase->C->alias_type(base->adr_type());
+ Compile::AliasType* atp = C->alias_type(base->adr_type());
if (is_autobox_cache(atp)) {
return jt->join(TypePtr::NOTNULL)->is_ptr();
}
@@ -1545,22 +1547,23 @@ const Type *LoadNode::Value( PhaseTransform *phase ) const {
}
}
} else if (tp->base() == Type::InstPtr) {
+ ciEnv* env = C->env();
const TypeInstPtr* tinst = tp->is_instptr();
ciKlass* klass = tinst->klass();
assert( off != Type::OffsetBot ||
// arrays can be cast to Objects
tp->is_oopptr()->klass()->is_java_lang_Object() ||
// unsafe field access may not have a constant offset
- phase->C->has_unsafe_access(),
+ C->has_unsafe_access(),
"Field accesses must be precise" );
// For oop loads, we expect the _type to be precise
- if (klass == phase->C->env()->String_klass() &&
+ if (klass == env->String_klass() &&
adr->is_AddP() && off != Type::OffsetBot) {
// For constant Strings treat the final fields as compile time constants.
Node* base = adr->in(AddPNode::Base);
const TypeOopPtr* t = phase->type(base)->isa_oopptr();
if (t != NULL && t->singleton()) {
- ciField* field = phase->C->env()->String_klass()->get_field_by_offset(off, false);
+ ciField* field = env->String_klass()->get_field_by_offset(off, false);
if (field != NULL && field->is_final()) {
ciObject* string = t->const_oop();
ciConstant constant = string->as_instance()->field_value(field);
@@ -1576,6 +1579,32 @@ const Type *LoadNode::Value( PhaseTransform *phase ) const {
}
}
}
+ // Optimizations for constant objects
+ ciObject* const_oop = tinst->const_oop();
+ if (const_oop != NULL) {
+ // For constant CallSites treat the target field as a compile time constant.
+ if (const_oop->is_call_site()) {
+ ciCallSite* call_site = const_oop->as_call_site();
+ ciField* field = call_site->klass()->as_instance_klass()->get_field_by_offset(off, /*is_static=*/ false);
+ if (field != NULL && field->is_call_site_target()) {
+ ciMethodHandle* target = call_site->get_target();
+ if (target != NULL) { // just in case
+ ciConstant constant(T_OBJECT, target);
+ const Type* t;
+ if (adr->bottom_type()->is_ptr_to_narrowoop()) {
+ t = TypeNarrowOop::make_from_constant(constant.as_object(), true);
+ } else {
+ t = TypeOopPtr::make_from_constant(constant.as_object(), true);
+ }
+ // Add a dependence for invalidation of the optimization.
+ if (!call_site->is_constant_call_site()) {
+ C->dependencies()->assert_call_site_target_value(call_site, target);
+ }
+ return t;
+ }
+ }
+ }
+ }
} else if (tp->base() == Type::KlassPtr) {
assert( off != Type::OffsetBot ||
// arrays can be cast to Objects
@@ -2666,6 +2695,8 @@ MemBarNode* MemBarNode::make(Compile* C, int opcode, int atp, Node* pn) {
switch (opcode) {
case Op_MemBarAcquire: return new(C, len) MemBarAcquireNode(C, atp, pn);
case Op_MemBarRelease: return new(C, len) MemBarReleaseNode(C, atp, pn);
+ case Op_MemBarAcquireLock: return new(C, len) MemBarAcquireLockNode(C, atp, pn);
+ case Op_MemBarReleaseLock: return new(C, len) MemBarReleaseLockNode(C, atp, pn);
case Op_MemBarVolatile: return new(C, len) MemBarVolatileNode(C, atp, pn);
case Op_MemBarCPUOrder: return new(C, len) MemBarCPUOrderNode(C, atp, pn);
case Op_Initialize: return new(C, len) InitializeNode(C, atp, pn);
@@ -2816,7 +2847,7 @@ Node *MemBarNode::match( const ProjNode *proj, const Matcher *m ) {
//---------------------------InitializeNode------------------------------------
InitializeNode::InitializeNode(Compile* C, int adr_type, Node* rawoop)
- : _is_complete(false),
+ : _is_complete(Incomplete),
MemBarNode(C, adr_type, rawoop)
{
init_class_id(Class_Initialize);
@@ -2854,7 +2885,7 @@ bool InitializeNode::is_non_zero() {
void InitializeNode::set_complete(PhaseGVN* phase) {
assert(!is_complete(), "caller responsibility");
- _is_complete = true;
+ _is_complete = Complete;
// After this node is complete, it contains a bunch of
// raw-memory initializations. There is no need for
diff --git a/hotspot/src/share/vm/opto/memnode.hpp b/hotspot/src/share/vm/opto/memnode.hpp
index 9608b33..d757b13 100644
--- a/hotspot/src/share/vm/opto/memnode.hpp
+++ b/hotspot/src/share/vm/opto/memnode.hpp
@@ -879,7 +879,7 @@ public:
// "Acquire" - no following ref can move before (but earlier refs can
// follow, like an early Load stalled in cache). Requires multi-cpu
-// visibility. Inserted after a volatile load or FastLock.
+// visibility. Inserted after a volatile load.
class MemBarAcquireNode: public MemBarNode {
public:
MemBarAcquireNode(Compile* C, int alias_idx, Node* precedent)
@@ -889,7 +889,7 @@ public:
// "Release" - no earlier ref can move after (but later refs can move
// up, like a speculative pipelined cache-hitting Load). Requires
-// multi-cpu visibility. Inserted before a volatile store or FastUnLock.
+// multi-cpu visibility. Inserted before a volatile store.
class MemBarReleaseNode: public MemBarNode {
public:
MemBarReleaseNode(Compile* C, int alias_idx, Node* precedent)
@@ -897,6 +897,26 @@ public:
virtual int Opcode() const;
};
+// "Acquire" - no following ref can move before (but earlier refs can
+// follow, like an early Load stalled in cache). Requires multi-cpu
+// visibility. Inserted after a FastLock.
+class MemBarAcquireLockNode: public MemBarNode {
+public:
+ MemBarAcquireLockNode(Compile* C, int alias_idx, Node* precedent)
+ : MemBarNode(C, alias_idx, precedent) {}
+ virtual int Opcode() const;
+};
+
+// "Release" - no earlier ref can move after (but later refs can move
+// up, like a speculative pipelined cache-hitting Load). Requires
+// multi-cpu visibility. Inserted before a FastUnLock.
+class MemBarReleaseLockNode: public MemBarNode {
+public:
+ MemBarReleaseLockNode(Compile* C, int alias_idx, Node* precedent)
+ : MemBarNode(C, alias_idx, precedent) {}
+ virtual int Opcode() const;
+};
+
// Ordering between a volatile store and a following volatile load.
// Requires multi-CPU visibility?
class MemBarVolatileNode: public MemBarNode {
@@ -922,7 +942,12 @@ public:
class InitializeNode: public MemBarNode {
friend class AllocateNode;
- bool _is_complete;
+ enum {
+ Incomplete = 0,
+ Complete = 1,
+ WithArraycopy = 2
+ };
+ int _is_complete;
public:
enum {
@@ -956,10 +981,12 @@ public:
// An InitializeNode must completed before macro expansion is done.
// Completion requires that the AllocateNode must be followed by
// initialization of the new memory to zero, then to any initializers.
- bool is_complete() { return _is_complete; }
+ bool is_complete() { return _is_complete != Incomplete; }
+ bool is_complete_with_arraycopy() { return (_is_complete & WithArraycopy) != 0; }
// Mark complete. (Must not yet be complete.)
void set_complete(PhaseGVN* phase);
+ void set_complete_with_arraycopy() { _is_complete = Complete | WithArraycopy; }
#ifdef ASSERT
// ensure all non-degenerate stores are ordered and non-overlapping
@@ -1258,6 +1285,16 @@ public:
virtual int Opcode() const;
virtual uint ideal_reg() const { return NotAMachineReg; }
virtual uint match_edge(uint idx) const { return idx==2; }
+ virtual const Type *bottom_type() const { return Type::ABIO; }
+};
+
+// Allocation prefetch which may fault, TLAB size have to be adjusted.
+class PrefetchAllocationNode : public Node {
+public:
+ PrefetchAllocationNode(Node *mem, Node *adr) : Node(0,mem,adr) {}
+ virtual int Opcode() const;
+ virtual uint ideal_reg() const { return NotAMachineReg; }
+ virtual uint match_edge(uint idx) const { return idx==2; }
virtual const Type *bottom_type() const { return ( AllocatePrefetchStyle == 3 ) ? Type::MEMORY : Type::ABIO; }
};
diff --git a/hotspot/src/share/vm/opto/mulnode.cpp b/hotspot/src/share/vm/opto/mulnode.cpp
index cf838c7..f086319 100644
--- a/hotspot/src/share/vm/opto/mulnode.cpp
+++ b/hotspot/src/share/vm/opto/mulnode.cpp
@@ -98,7 +98,7 @@ Node *MulNode::Ideal(PhaseGVN *phase, bool can_reshape) {
const Type *t12 = phase->type( mul1->in(2) );
if( t12->singleton() && t12 != Type::TOP) { // Left input is an add of a constant?
// Compute new constant; check for overflow
- const Type *tcon01 = mul1->as_Mul()->mul_ring(t2,t12);
+ const Type *tcon01 = ((MulNode*)mul1)->mul_ring(t2,t12);
if( tcon01->singleton() ) {
// The Mul of the flattened expression
set_req(1, mul1->in(1));
diff --git a/hotspot/src/share/vm/opto/mulnode.hpp b/hotspot/src/share/vm/opto/mulnode.hpp
index a674940..11cc771 100644
--- a/hotspot/src/share/vm/opto/mulnode.hpp
+++ b/hotspot/src/share/vm/opto/mulnode.hpp
@@ -41,9 +41,7 @@ class PhaseTransform;
class MulNode : public Node {
virtual uint hash() const;
public:
- MulNode( Node *in1, Node *in2 ): Node(0,in1,in2) {
- init_class_id(Class_Mul);
- }
+ MulNode( Node *in1, Node *in2 ): Node(0,in1,in2) {}
// Handle algebraic identities here. If we have an identity, return the Node
// we are equivalent to. We look for "add of zero" as an identity.
diff --git a/hotspot/src/share/vm/opto/node.hpp b/hotspot/src/share/vm/opto/node.hpp
index 37a658d..8564a77 100644
--- a/hotspot/src/share/vm/opto/node.hpp
+++ b/hotspot/src/share/vm/opto/node.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -67,6 +67,8 @@ class EncodePNode;
class FastLockNode;
class FastUnlockNode;
class IfNode;
+class IfFalseNode;
+class IfTrueNode;
class InitializeNode;
class JVMState;
class JumpNode;
@@ -75,6 +77,7 @@ class LoadNode;
class LoadStoreNode;
class LockNode;
class LoopNode;
+class MachBranchNode;
class MachCallDynamicJavaNode;
class MachCallJavaNode;
class MachCallLeafNode;
@@ -83,9 +86,11 @@ class MachCallRuntimeNode;
class MachCallStaticJavaNode;
class MachConstantBaseNode;
class MachConstantNode;
+class MachGotoNode;
class MachIfNode;
class MachNode;
class MachNullCheckNode;
+class MachProjNode;
class MachReturnNode;
class MachSafePointNode;
class MachSpillCopyNode;
@@ -94,7 +99,6 @@ class Matcher;
class MemBarNode;
class MemNode;
class MergeMemNode;
-class MulNode;
class MultiNode;
class MultiBranchNode;
class NeverBranchNode;
@@ -127,9 +131,10 @@ class SubNode;
class Type;
class TypeNode;
class UnlockNode;
+class VectorNode;
+class VectorLoadNode;
+class VectorStoreNode;
class VectorSet;
-class IfTrueNode;
-class IfFalseNode;
typedef void (*NFunc)(Node&,void*);
extern "C" {
typedef int (*C_sort_func_t)(const void *, const void *);
@@ -179,6 +184,8 @@ typedef Node** DUIterator_Last;
// whenever I have phase-specific information.
class Node {
+ friend class VMStructs;
+
// Lots of restrictions on cloning Nodes
Node(const Node&); // not defined; linker error to use these
Node &operator=(const Node &rhs);
@@ -568,50 +575,55 @@ public:
DEFINE_CLASS_ID(MachCallDynamicJava, MachCallJava, 1)
DEFINE_CLASS_ID(MachCallRuntime, MachCall, 1)
DEFINE_CLASS_ID(MachCallLeaf, MachCallRuntime, 0)
- DEFINE_CLASS_ID(MachSpillCopy, Mach, 1)
- DEFINE_CLASS_ID(MachNullCheck, Mach, 2)
- DEFINE_CLASS_ID(MachIf, Mach, 3)
- DEFINE_CLASS_ID(MachTemp, Mach, 4)
- DEFINE_CLASS_ID(MachConstantBase, Mach, 5)
- DEFINE_CLASS_ID(MachConstant, Mach, 6)
-
- DEFINE_CLASS_ID(Proj, Node, 2)
+ DEFINE_CLASS_ID(MachBranch, Mach, 1)
+ DEFINE_CLASS_ID(MachIf, MachBranch, 0)
+ DEFINE_CLASS_ID(MachGoto, MachBranch, 1)
+ DEFINE_CLASS_ID(MachNullCheck, MachBranch, 2)
+ DEFINE_CLASS_ID(MachSpillCopy, Mach, 2)
+ DEFINE_CLASS_ID(MachTemp, Mach, 3)
+ DEFINE_CLASS_ID(MachConstantBase, Mach, 4)
+ DEFINE_CLASS_ID(MachConstant, Mach, 5)
+
+ DEFINE_CLASS_ID(Type, Node, 2)
+ DEFINE_CLASS_ID(Phi, Type, 0)
+ DEFINE_CLASS_ID(ConstraintCast, Type, 1)
+ DEFINE_CLASS_ID(CheckCastPP, Type, 2)
+ DEFINE_CLASS_ID(CMove, Type, 3)
+ DEFINE_CLASS_ID(SafePointScalarObject, Type, 4)
+ DEFINE_CLASS_ID(DecodeN, Type, 5)
+ DEFINE_CLASS_ID(EncodeP, Type, 6)
+
+ DEFINE_CLASS_ID(Proj, Node, 3)
DEFINE_CLASS_ID(CatchProj, Proj, 0)
DEFINE_CLASS_ID(JumpProj, Proj, 1)
DEFINE_CLASS_ID(IfTrue, Proj, 2)
DEFINE_CLASS_ID(IfFalse, Proj, 3)
DEFINE_CLASS_ID(Parm, Proj, 4)
+ DEFINE_CLASS_ID(MachProj, Proj, 5)
- DEFINE_CLASS_ID(Region, Node, 3)
+ DEFINE_CLASS_ID(Mem, Node, 4)
+ DEFINE_CLASS_ID(Load, Mem, 0)
+ DEFINE_CLASS_ID(VectorLoad, Load, 0)
+ DEFINE_CLASS_ID(Store, Mem, 1)
+ DEFINE_CLASS_ID(VectorStore, Store, 0)
+ DEFINE_CLASS_ID(LoadStore, Mem, 2)
+
+ DEFINE_CLASS_ID(Region, Node, 5)
DEFINE_CLASS_ID(Loop, Region, 0)
DEFINE_CLASS_ID(Root, Loop, 0)
DEFINE_CLASS_ID(CountedLoop, Loop, 1)
- DEFINE_CLASS_ID(Sub, Node, 4)
+ DEFINE_CLASS_ID(Sub, Node, 6)
DEFINE_CLASS_ID(Cmp, Sub, 0)
DEFINE_CLASS_ID(FastLock, Cmp, 0)
DEFINE_CLASS_ID(FastUnlock, Cmp, 1)
- DEFINE_CLASS_ID(Type, Node, 5)
- DEFINE_CLASS_ID(Phi, Type, 0)
- DEFINE_CLASS_ID(ConstraintCast, Type, 1)
- DEFINE_CLASS_ID(CheckCastPP, Type, 2)
- DEFINE_CLASS_ID(CMove, Type, 3)
- DEFINE_CLASS_ID(SafePointScalarObject, Type, 4)
- DEFINE_CLASS_ID(DecodeN, Type, 5)
- DEFINE_CLASS_ID(EncodeP, Type, 6)
-
- DEFINE_CLASS_ID(Mem, Node, 6)
- DEFINE_CLASS_ID(Load, Mem, 0)
- DEFINE_CLASS_ID(Store, Mem, 1)
- DEFINE_CLASS_ID(LoadStore, Mem, 2)
-
DEFINE_CLASS_ID(MergeMem, Node, 7)
DEFINE_CLASS_ID(Bool, Node, 8)
DEFINE_CLASS_ID(AddP, Node, 9)
DEFINE_CLASS_ID(BoxLock, Node, 10)
DEFINE_CLASS_ID(Add, Node, 11)
- DEFINE_CLASS_ID(Mul, Node, 12)
+ DEFINE_CLASS_ID(Vector, Node, 12)
DEFINE_CLASS_ID(ClearArray, Node, 13)
_max_classes = ClassMask_ClearArray
@@ -621,21 +633,15 @@ public:
// Flags are sorted by usage frequency.
enum NodeFlags {
Flag_is_Copy = 0x01, // should be first bit to avoid shift
- Flag_is_Call = Flag_is_Copy << 1,
- Flag_rematerialize = Flag_is_Call << 1,
+ Flag_rematerialize = Flag_is_Copy << 1,
Flag_needs_anti_dependence_check = Flag_rematerialize << 1,
Flag_is_macro = Flag_needs_anti_dependence_check << 1,
Flag_is_Con = Flag_is_macro << 1,
Flag_is_cisc_alternate = Flag_is_Con << 1,
- Flag_is_Branch = Flag_is_cisc_alternate << 1,
- Flag_is_block_start = Flag_is_Branch << 1,
- Flag_is_Goto = Flag_is_block_start << 1,
- Flag_is_dead_loop_safe = Flag_is_Goto << 1,
+ Flag_is_dead_loop_safe = Flag_is_cisc_alternate << 1,
Flag_may_be_short_branch = Flag_is_dead_loop_safe << 1,
- Flag_is_safepoint_node = Flag_may_be_short_branch << 1,
- Flag_is_pc_relative = Flag_is_safepoint_node << 1,
- Flag_is_Vector = Flag_is_pc_relative << 1,
- _max_flags = (Flag_is_Vector << 1) - 1 // allow flags combination
+ Flag_avoid_back_to_back = Flag_may_be_short_branch << 1,
+ _max_flags = (Flag_avoid_back_to_back << 1) - 1 // allow flags combination
};
private:
@@ -669,21 +675,6 @@ public:
virtual uint size_of() const;
// Other interesting Node properties
-
- // Special case: is_Call() returns true for both CallNode and MachCallNode.
- bool is_Call() const {
- return (_flags & Flag_is_Call) != 0;
- }
-
- CallNode* isa_Call() const {
- return is_Call() ? as_Call() : NULL;
- }
-
- CallNode *as_Call() const { // Only for CallNode (not for MachCallNode)
- assert((_class_id & ClassMask_Call) == Class_Call, "invalid node class");
- return (CallNode*)this;
- }
-
#define DEFINE_CLASS_QUERY(type) \
bool is_##type() const { \
return ((_class_id & ClassMask_##type) == Class_##type); \
@@ -703,6 +694,7 @@ public:
DEFINE_CLASS_QUERY(AllocateArray)
DEFINE_CLASS_QUERY(Bool)
DEFINE_CLASS_QUERY(BoxLock)
+ DEFINE_CLASS_QUERY(Call)
DEFINE_CLASS_QUERY(CallDynamicJava)
DEFINE_CLASS_QUERY(CallJava)
DEFINE_CLASS_QUERY(CallLeaf)
@@ -732,6 +724,7 @@ public:
DEFINE_CLASS_QUERY(Lock)
DEFINE_CLASS_QUERY(Loop)
DEFINE_CLASS_QUERY(Mach)
+ DEFINE_CLASS_QUERY(MachBranch)
DEFINE_CLASS_QUERY(MachCall)
DEFINE_CLASS_QUERY(MachCallDynamicJava)
DEFINE_CLASS_QUERY(MachCallJava)
@@ -740,8 +733,10 @@ public:
DEFINE_CLASS_QUERY(MachCallStaticJava)
DEFINE_CLASS_QUERY(MachConstantBase)
DEFINE_CLASS_QUERY(MachConstant)
+ DEFINE_CLASS_QUERY(MachGoto)
DEFINE_CLASS_QUERY(MachIf)
DEFINE_CLASS_QUERY(MachNullCheck)
+ DEFINE_CLASS_QUERY(MachProj)
DEFINE_CLASS_QUERY(MachReturn)
DEFINE_CLASS_QUERY(MachSafePoint)
DEFINE_CLASS_QUERY(MachSpillCopy)
@@ -749,7 +744,6 @@ public:
DEFINE_CLASS_QUERY(Mem)
DEFINE_CLASS_QUERY(MemBar)
DEFINE_CLASS_QUERY(MergeMem)
- DEFINE_CLASS_QUERY(Mul)
DEFINE_CLASS_QUERY(Multi)
DEFINE_CLASS_QUERY(MultiBranch)
DEFINE_CLASS_QUERY(Parm)
@@ -764,6 +758,9 @@ public:
DEFINE_CLASS_QUERY(Store)
DEFINE_CLASS_QUERY(Sub)
DEFINE_CLASS_QUERY(Type)
+ DEFINE_CLASS_QUERY(Vector)
+ DEFINE_CLASS_QUERY(VectorLoad)
+ DEFINE_CLASS_QUERY(VectorStore)
DEFINE_CLASS_QUERY(Unlock)
#undef DEFINE_CLASS_QUERY
@@ -774,7 +771,6 @@ public:
}
bool is_Con () const { return (_flags & Flag_is_Con) != 0; }
- bool is_Goto() const { return (_flags & Flag_is_Goto) != 0; }
// The data node which is safe to leave in dead loop during IGVN optimization.
bool is_dead_loop_safe() const {
return is_Phi() || (is_Proj() && in(0) == NULL) ||
@@ -795,9 +791,6 @@ public:
// skip some other important test.)
virtual bool depends_only_on_test() const { assert(!is_CFG(), ""); return true; };
- // defined for MachNodes that match 'If' | 'Goto' | 'CountedLoopEnd'
- bool is_Branch() const { return (_flags & Flag_is_Branch) != 0; }
-
// When building basic blocks, I need to have a notion of block beginning
// Nodes, next block selector Nodes (block enders), and next block
// projections. These calls need to work on their machine equivalents. The
@@ -806,7 +799,7 @@ public:
if ( is_Region() )
return this == (const Node*)in(0);
else
- return (_flags & Flag_is_block_start) != 0;
+ return is_Start();
}
// The Ideal control projection Nodes are IfTrue/IfFalse, JumpProjNode, Root,
@@ -816,9 +809,6 @@ public:
// The node is a "macro" node which needs to be expanded before matching
bool is_macro() const { return (_flags & Flag_is_macro) != 0; }
- // Value is a vector of primitive values
- bool is_Vector() const { return (_flags & Flag_is_Vector) != 0; }
-
//----------------- Optimization
// Get the worst-case Type output for this Node.
@@ -1298,6 +1288,7 @@ class SimpleDUIterator : public StackObj {
// Note that the constructor just zeros things, and since I use Arena
// allocation I do not need a destructor to reclaim storage.
class Node_Array : public ResourceObj {
+ friend class VMStructs;
protected:
Arena *_a; // Arena to allocate in
uint _max;
@@ -1328,6 +1319,7 @@ public:
};
class Node_List : public Node_Array {
+ friend class VMStructs;
uint _cnt;
public:
Node_List() : Node_Array(Thread::current()->resource_area()), _cnt(0) {}
@@ -1351,6 +1343,7 @@ public:
//------------------------------Unique_Node_List-------------------------------
class Unique_Node_List : public Node_List {
+ friend class VMStructs;
VectorSet _in_worklist;
uint _clock_index; // Index in list where to pop from next
public:
@@ -1401,6 +1394,7 @@ inline void Compile::record_for_igvn(Node* n) {
//------------------------------Node_Stack-------------------------------------
class Node_Stack {
+ friend class VMStructs;
protected:
struct INode {
Node *node; // Processed node
@@ -1473,6 +1467,7 @@ public:
// Debugging or profiling annotations loosely and sparsely associated
// with some nodes. See Compile::node_notes_at for the accessor.
class Node_Notes VALUE_OBJ_CLASS_SPEC {
+ friend class VMStructs;
JVMState* _jvms;
public:
diff --git a/hotspot/src/share/vm/opto/optoreg.hpp b/hotspot/src/share/vm/opto/optoreg.hpp
index 58c9f1c..e6427ea 100644
--- a/hotspot/src/share/vm/opto/optoreg.hpp
+++ b/hotspot/src/share/vm/opto/optoreg.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 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
@@ -172,6 +172,7 @@ class OptoReg VALUE_OBJ_CLASS_SPEC {
// and converting that will return OptoReg::Bad losing the identity of the OptoReg.
class OptoRegPair {
+ friend class VMStructs;
private:
short _second;
short _first;
diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp
index 8bd9c93..d9317d6 100644
--- a/hotspot/src/share/vm/opto/output.cpp
+++ b/hotspot/src/share/vm/opto/output.cpp
@@ -128,6 +128,14 @@ void Compile::Output() {
if ( ZapDeadCompiledLocals ) Insert_zap_nodes();
# endif
+ uint* blk_starts = NEW_RESOURCE_ARRAY(uint,_cfg->_num_blocks+1);
+ blk_starts[0] = 0;
+
+ // Initialize code buffer and process short branches.
+ CodeBuffer* cb = init_buffer(blk_starts);
+
+ if (cb == NULL || failing()) return;
+
ScheduleAndBundle();
#ifndef PRODUCT
@@ -152,7 +160,7 @@ void Compile::Output() {
if (failing()) return;
- Fill_buffer();
+ fill_buffer(cb, blk_starts);
}
bool Compile::need_stack_bang(int frame_size_in_bytes) const {
@@ -325,22 +333,22 @@ void Compile::compute_loop_first_inst_sizes() {
} // if( MaxLoopPad < OptoLoopAlignment-1 )
}
-//----------------------Shorten_branches---------------------------------------
+//----------------------shorten_branches---------------------------------------
// The architecture description provides short branch variants for some long
// branch instructions. Replace eligible long branches with short branches.
-void Compile::Shorten_branches(Label *labels, int& code_size, int& reloc_size, int& stub_size) {
-
- // fill in the nop array for bundling computations
- MachNode *_nop_list[Bundle::_nop_count];
- Bundle::initialize_nops(_nop_list, this);
+void Compile::shorten_branches(uint* blk_starts, int& code_size, int& reloc_size, int& stub_size) {
// ------------------
// Compute size of each block, method size, and relocation information size
- uint *jmp_end = NEW_RESOURCE_ARRAY(uint,_cfg->_num_blocks);
- uint *blk_starts = NEW_RESOURCE_ARRAY(uint,_cfg->_num_blocks+1);
- DEBUG_ONLY( uint *jmp_target = NEW_RESOURCE_ARRAY(uint,_cfg->_num_blocks); )
- DEBUG_ONLY( uint *jmp_rule = NEW_RESOURCE_ARRAY(uint,_cfg->_num_blocks); )
- blk_starts[0] = 0;
+ uint nblocks = _cfg->_num_blocks;
+
+ uint* jmp_offset = NEW_RESOURCE_ARRAY(uint,nblocks);
+ uint* jmp_size = NEW_RESOURCE_ARRAY(uint,nblocks);
+ int* jmp_nidx = NEW_RESOURCE_ARRAY(int ,nblocks);
+ DEBUG_ONLY( uint *jmp_target = NEW_RESOURCE_ARRAY(uint,nblocks); )
+ DEBUG_ONLY( uint *jmp_rule = NEW_RESOURCE_ARRAY(uint,nblocks); )
+
+ bool has_short_branch_candidate = false;
// Initialize the sizes to 0
code_size = 0; // Size in bytes of generated code
@@ -350,28 +358,34 @@ void Compile::Shorten_branches(Label *labels, int& code_size, int& reloc_size, i
reloc_size = 1; // Number of relocation entries
// Make three passes. The first computes pessimistic blk_starts,
- // relative jmp_end and reloc_size information. The second performs
+ // relative jmp_offset and reloc_size information. The second performs
// short branch substitution using the pessimistic sizing. The
// third inserts nops where needed.
- Node *nj; // tmp
-
// Step one, perform a pessimistic sizing pass.
- uint i;
- uint min_offset_from_last_call = 1; // init to a positive value
+ uint last_call_adr = max_uint;
+ uint last_avoid_back_to_back_adr = max_uint;
uint nop_size = (new (this) MachNopNode())->size(_regalloc);
- for( i=0; i<_cfg->_num_blocks; i++ ) { // For all blocks
+ for (uint i = 0; i < nblocks; i++) { // For all blocks
Block *b = _cfg->_blocks[i];
+ // During short branch replacement, we store the relative (to blk_starts)
+ // offset of jump in jmp_offset, rather than the absolute offset of jump.
+ // This is so that we do not need to recompute sizes of all nodes when
+ // we compute correct blk_starts in our next sizing pass.
+ jmp_offset[i] = 0;
+ jmp_size[i] = 0;
+ jmp_nidx[i] = -1;
+ DEBUG_ONLY( jmp_target[i] = 0; )
+ DEBUG_ONLY( jmp_rule[i] = 0; )
+
// Sum all instruction sizes to compute block size
uint last_inst = b->_nodes.size();
uint blk_size = 0;
- for( uint j = 0; j<last_inst; j++ ) {
- nj = b->_nodes[j];
- uint inst_size = nj->size(_regalloc);
- blk_size += inst_size;
+ for (uint j = 0; j < last_inst; j++) {
+ Node* nj = b->_nodes[j];
// Handle machine instruction nodes
- if( nj->is_Mach() ) {
+ if (nj->is_Mach()) {
MachNode *mach = nj->as_Mach();
blk_size += (mach->alignment_required() - 1) * relocInfo::addr_unit(); // assume worst case padding
reloc_size += mach->reloc();
@@ -388,32 +402,52 @@ void Compile::Shorten_branches(Label *labels, int& code_size, int& reloc_size, i
} else if (mach->is_MachSafePoint()) {
// If call/safepoint are adjacent, account for possible
// nop to disambiguate the two safepoints.
- if (min_offset_from_last_call == 0) {
+ // ScheduleAndBundle() can rearrange nodes in a block,
+ // check for all offsets inside this block.
+ if (last_call_adr >= blk_starts[i]) {
blk_size += nop_size;
}
}
+ if (mach->avoid_back_to_back()) {
+ // Nop is inserted between "avoid back to back" instructions.
+ // ScheduleAndBundle() can rearrange nodes in a block,
+ // check for all offsets inside this block.
+ if (last_avoid_back_to_back_adr >= blk_starts[i]) {
+ blk_size += nop_size;
+ }
+ }
+ if (mach->may_be_short_branch()) {
+ if (!nj->is_MachBranch()) {
+#ifndef PRODUCT
+ nj->dump(3);
+#endif
+ Unimplemented();
+ }
+ assert(jmp_nidx[i] == -1, "block should have only one branch");
+ jmp_offset[i] = blk_size;
+ jmp_size[i] = nj->size(_regalloc);
+ jmp_nidx[i] = j;
+ has_short_branch_candidate = true;
+ }
}
- min_offset_from_last_call += inst_size;
+ blk_size += nj->size(_regalloc);
// Remember end of call offset
- if (nj->is_MachCall() && nj->as_MachCall()->is_safepoint_node()) {
- min_offset_from_last_call = 0;
+ if (nj->is_MachCall() && !nj->is_MachCallLeaf()) {
+ last_call_adr = blk_starts[i]+blk_size;
+ }
+ // Remember end of avoid_back_to_back offset
+ if (nj->is_Mach() && nj->as_Mach()->avoid_back_to_back()) {
+ last_avoid_back_to_back_adr = blk_starts[i]+blk_size;
}
}
- // During short branch replacement, we store the relative (to blk_starts)
- // end of jump in jmp_end, rather than the absolute end of jump. This
- // is so that we do not need to recompute sizes of all nodes when we compute
- // correct blk_starts in our next sizing pass.
- jmp_end[i] = blk_size;
- DEBUG_ONLY( jmp_target[i] = 0; )
-
// When the next block starts a loop, we may insert pad NOP
// instructions. Since we cannot know our future alignment,
// assume the worst.
- if( i<_cfg->_num_blocks-1 ) {
+ if (i< nblocks-1) {
Block *nb = _cfg->_blocks[i+1];
int max_loop_pad = nb->code_alignment()-relocInfo::addr_unit();
- if( max_loop_pad > 0 ) {
+ if (max_loop_pad > 0) {
assert(is_power_of_2(max_loop_pad+relocInfo::addr_unit()), "");
blk_size += max_loop_pad;
}
@@ -424,124 +458,100 @@ void Compile::Shorten_branches(Label *labels, int& code_size, int& reloc_size, i
}
// Step two, replace eligible long jumps.
+ bool progress = true;
+ uint last_may_be_short_branch_adr = max_uint;
+ while (has_short_branch_candidate && progress) {
+ progress = false;
+ has_short_branch_candidate = false;
+ int adjust_block_start = 0;
+ for (uint i = 0; i < nblocks; i++) {
+ Block *b = _cfg->_blocks[i];
+ int idx = jmp_nidx[i];
+ MachNode* mach = (idx == -1) ? NULL: b->_nodes[idx]->as_Mach();
+ if (mach != NULL && mach->may_be_short_branch()) {
+#ifdef ASSERT
+ assert(jmp_size[i] > 0 && mach->is_MachBranch(), "sanity");
+ int j;
+ // Find the branch; ignore trailing NOPs.
+ for (j = b->_nodes.size()-1; j>=0; j--) {
+ Node* n = b->_nodes[j];
+ if (!n->is_Mach() || n->as_Mach()->ideal_Opcode() != Op_Con)
+ break;
+ }
+ assert(j >= 0 && j == idx && b->_nodes[j] == (Node*)mach, "sanity");
+#endif
+ int br_size = jmp_size[i];
+ int br_offs = blk_starts[i] + jmp_offset[i];
- // Note: this will only get the long branches within short branch
- // range. Another pass might detect more branches that became
- // candidates because the shortening in the first pass exposed
- // more opportunities. Unfortunately, this would require
- // recomputing the starting and ending positions for the blocks
- for( i=0; i<_cfg->_num_blocks; i++ ) {
- Block *b = _cfg->_blocks[i];
-
- int j;
- // Find the branch; ignore trailing NOPs.
- for( j = b->_nodes.size()-1; j>=0; j-- ) {
- nj = b->_nodes[j];
- if( !nj->is_Mach() || nj->as_Mach()->ideal_Opcode() != Op_Con )
- break;
- }
-
- if (j >= 0) {
- if( nj->is_Mach() && nj->as_Mach()->may_be_short_branch() ) {
- MachNode *mach = nj->as_Mach();
// This requires the TRUE branch target be in succs[0]
uint bnum = b->non_connector_successor(0)->_pre_order;
- uintptr_t target = blk_starts[bnum];
- if( mach->is_pc_relative() ) {
- int offset = target-(blk_starts[i] + jmp_end[i]);
- if (_matcher->is_short_branch_offset(mach->rule(), offset)) {
- // We've got a winner. Replace this branch.
- MachNode* replacement = mach->short_branch_version(this);
- b->_nodes.map(j, replacement);
- mach->subsume_by(replacement);
-
- // Update the jmp_end size to save time in our
- // next pass.
- jmp_end[i] -= (mach->size(_regalloc) - replacement->size(_regalloc));
- DEBUG_ONLY( jmp_target[i] = bnum; );
- DEBUG_ONLY( jmp_rule[i] = mach->rule(); );
+ int offset = blk_starts[bnum] - br_offs;
+ if (bnum > i) { // adjust following block's offset
+ offset -= adjust_block_start;
+ }
+ // In the following code a nop could be inserted before
+ // the branch which will increase the backward distance.
+ bool needs_padding = ((uint)br_offs == last_may_be_short_branch_adr);
+ if (needs_padding && offset <= 0)
+ offset -= nop_size;
+
+ if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
+ // We've got a winner. Replace this branch.
+ MachNode* replacement = mach->as_MachBranch()->short_branch_version(this);
+
+ // Update the jmp_size.
+ int new_size = replacement->size(_regalloc);
+ int diff = br_size - new_size;
+ assert(diff >= (int)nop_size, "short_branch size should be smaller");
+ // Conservatively take into accound padding between
+ // avoid_back_to_back branches. Previous branch could be
+ // converted into avoid_back_to_back branch during next
+ // rounds.
+ if (needs_padding && replacement->avoid_back_to_back()) {
+ jmp_offset[i] += nop_size;
+ diff -= nop_size;
}
+ adjust_block_start += diff;
+ b->_nodes.map(idx, replacement);
+ mach->subsume_by(replacement);
+ mach = replacement;
+ progress = true;
+
+ jmp_size[i] = new_size;
+ DEBUG_ONLY( jmp_target[i] = bnum; );
+ DEBUG_ONLY( jmp_rule[i] = mach->rule(); );
} else {
-#ifndef PRODUCT
- mach->dump(3);
-#endif
- Unimplemented();
- }
- }
- }
- }
-
- // Compute the size of first NumberOfLoopInstrToAlign instructions at head
- // of a loop. It is used to determine the padding for loop alignment.
- compute_loop_first_inst_sizes();
-
- // Step 3, compute the offsets of all the labels
- uint last_call_adr = max_uint;
- for( i=0; i<_cfg->_num_blocks; i++ ) { // For all blocks
- // copy the offset of the beginning to the corresponding label
- assert(labels[i].is_unused(), "cannot patch at this point");
- labels[i].bind_loc(blk_starts[i], CodeBuffer::SECT_INSTS);
-
- // insert padding for any instructions that need it
- Block *b = _cfg->_blocks[i];
- uint last_inst = b->_nodes.size();
- uint adr = blk_starts[i];
- for( uint j = 0; j<last_inst; j++ ) {
- nj = b->_nodes[j];
- if( nj->is_Mach() ) {
- int padding = nj->as_Mach()->compute_padding(adr);
- // If call/safepoint are adjacent insert a nop (5010568)
- if (padding == 0 && nj->is_MachSafePoint() && !nj->is_MachCall() &&
- adr == last_call_adr ) {
- padding = nop_size;
+ // The jump distance is not short, try again during next iteration.
+ has_short_branch_candidate = true;
}
- if(padding > 0) {
- assert((padding % nop_size) == 0, "padding is not a multiple of NOP size");
- int nops_cnt = padding / nop_size;
- MachNode *nop = new (this) MachNopNode(nops_cnt);
- b->_nodes.insert(j++, nop);
- _cfg->_bbs.map( nop->_idx, b );
- adr += padding;
- last_inst++;
- }
- }
- adr += nj->size(_regalloc);
-
- // Remember end of call offset
- if (nj->is_MachCall() && nj->as_MachCall()->is_safepoint_node()) {
- last_call_adr = adr;
+ } // (mach->may_be_short_branch())
+ if (mach != NULL && (mach->may_be_short_branch() ||
+ mach->avoid_back_to_back())) {
+ last_may_be_short_branch_adr = blk_starts[i] + jmp_offset[i] + jmp_size[i];
}
- }
-
- if ( i != _cfg->_num_blocks-1) {
- // Get the size of the block
- uint blk_size = adr - blk_starts[i];
-
- // When the next block is the top of a loop, we may insert pad NOP
- // instructions.
- Block *nb = _cfg->_blocks[i+1];
- int current_offset = blk_starts[i] + blk_size;
- current_offset += nb->alignment_padding(current_offset);
- // Save block size; update total method size
- blk_starts[i+1] = current_offset;
+ blk_starts[i+1] -= adjust_block_start;
}
}
#ifdef ASSERT
- for( i=0; i<_cfg->_num_blocks; i++ ) { // For all blocks
- if( jmp_target[i] != 0 ) {
- int offset = blk_starts[jmp_target[i]]-(blk_starts[i] + jmp_end[i]);
- if (!_matcher->is_short_branch_offset(jmp_rule[i], offset)) {
- tty->print_cr("target (%d) - jmp_end(%d) = offset (%d), jmp_block B%d, target_block B%d", blk_starts[jmp_target[i]], blk_starts[i] + jmp_end[i], offset, i, jmp_target[i]);
+ for (uint i = 0; i < nblocks; i++) { // For all blocks
+ if (jmp_target[i] != 0) {
+ int br_size = jmp_size[i];
+ int offset = blk_starts[jmp_target[i]]-(blk_starts[i] + jmp_offset[i]);
+ if (!_matcher->is_short_branch_offset(jmp_rule[i], br_size, offset)) {
+ tty->print_cr("target (%d) - jmp_offset(%d) = offset (%d), jump_size(%d), jmp_block B%d, target_block B%d", blk_starts[jmp_target[i]], blk_starts[i] + jmp_offset[i], offset, br_size, i, jmp_target[i]);
}
- assert(_matcher->is_short_branch_offset(jmp_rule[i], offset), "Displacement too large for short jmp");
+ assert(_matcher->is_short_branch_offset(jmp_rule[i], br_size, offset), "Displacement too large for short jmp");
}
}
#endif
+ // Step 3, compute the offsets of all blocks, will be done in fill_buffer()
+ // after ScheduleAndBundle().
+
// ------------------
// Compute size for code buffer
- code_size = blk_starts[i-1] + jmp_end[i-1];
+ code_size = blk_starts[nblocks];
// Relocation records
reloc_size += 1; // Relo entry for exception handler
@@ -550,7 +560,7 @@ void Compile::Shorten_branches(Label *labels, int& code_size, int& reloc_size, i
// Min is 2 bytes, max is probably 6 or 8, with a tax up to 25% for
// a relocation index.
// The CodeBuffer will expand the locs array if this estimate is too low.
- reloc_size *= 10 / sizeof(relocInfo);
+ reloc_size *= 10 / sizeof(relocInfo);
}
//------------------------------FillLocArray-----------------------------------
@@ -1026,7 +1036,7 @@ void NonSafepointEmitter::emit_non_safepoint() {
-// helper for Fill_buffer bailout logic
+// helper for fill_buffer bailout logic
static void turn_off_compiler(Compile* C) {
if (CodeCache::largest_free_block() >= CodeCacheMinimumFreeSpace*10) {
// Do not turn off compilation if a single giant method has
@@ -1039,22 +1049,20 @@ static void turn_off_compiler(Compile* C) {
}
-//------------------------------Fill_buffer------------------------------------
-void Compile::Fill_buffer() {
+//------------------------------init_buffer------------------------------------
+CodeBuffer* Compile::init_buffer(uint* blk_starts) {
// Set the initially allocated size
int code_req = initial_code_capacity;
int locs_req = initial_locs_capacity;
int stub_req = TraceJumps ? initial_stub_capacity * 10 : initial_stub_capacity;
int const_req = initial_const_capacity;
- bool labels_not_set = true;
int pad_req = NativeCall::instruction_size;
// The extra spacing after the code is necessary on some platforms.
// Sometimes we need to patch in a jump after the last instruction,
// if the nmethod has been deoptimized. (See 4932387, 4894843.)
- uint i;
// Compute the byte offset where we can store the deopt pc.
if (fixed_slots() != 0) {
_orig_pc_slot_offset_in_bytes = _regalloc->reg2offset(OptoReg::stack2reg(_orig_pc_slot));
@@ -1078,19 +1086,12 @@ void Compile::Fill_buffer() {
_frame_slots += 8*(16/BytesPerInt);
}
#endif
- assert( _frame_slots >= 0 && _frame_slots < 1000000, "sanity check" );
-
- // Create an array of unused labels, one for each basic block
- Label *blk_labels = NEW_RESOURCE_ARRAY(Label, _cfg->_num_blocks+1);
-
- for( i=0; i <= _cfg->_num_blocks; i++ ) {
- blk_labels[i].init();
- }
+ assert(_frame_slots >= 0 && _frame_slots < 1000000, "sanity check");
if (has_mach_constant_base_node()) {
// Fill the constant table.
- // Note: This must happen before Shorten_branches.
- for (i = 0; i < _cfg->_num_blocks; i++) {
+ // Note: This must happen before shorten_branches.
+ for (uint i = 0; i < _cfg->_num_blocks; i++) {
Block* b = _cfg->_blocks[i];
for (uint j = 0; j < b->_nodes.size(); j++) {
@@ -1114,14 +1115,11 @@ void Compile::Fill_buffer() {
// Initialize the space for the BufferBlob used to find and verify
// instruction size in MachNode::emit_size()
init_scratch_buffer_blob(const_req);
- if (failing()) return; // Out of memory
+ if (failing()) return NULL; // Out of memory
- // If this machine supports different size branch offsets, then pre-compute
- // the length of the blocks
- if( _matcher->is_short_branch_offset(-1, 0) ) {
- Shorten_branches(blk_labels, code_req, locs_req, stub_req);
- labels_not_set = false;
- }
+ // Pre-compute the length of blocks and replace
+ // long branches with short if machine supports it.
+ shorten_branches(blk_starts, code_req, locs_req, stub_req);
// nmethod and CodeBuffer count stubs & constants as part of method's code.
int exception_handler_req = size_exception_handler();
@@ -1151,7 +1149,7 @@ void Compile::Fill_buffer() {
// Have we run out of code space?
if ((cb->blob() == NULL) || (!CompileBroker::should_compile_new_jobs())) {
turn_off_compiler(this);
- return;
+ return NULL;
}
// Configure the code buffer.
cb->initialize_consts_size(const_req);
@@ -1162,18 +1160,31 @@ void Compile::Fill_buffer() {
MachNode *_nop_list[Bundle::_nop_count];
Bundle::initialize_nops(_nop_list, this);
+ return cb;
+}
+
+//------------------------------fill_buffer------------------------------------
+void Compile::fill_buffer(CodeBuffer* cb, uint* blk_starts) {
+ // blk_starts[] contains offsets calculated during short branches processing,
+ // offsets should not be increased during following steps.
+
+ // Compute the size of first NumberOfLoopInstrToAlign instructions at head
+ // of a loop. It is used to determine the padding for loop alignment.
+ compute_loop_first_inst_sizes();
+
// Create oopmap set.
_oop_map_set = new OopMapSet();
// !!!!! This preserves old handling of oopmaps for now
debug_info()->set_oopmaps(_oop_map_set);
+ uint nblocks = _cfg->_num_blocks;
// Count and start of implicit null check instructions
uint inct_cnt = 0;
- uint *inct_starts = NEW_RESOURCE_ARRAY(uint, _cfg->_num_blocks+1);
+ uint *inct_starts = NEW_RESOURCE_ARRAY(uint, nblocks+1);
// Count and start of calls
- uint *call_returns = NEW_RESOURCE_ARRAY(uint, _cfg->_num_blocks+1);
+ uint *call_returns = NEW_RESOURCE_ARRAY(uint, nblocks+1);
uint return_offset = 0;
int nop_size = (new (this) MachNopNode())->size(_regalloc);
@@ -1181,14 +1192,22 @@ void Compile::Fill_buffer() {
int previous_offset = 0;
int current_offset = 0;
int last_call_offset = -1;
+ int last_avoid_back_to_back_offset = -1;
+#ifdef ASSERT
+ int block_alignment_padding = 0;
+
+ uint* jmp_target = NEW_RESOURCE_ARRAY(uint,nblocks);
+ uint* jmp_offset = NEW_RESOURCE_ARRAY(uint,nblocks);
+ uint* jmp_size = NEW_RESOURCE_ARRAY(uint,nblocks);
+ uint* jmp_rule = NEW_RESOURCE_ARRAY(uint,nblocks);
+#endif
// Create an array of unused labels, one for each basic block, if printing is enabled
#ifndef PRODUCT
int *node_offsets = NULL;
- uint node_offset_limit = unique();
-
+ uint node_offset_limit = unique();
- if ( print_assembly() )
+ if (print_assembly())
node_offsets = NEW_RESOURCE_ARRAY(int, node_offset_limit);
#endif
@@ -1199,11 +1218,19 @@ void Compile::Fill_buffer() {
constant_table().emit(*cb);
}
+ // Create an array of labels, one for each basic block
+ Label *blk_labels = NEW_RESOURCE_ARRAY(Label, nblocks+1);
+ for (uint i=0; i <= nblocks; i++) {
+ blk_labels[i].init();
+ }
+
// ------------------
// Now fill in the code buffer
Node *delay_slot = NULL;
- for( i=0; i < _cfg->_num_blocks; i++ ) {
+ for (uint i=0; i < nblocks; i++) {
+ guarantee(blk_starts[i] >= (uint)cb->insts_size(),"should not increase size");
+
Block *b = _cfg->_blocks[i];
Node *head = b->head();
@@ -1211,23 +1238,38 @@ void Compile::Fill_buffer() {
// If this block needs to start aligned (i.e, can be reached other
// than by falling-thru from the previous block), then force the
// start of a new bundle.
- if( Pipeline::requires_bundling() && starts_bundle(head) )
+ if (Pipeline::requires_bundling() && starts_bundle(head))
cb->flush_bundle(true);
+#ifdef ASSERT
+ if (!b->is_connector()) {
+ stringStream st;
+ b->dump_head(&_cfg->_bbs, &st);
+ MacroAssembler(cb).block_comment(st.as_string());
+ }
+ jmp_target[i] = 0;
+ jmp_offset[i] = 0;
+ jmp_size[i] = 0;
+ jmp_rule[i] = 0;
+
+ // Maximum alignment padding for loop block was used
+ // during first round of branches shortening, as result
+ // padding for nodes (sfpt after call) was not added.
+ // Take this into account for block's size change check
+ // and allow increase block's size by the difference
+ // of maximum and actual alignment paddings.
+ int orig_blk_size = blk_starts[i+1] - blk_starts[i] + block_alignment_padding;
+#endif
+ int blk_offset = current_offset;
+
// Define the label at the beginning of the basic block
- if (labels_not_set) {
- MacroAssembler(cb).bind(blk_labels[b->_pre_order]);
- } else {
- assert(blk_labels[b->_pre_order].loc_pos() == cb->insts_size(),
- err_msg("label position does not match code offset: %d != %d",
- blk_labels[b->_pre_order].loc_pos(), cb->insts_size()));
- }
+ MacroAssembler(cb).bind(blk_labels[b->_pre_order]);
uint last_inst = b->_nodes.size();
// Emit block normally, except for last instruction.
// Emit means "dump code bits into code buffer".
- for( uint j = 0; j<last_inst; j++ ) {
+ for (uint j = 0; j<last_inst; j++) {
// Get the node
Node* n = b->_nodes[j];
@@ -1244,7 +1286,7 @@ void Compile::Fill_buffer() {
// If this starts a new instruction group, then flush the current one
// (but allow split bundles)
- if( Pipeline::requires_bundling() && starts_bundle(n) )
+ if (Pipeline::requires_bundling() && starts_bundle(n))
cb->flush_bundle(false);
// The following logic is duplicated in the code ifdeffed for
@@ -1253,25 +1295,32 @@ void Compile::Fill_buffer() {
// Special handling for SafePoint/Call Nodes
bool is_mcall = false;
- if( n->is_Mach() ) {
+ if (n->is_Mach()) {
MachNode *mach = n->as_Mach();
is_mcall = n->is_MachCall();
bool is_sfn = n->is_MachSafePoint();
// If this requires all previous instructions be flushed, then do so
- if( is_sfn || is_mcall || mach->alignment_required() != 1) {
+ if (is_sfn || is_mcall || mach->alignment_required() != 1) {
cb->flush_bundle(true);
current_offset = cb->insts_size();
}
+ // A padding may be needed again since a previous instruction
+ // could be moved to delay slot.
+
// align the instruction if necessary
int padding = mach->compute_padding(current_offset);
// Make sure safepoint node for polling is distinct from a call's
// return by adding a nop if needed.
- if (is_sfn && !is_mcall && padding == 0 && current_offset == last_call_offset ) {
+ if (is_sfn && !is_mcall && padding == 0 && current_offset == last_call_offset) {
+ padding = nop_size;
+ }
+ if (padding == 0 && mach->avoid_back_to_back() &&
+ current_offset == last_avoid_back_to_back_offset) {
+ // Avoid back to back some instructions.
padding = nop_size;
}
- assert( labels_not_set || padding == 0, "instruction should already be aligned");
if(padding > 0) {
assert((padding % nop_size) == 0, "padding is not a multiple of NOP size");
@@ -1295,20 +1344,20 @@ void Compile::Fill_buffer() {
// Save the return address
call_returns[b->_pre_order] = current_offset + mcall->ret_addr_offset();
- if (!mcall->is_safepoint_node()) {
+ if (mcall->is_MachCallLeaf()) {
is_mcall = false;
is_sfn = false;
}
}
// sfn will be valid whenever mcall is valid now because of inheritance
- if( is_sfn || is_mcall ) {
+ if (is_sfn || is_mcall) {
// Handle special safepoint nodes for synchronization
- if( !is_mcall ) {
+ if (!is_mcall) {
MachSafePointNode *sfn = mach->as_MachSafePoint();
// !!!!! Stubs only need an oopmap right now, so bail out
- if( sfn->jvms()->method() == NULL) {
+ if (sfn->jvms()->method() == NULL) {
// Write the oopmap directly to the code blob??!!
# ifdef ENABLE_ZAP_DEAD_LOCALS
assert( !is_node_getting_a_safepoint(sfn), "logic does not match; false positive");
@@ -1328,31 +1377,78 @@ void Compile::Fill_buffer() {
}
// If this is a branch, then fill in the label with the target BB's label
- else if ( mach->is_Branch() ) {
-
- if ( mach->ideal_Opcode() == Op_Jump ) {
- for (uint h = 0; h < b->_num_succs; h++ ) {
- Block* succs_block = b->_succs[h];
- for (uint j = 1; j < succs_block->num_preds(); j++) {
- Node* jpn = succs_block->pred(j);
- if ( jpn->is_JumpProj() && jpn->in(0) == mach ) {
- uint block_num = succs_block->non_connector()->_pre_order;
- Label *blkLabel = &blk_labels[block_num];
- mach->add_case_label(jpn->as_JumpProj()->proj_no(), blkLabel);
- }
+ else if (mach->is_MachBranch()) {
+ // This requires the TRUE branch target be in succs[0]
+ uint block_num = b->non_connector_successor(0)->_pre_order;
+
+ // Try to replace long branch if delay slot is not used,
+ // it is mostly for back branches since forward branch's
+ // distance is not updated yet.
+ bool delay_slot_is_used = valid_bundle_info(n) &&
+ node_bundling(n)->use_unconditional_delay();
+ if (!delay_slot_is_used && mach->may_be_short_branch()) {
+ assert(delay_slot == NULL, "not expecting delay slot node");
+ int br_size = n->size(_regalloc);
+ int offset = blk_starts[block_num] - current_offset;
+ if (block_num >= i) {
+ // Current and following block's offset are not
+ // finilized yet, adjust distance by the difference
+ // between calculated and final offsets of current block.
+ offset -= (blk_starts[i] - blk_offset);
+ }
+ // In the following code a nop could be inserted before
+ // the branch which will increase the backward distance.
+ bool needs_padding = (current_offset == last_avoid_back_to_back_offset);
+ if (needs_padding && offset <= 0)
+ offset -= nop_size;
+
+ if (_matcher->is_short_branch_offset(mach->rule(), br_size, offset)) {
+ // We've got a winner. Replace this branch.
+ MachNode* replacement = mach->as_MachBranch()->short_branch_version(this);
+
+ // Update the jmp_size.
+ int new_size = replacement->size(_regalloc);
+ assert((br_size - new_size) >= (int)nop_size, "short_branch size should be smaller");
+ // Insert padding between avoid_back_to_back branches.
+ if (needs_padding && replacement->avoid_back_to_back()) {
+ MachNode *nop = new (this) MachNopNode();
+ b->_nodes.insert(j++, nop);
+ _cfg->_bbs.map(nop->_idx, b);
+ last_inst++;
+ nop->emit(*cb, _regalloc);
+ cb->flush_bundle(true);
+ current_offset = cb->insts_size();
+ }
+#ifdef ASSERT
+ jmp_target[i] = block_num;
+ jmp_offset[i] = current_offset - blk_offset;
+ jmp_size[i] = new_size;
+ jmp_rule[i] = mach->rule();
+#endif
+ b->_nodes.map(j, replacement);
+ mach->subsume_by(replacement);
+ n = replacement;
+ mach = replacement;
+ }
+ }
+ mach->as_MachBranch()->label_set( &blk_labels[block_num], block_num );
+ } else if (mach->ideal_Opcode() == Op_Jump) {
+ for (uint h = 0; h < b->_num_succs; h++) {
+ Block* succs_block = b->_succs[h];
+ for (uint j = 1; j < succs_block->num_preds(); j++) {
+ Node* jpn = succs_block->pred(j);
+ if (jpn->is_JumpProj() && jpn->in(0) == mach) {
+ uint block_num = succs_block->non_connector()->_pre_order;
+ Label *blkLabel = &blk_labels[block_num];
+ mach->add_case_label(jpn->as_JumpProj()->proj_no(), blkLabel);
}
}
- } else {
- // For Branchs
- // This requires the TRUE branch target be in succs[0]
- uint block_num = b->non_connector_successor(0)->_pre_order;
- mach->label_set( blk_labels[block_num], block_num );
}
}
#ifdef ASSERT
// Check that oop-store precedes the card-mark
- else if( mach->ideal_Opcode() == Op_StoreCM ) {
+ else if (mach->ideal_Opcode() == Op_StoreCM) {
uint storeCM_idx = j;
int count = 0;
for (uint prec = mach->req(); prec < mach->len(); prec++) {
@@ -1371,7 +1467,7 @@ void Compile::Fill_buffer() {
}
#endif
- else if( !n->is_Proj() ) {
+ else if (!n->is_Proj()) {
// Remember the beginning of the previous instruction, in case
// it's followed by a flag-kill and a null-check. Happens on
// Intel all the time, with add-to-memory kind of opcodes.
@@ -1388,13 +1484,21 @@ void Compile::Fill_buffer() {
// Save the offset for the listing
#ifndef PRODUCT
- if( node_offsets && n->_idx < node_offset_limit )
+ if (node_offsets && n->_idx < node_offset_limit)
node_offsets[n->_idx] = cb->insts_size();
#endif
// "Normal" instruction case
+ DEBUG_ONLY( uint instr_offset = cb->insts_size(); )
n->emit(*cb, _regalloc);
current_offset = cb->insts_size();
+
+#ifdef ASSERT
+ if (n->size(_regalloc) < (current_offset-instr_offset)) {
+ n->dump();
+ assert(false, "wrong size of mach node");
+ }
+#endif
non_safepoints.observe_instruction(n, current_offset);
// mcall is last "call" that can be a safepoint
@@ -1408,8 +1512,13 @@ void Compile::Fill_buffer() {
last_call_offset = current_offset;
}
+ if (n->is_Mach() && n->as_Mach()->avoid_back_to_back()) {
+ // Avoid back to back some instructions.
+ last_avoid_back_to_back_offset = current_offset;
+ }
+
// See if this instruction has a delay slot
- if ( valid_bundle_info(n) && node_bundling(n)->use_unconditional_delay()) {
+ if (valid_bundle_info(n) && node_bundling(n)->use_unconditional_delay()) {
assert(delay_slot != NULL, "expecting delay slot node");
// Back up 1 instruction
@@ -1417,15 +1526,15 @@ void Compile::Fill_buffer() {
// Save the offset for the listing
#ifndef PRODUCT
- if( node_offsets && delay_slot->_idx < node_offset_limit )
+ if (node_offsets && delay_slot->_idx < node_offset_limit)
node_offsets[delay_slot->_idx] = cb->insts_size();
#endif
// Support a SafePoint in the delay slot
- if( delay_slot->is_MachSafePoint() ) {
+ if (delay_slot->is_MachSafePoint()) {
MachNode *mach = delay_slot->as_Mach();
// !!!!! Stubs only need an oopmap right now, so bail out
- if( !mach->is_MachCall() && mach->as_MachSafePoint()->jvms()->method() == NULL ) {
+ if (!mach->is_MachCall() && mach->as_MachSafePoint()->jvms()->method() == NULL) {
// Write the oopmap directly to the code blob??!!
# ifdef ENABLE_ZAP_DEAD_LOCALS
assert( !is_node_getting_a_safepoint(mach), "logic does not match; false positive");
@@ -1449,12 +1558,14 @@ void Compile::Fill_buffer() {
}
} // End for all instructions in block
+ assert((uint)blk_offset <= blk_starts[i], "shouldn't increase distance");
+ blk_starts[i] = blk_offset;
// If the next block is the top of a loop, pad this block out to align
// the loop top a little. Helps prevent pipe stalls at loop back branches.
- if( i<_cfg->_num_blocks-1 ) {
+ if (i < nblocks-1) {
Block *nb = _cfg->_blocks[i+1];
- uint padding = nb->alignment_padding(current_offset);
+ int padding = nb->alignment_padding(current_offset);
if( padding > 0 ) {
MachNode *nop = new (this) MachNopNode(padding / nop_size);
b->_nodes.insert( b->_nodes.size(), nop );
@@ -1462,9 +1573,18 @@ void Compile::Fill_buffer() {
nop->emit(*cb, _regalloc);
current_offset = cb->insts_size();
}
+#ifdef ASSERT
+ int max_loop_pad = nb->code_alignment()-relocInfo::addr_unit();
+ block_alignment_padding = (max_loop_pad - padding);
+ assert(block_alignment_padding >= 0, "sanity");
+#endif
}
+ // Verify that the distance for generated before forward
+ // short branches is still valid.
+ assert(orig_blk_size >= (current_offset - blk_offset), "shouldn't increase block size");
} // End of for all blocks
+ blk_starts[nblocks] = current_offset;
non_safepoints.flush_at_end();
@@ -1472,13 +1592,26 @@ void Compile::Fill_buffer() {
if (failing()) return;
// Define a pseudo-label at the end of the code
- MacroAssembler(cb).bind( blk_labels[_cfg->_num_blocks] );
+ MacroAssembler(cb).bind( blk_labels[nblocks] );
// Compute the size of the first block
_first_block_size = blk_labels[1].loc_pos() - blk_labels[0].loc_pos();
assert(cb->insts_size() < 500000, "method is unreasonably large");
+#ifdef ASSERT
+ for (uint i = 0; i < nblocks; i++) { // For all blocks
+ if (jmp_target[i] != 0) {
+ int br_size = jmp_size[i];
+ int offset = blk_starts[jmp_target[i]]-(blk_starts[i] + jmp_offset[i]);
+ if (!_matcher->is_short_branch_offset(jmp_rule[i], br_size, offset)) {
+ tty->print_cr("target (%d) - jmp_offset(%d) = offset (%d), jump_size(%d), jmp_block B%d, target_block B%d", blk_starts[jmp_target[i]], blk_starts[i] + jmp_offset[i], offset, br_size, i, jmp_target[i]);
+ assert(false, "Displacement too large for short jmp");
+ }
+ }
+ }
+#endif
+
// ------------------
#ifndef PRODUCT
@@ -1565,8 +1698,8 @@ void Compile::FillExceptionTables(uint cnt, uint *call_returns, uint *inct_start
uint call_return = call_returns[b->_pre_order];
#ifdef ASSERT
assert( call_return > 0, "no call seen for this basic block" );
- while( b->_nodes[--j]->Opcode() == Op_MachProj ) ;
- assert( b->_nodes[j]->is_Call(), "CatchProj must follow call" );
+ while( b->_nodes[--j]->is_MachProj() ) ;
+ assert( b->_nodes[j]->is_MachCall(), "CatchProj must follow call" );
#endif
// last instruction is a CatchNode, find it's CatchProjNodes
int nof_succs = b->_num_succs;
@@ -1743,11 +1876,6 @@ void Compile::ScheduleAndBundle() {
// Create a data structure for all the scheduling information
Scheduling scheduling(Thread::current()->resource_area(), *this);
- // Initialize the space for the BufferBlob used to find and verify
- // instruction size in MachNode::emit_size()
- init_scratch_buffer_blob(MAX_const_size);
- if (failing()) return; // Out of memory
-
// Walk backwards over each basic block, computing the needed alignment
// Walk over all the basic blocks
scheduling.DoScheduling();
@@ -2028,7 +2156,7 @@ void Scheduling::AddNodeToBundle(Node *n, const Block *bb) {
// the first instruction at the branch target is
// copied to the delay slot, and the branch goes to
// the instruction after that at the branch target
- if ( n->is_Mach() && n->is_Branch() ) {
+ if ( n->is_MachBranch() ) {
assert( !n->is_MachNullCheck(), "should not look for delay slot for Null Check" );
assert( !n->is_Catch(), "should not look for delay slot for Catch" );
@@ -2346,12 +2474,18 @@ void Scheduling::DoScheduling() {
// have their delay slots filled in the template expansions, so we don't
// bother scheduling them.
Node *last = bb->_nodes[_bb_end];
+ // Ignore trailing NOPs.
+ while (_bb_end > 0 && last->is_Mach() &&
+ last->as_Mach()->ideal_Opcode() == Op_Con) {
+ last = bb->_nodes[--_bb_end];
+ }
+ assert(!last->is_Mach() || last->as_Mach()->ideal_Opcode() != Op_Con, "");
if( last->is_Catch() ||
// Exclude unreachable path case when Halt node is in a separate block.
(_bb_end > 1 && last->is_Mach() && last->as_Mach()->ideal_Opcode() == Op_Halt) ) {
// There must be a prior call. Skip it.
- while( !bb->_nodes[--_bb_end]->is_Call() ) {
- assert( bb->_nodes[_bb_end]->is_Proj(), "skipping projections after expected call" );
+ while( !bb->_nodes[--_bb_end]->is_MachCall() ) {
+ assert( bb->_nodes[_bb_end]->is_MachProj(), "skipping projections after expected call" );
}
} else if( last->is_MachNullCheck() ) {
// Backup so the last null-checked memory instruction is
@@ -2663,7 +2797,7 @@ void Scheduling::ComputeRegisterAntidependencies(Block *b) {
for( uint i = _bb_end-1; i >= _bb_start; i-- ) {
Node *n = b->_nodes[i];
int is_def = n->outcnt(); // def if some uses prior to adding precedence edges
- if( n->Opcode() == Op_MachProj && n->ideal_reg() == MachProjNode::fat_proj ) {
+ if( n->is_MachProj() && n->ideal_reg() == MachProjNode::fat_proj ) {
// Fat-proj kills a slew of registers
// This can add edges to 'n' and obscure whether or not it was a def,
// hence the is_def flag.
@@ -2680,12 +2814,29 @@ void Scheduling::ComputeRegisterAntidependencies(Block *b) {
anti_do_def( b, n, _regalloc->get_reg_second(n), is_def );
}
+ // Kill projections on a branch should appear to occur on the
+ // branch, not afterwards, so grab the masks from the projections
+ // and process them.
+ if (n->is_MachBranch() || n->is_Mach() && n->as_Mach()->ideal_Opcode() == Op_Jump) {
+ for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) {
+ Node* use = n->fast_out(i);
+ if (use->is_Proj()) {
+ RegMask rm = use->out_RegMask();// Make local copy
+ while( rm.is_NotEmpty() ) {
+ OptoReg::Name kill = rm.find_first_elem();
+ rm.Remove(kill);
+ anti_do_def( b, n, kill, false );
+ }
+ }
+ }
+ }
+
// Check each register used by this instruction for a following DEF/KILL
// that must occur afterward and requires an anti-dependence edge.
for( uint j=0; j<n->req(); j++ ) {
Node *def = n->in(j);
if( def ) {
- assert( def->Opcode() != Op_MachProj || def->ideal_reg() != MachProjNode::fat_proj, "" );
+ assert( !def->is_MachProj() || def->ideal_reg() != MachProjNode::fat_proj, "" );
anti_do_use( b, n, _regalloc->get_reg_first(def) );
anti_do_use( b, n, _regalloc->get_reg_second(def) );
}
diff --git a/hotspot/src/share/vm/opto/parse.hpp b/hotspot/src/share/vm/opto/parse.hpp
index 0b65782..ec9a083 100644
--- a/hotspot/src/share/vm/opto/parse.hpp
+++ b/hotspot/src/share/vm/opto/parse.hpp
@@ -41,6 +41,8 @@ class SwitchRange;
//------------------------------InlineTree-------------------------------------
class InlineTree : public ResourceObj {
+ friend class VMStructs;
+
Compile* C; // cache
JVMState* _caller_jvms; // state of caller
ciMethod* _method; // method being called by the caller_jvms
@@ -54,7 +56,8 @@ class InlineTree : public ResourceObj {
float compute_callee_frequency( int caller_bci ) const;
GrowableArray<InlineTree*> _subtrees;
- friend class Compile;
+
+ void print_impl(outputStream* stj, int indent) const PRODUCT_RETURN;
protected:
InlineTree(Compile* C,
@@ -78,6 +81,8 @@ protected:
int stack_depth() const { return _caller_jvms ? _caller_jvms->depth() : 0; }
public:
+ static const char* check_can_parse(ciMethod* callee);
+
static InlineTree* build_inline_tree_root();
static InlineTree* find_subtree_from_root(InlineTree* root, JVMState* jvms, ciMethod* callee, bool create_if_not_found = false);
@@ -119,6 +124,8 @@ public:
uint count_inlines() const { return _count_inlines; };
#endif
GrowableArray<InlineTree*> subtrees() { return _subtrees; }
+
+ void print_value_on(outputStream* st) const PRODUCT_RETURN;
};
diff --git a/hotspot/src/share/vm/opto/parse2.cpp b/hotspot/src/share/vm/opto/parse2.cpp
index 26684ea..5e8007d 100644
--- a/hotspot/src/share/vm/opto/parse2.cpp
+++ b/hotspot/src/share/vm/opto/parse2.cpp
@@ -752,20 +752,12 @@ void Parse::do_jsr() {
// Handle ret bytecode
void Parse::do_ret() {
// Find to whom we return.
-#if 0 // %%%% MAKE THIS WORK
- Node* con = local();
- const TypePtr* tp = con->bottom_type()->isa_ptr();
- assert(tp && tp->singleton(), "");
- int return_bci = (int) tp->get_con();
- merge(return_bci);
-#else
assert(block()->num_successors() == 1, "a ret can only go one place now");
Block* target = block()->successor_at(0);
assert(!target->is_ready(), "our arrival must be expected");
profile_ret(target->flow()->start());
int pnum = target->next_path_num();
merge_common(target, pnum);
-#endif
}
//--------------------------dynamic_branch_prediction--------------------------
diff --git a/hotspot/src/share/vm/opto/parse3.cpp b/hotspot/src/share/vm/opto/parse3.cpp
index e1a319f..6d6fd07 100644
--- a/hotspot/src/share/vm/opto/parse3.cpp
+++ b/hotspot/src/share/vm/opto/parse3.cpp
@@ -100,6 +100,14 @@ void Parse::do_field_access(bool is_get, bool is_field) {
}
}
+ // Deoptimize on putfield writes to call site target field.
+ if (!is_get && field->is_call_site_target()) {
+ uncommon_trap(Deoptimization::Reason_unhandled,
+ Deoptimization::Action_reinterpret,
+ NULL, "put to call site target field");
+ return;
+ }
+
assert(field->will_link(method()->holder(), bc()), "getfield: typeflow responsibility");
// Note: We do not check for an unloaded field type here any more.
@@ -139,19 +147,21 @@ void Parse::do_field_access(bool is_get, bool is_field) {
void Parse::do_get_xxx(Node* obj, ciField* field, bool is_field) {
// Does this field have a constant value? If so, just push the value.
if (field->is_constant()) {
+ // final field
if (field->is_static()) {
// final static field
if (push_constant(field->constant_value()))
return;
}
else {
- // final non-static field of a trusted class (classes in
- // java.lang.invoke and sun.invoke packages and subpackages).
+ // final non-static field
+ // Treat final non-static fields of trusted classes (classes in
+ // java.lang.invoke and sun.invoke packages and subpackages) as
+ // compile time constants.
if (obj->is_Con()) {
const TypeOopPtr* oop_ptr = obj->bottom_type()->isa_oopptr();
ciObject* constant_oop = oop_ptr->const_oop();
ciConstant constant = field->constant_value_of(constant_oop);
-
if (push_constant(constant, true))
return;
}
diff --git a/hotspot/src/share/vm/opto/phaseX.cpp b/hotspot/src/share/vm/opto/phaseX.cpp
index 7b5d6cd..541744a 100644
--- a/hotspot/src/share/vm/opto/phaseX.cpp
+++ b/hotspot/src/share/vm/opto/phaseX.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -864,6 +864,10 @@ void PhaseIterGVN::optimize() {
// Pull from worklist; transform node;
// If node has changed: update edge info and put uses on worklist.
while( _worklist.size() ) {
+ if (C->check_node_count(NodeLimitFudgeFactor * 2,
+ "out of nodes optimizing method")) {
+ return;
+ }
Node *n = _worklist.pop();
if (++loop_count >= K * C->unique()) {
debug_only(n->dump(4);)
diff --git a/hotspot/src/share/vm/opto/phaseX.hpp b/hotspot/src/share/vm/opto/phaseX.hpp
index 8f82d74..162716d 100644
--- a/hotspot/src/share/vm/opto/phaseX.hpp
+++ b/hotspot/src/share/vm/opto/phaseX.hpp
@@ -473,7 +473,6 @@ public:
// Clone loop predicates. Defined in loopTransform.cpp.
Node* clone_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
- Node* move_loop_predicates(Node* old_entry, Node* new_entry, bool clone_limit_check);
// Create a new if below new_entry for the predicate to be cloned
ProjNode* create_new_if_for_predicate(ProjNode* cont_proj, Node* new_entry,
Deoptimization::DeoptReason reason);
diff --git a/hotspot/src/share/vm/opto/postaloc.cpp b/hotspot/src/share/vm/opto/postaloc.cpp
index 897d510..603264a 100644
--- a/hotspot/src/share/vm/opto/postaloc.cpp
+++ b/hotspot/src/share/vm/opto/postaloc.cpp
@@ -72,7 +72,22 @@ bool PhaseChaitin::may_be_copy_of_callee( Node *def ) const {
return i == limit;
}
-
+//------------------------------yank-----------------------------------
+// Helper function for yank_if_dead
+int PhaseChaitin::yank( Node *old, Block *current_block, Node_List *value, Node_List *regnd ) {
+ int blk_adjust=0;
+ Block *oldb = _cfg._bbs[old->_idx];
+ oldb->find_remove(old);
+ // Count 1 if deleting an instruction from the current block
+ if( oldb == current_block ) blk_adjust++;
+ _cfg._bbs.map(old->_idx,NULL);
+ OptoReg::Name old_reg = lrgs(n2lidx(old)).reg();
+ if( regnd && (*regnd)[old_reg]==old ) { // Instruction is currently available?
+ value->map(old_reg,NULL); // Yank from value/regnd maps
+ regnd->map(old_reg,NULL); // This register's value is now unknown
+ }
+ return blk_adjust;
+}
//------------------------------yank_if_dead-----------------------------------
// Removed an edge from 'old'. Yank if dead. Return adjustment counts to
@@ -80,18 +95,23 @@ bool PhaseChaitin::may_be_copy_of_callee( Node *def ) const {
int PhaseChaitin::yank_if_dead( Node *old, Block *current_block, Node_List *value, Node_List *regnd ) {
int blk_adjust=0;
while (old->outcnt() == 0 && old != C->top()) {
- Block *oldb = _cfg._bbs[old->_idx];
- oldb->find_remove(old);
- // Count 1 if deleting an instruction from the current block
- if( oldb == current_block ) blk_adjust++;
- _cfg._bbs.map(old->_idx,NULL);
- OptoReg::Name old_reg = lrgs(n2lidx(old)).reg();
- if( regnd && (*regnd)[old_reg]==old ) { // Instruction is currently available?
- value->map(old_reg,NULL); // Yank from value/regnd maps
- regnd->map(old_reg,NULL); // This register's value is now unknown
+ blk_adjust += yank(old, current_block, value, regnd);
+
+ Node *tmp = NULL;
+ for (uint i = 1; i < old->req(); i++) {
+ if (old->in(i)->is_MachTemp()) {
+ // handle TEMP inputs
+ Node* machtmp = old->in(i);
+ if (machtmp->outcnt() == 1) {
+ assert(machtmp->unique_out() == old, "sanity");
+ blk_adjust += yank(machtmp, current_block, value, regnd);
+ machtmp->disconnect_inputs(NULL);
+ }
+ } else {
+ assert(tmp == NULL, "can't handle more non MachTemp inputs");
+ tmp = old->in(i);
+ }
}
- assert(old->req() <= 2, "can't handle more inputs");
- Node *tmp = old->req() > 1 ? old->in(1) : NULL;
old->disconnect_inputs(NULL);
if( !tmp ) break;
old = tmp;
diff --git a/hotspot/src/share/vm/opto/reg_split.cpp b/hotspot/src/share/vm/opto/reg_split.cpp
index 537961f..63a11fe 100644
--- a/hotspot/src/share/vm/opto/reg_split.cpp
+++ b/hotspot/src/share/vm/opto/reg_split.cpp
@@ -984,7 +984,7 @@ uint PhaseChaitin::Split( uint maxlrg ) {
continue;
}
- if (UseFPUForSpilling && n->is_Call() && !uup && !dup ) {
+ if (UseFPUForSpilling && n->is_MachCall() && !uup && !dup ) {
// The use at the call can force the def down so insert
// a split before the use to allow the def more freedom.
maxlrg = split_USE(def,b,n,inpidx,maxlrg,dup,false, splits,slidx);
diff --git a/hotspot/src/share/vm/opto/regalloc.hpp b/hotspot/src/share/vm/opto/regalloc.hpp
index 71f4def..d0a993e 100644
--- a/hotspot/src/share/vm/opto/regalloc.hpp
+++ b/hotspot/src/share/vm/opto/regalloc.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -39,6 +39,7 @@ class PhaseCFG;
//------------------------------PhaseRegAlloc------------------------------------
// Abstract register allocator
class PhaseRegAlloc : public Phase {
+ friend class VMStructs;
static void (*_alloc_statistics[MAX_REG_ALLOCATORS])();
static int _num_allocators;
diff --git a/hotspot/src/share/vm/opto/runtime.cpp b/hotspot/src/share/vm/opto/runtime.cpp
index 4c55ca0..a4495ea 100644
--- a/hotspot/src/share/vm/opto/runtime.cpp
+++ b/hotspot/src/share/vm/opto/runtime.cpp
@@ -102,6 +102,7 @@
// Compiled code entry points
address OptoRuntime::_new_instance_Java = NULL;
address OptoRuntime::_new_array_Java = NULL;
+address OptoRuntime::_new_array_nozero_Java = NULL;
address OptoRuntime::_multianewarray2_Java = NULL;
address OptoRuntime::_multianewarray3_Java = NULL;
address OptoRuntime::_multianewarray4_Java = NULL;
@@ -151,6 +152,7 @@ void OptoRuntime::generate(ciEnv* env) {
// -------------------------------------------------------------------------------------------------------------------------------
gen(env, _new_instance_Java , new_instance_Type , new_instance_C , 0 , true , false, false);
gen(env, _new_array_Java , new_array_Type , new_array_C , 0 , true , false, false);
+ gen(env, _new_array_nozero_Java , new_array_Type , new_array_nozero_C , 0 , true , false, false);
gen(env, _multianewarray2_Java , multianewarray2_Type , multianewarray2_C , 0 , true , false, false);
gen(env, _multianewarray3_Java , multianewarray3_Type , multianewarray3_C , 0 , true , false, false);
gen(env, _multianewarray4_Java , multianewarray4_Type , multianewarray4_C , 0 , true , false, false);
@@ -308,6 +310,36 @@ JRT_BLOCK_ENTRY(void, OptoRuntime::new_array_C(klassOopDesc* array_type, int len
}
JRT_END
+// array allocation without zeroing
+JRT_BLOCK_ENTRY(void, OptoRuntime::new_array_nozero_C(klassOopDesc* array_type, int len, JavaThread *thread))
+ JRT_BLOCK;
+#ifndef PRODUCT
+ SharedRuntime::_new_array_ctr++; // new array requires GC
+#endif
+ assert(check_compiled_frame(thread), "incorrect caller");
+
+ // Scavenge and allocate an instance.
+ oop result;
+
+ assert(Klass::cast(array_type)->oop_is_typeArray(), "should be called only for type array");
+ // The oopFactory likes to work with the element type.
+ BasicType elem_type = typeArrayKlass::cast(array_type)->element_type();
+ result = oopFactory::new_typeArray_nozero(elem_type, len, THREAD);
+
+ // Pass oops back through thread local storage. Our apparent type to Java
+ // is that we return an oop, but we can block on exit from this routine and
+ // a GC can trash the oop in C's return register. The generated stub will
+ // fetch the oop from TLS after any possible GC.
+ deoptimize_caller_frame(thread, HAS_PENDING_EXCEPTION);
+ thread->set_vm_result(result);
+ JRT_BLOCK_END;
+
+ if (GraphKit::use_ReduceInitialCardMarks()) {
+ // inform GC that we won't do card marks for initializing writes.
+ new_store_pre_barrier(thread);
+ }
+JRT_END
+
// Note: multianewarray for one dimension is handled inline by GraphKit::new_array.
// multianewarray for 2 dimensions
@@ -978,7 +1010,6 @@ JRT_ENTRY_NO_ASYNC(address, OptoRuntime::handle_exception_C_helper(JavaThread* t
thread->set_exception_pc(pc);
thread->set_exception_handler_pc(handler_address);
- thread->set_exception_stack_size(0);
// Check if the exception PC is a MethodHandle call site.
thread->set_is_method_handle_return(nm->is_method_handle_return(pc));
diff --git a/hotspot/src/share/vm/opto/runtime.hpp b/hotspot/src/share/vm/opto/runtime.hpp
index a691da3..f2c538b 100644
--- a/hotspot/src/share/vm/opto/runtime.hpp
+++ b/hotspot/src/share/vm/opto/runtime.hpp
@@ -114,6 +114,7 @@ class OptoRuntime : public AllStatic {
// References to generated stubs
static address _new_instance_Java;
static address _new_array_Java;
+ static address _new_array_nozero_Java;
static address _multianewarray2_Java;
static address _multianewarray3_Java;
static address _multianewarray4_Java;
@@ -143,6 +144,7 @@ class OptoRuntime : public AllStatic {
// Allocate storage for a objArray or typeArray
static void new_array_C(klassOopDesc* array_klass, int len, JavaThread *thread);
+ static void new_array_nozero_C(klassOopDesc* array_klass, int len, JavaThread *thread);
// Post-slow-path-allocation, pre-initializing-stores step for
// implementing ReduceInitialCardMarks
@@ -208,6 +210,7 @@ private:
// access to runtime stubs entry points for java code
static address new_instance_Java() { return _new_instance_Java; }
static address new_array_Java() { return _new_array_Java; }
+ static address new_array_nozero_Java() { return _new_array_nozero_Java; }
static address multianewarray2_Java() { return _multianewarray2_Java; }
static address multianewarray3_Java() { return _multianewarray3_Java; }
static address multianewarray4_Java() { return _multianewarray4_Java; }
diff --git a/hotspot/src/share/vm/opto/split_if.cpp b/hotspot/src/share/vm/opto/split_if.cpp
index dba6ed1..55de3d7 100644
--- a/hotspot/src/share/vm/opto/split_if.cpp
+++ b/hotspot/src/share/vm/opto/split_if.cpp
@@ -500,19 +500,14 @@ void PhaseIdealLoop::do_split_if( Node *iff ) {
region_cache.lru_insert( new_false, new_false );
region_cache.lru_insert( new_true , new_true );
// Now handle all uses of the splitting block
- for (DUIterator_Last kmin, k = region->last_outs(kmin); k >= kmin; --k) {
- Node* phi = region->last_out(k);
- if( !phi->in(0) ) { // Dead phi? Remove it
+ for (DUIterator k = region->outs(); region->has_out(k); k++) {
+ Node* phi = region->out(k);
+ if (!phi->in(0)) { // Dead phi? Remove it
_igvn.remove_dead_node(phi);
- continue;
- }
- assert( phi->in(0) == region, "" );
- if( phi == region ) { // Found the self-reference
- phi->set_req(0, NULL);
- continue; // Break the self-cycle
- }
- // Expected common case: Phi hanging off of Region
- if( phi->is_Phi() ) {
+ } else if (phi == region) { // Found the self-reference
+ continue; // No roll-back of DUIterator
+ } else if (phi->is_Phi()) { // Expected common case: Phi hanging off of Region
+ assert(phi->in(0) == region, "Inconsistent graph");
// Need a per-def cache. Phi represents a def, so make a cache
small_cache phi_cache;
@@ -524,23 +519,25 @@ void PhaseIdealLoop::do_split_if( Node *iff ) {
// collection of PHI's merging values from different paths. The Phis
// inserted depend only on the location of the USE. We use a
// 2-element cache to handle multiple uses from the same block.
- handle_use( use, phi, &phi_cache, region_dom, new_false, new_true, old_false, old_true );
+ handle_use(use, phi, &phi_cache, region_dom, new_false, new_true, old_false, old_true);
} // End of while phi has uses
-
- // Because handle_use might relocate region->_out,
- // we must refresh the iterator.
- k = region->last_outs(kmin);
-
// Remove the dead Phi
_igvn.remove_dead_node( phi );
-
} else {
+ assert(phi->in(0) == region, "Inconsistent graph");
// Random memory op guarded by Region. Compute new DEF for USE.
- handle_use( phi, region, ®ion_cache, region_dom, new_false, new_true, old_false, old_true );
+ handle_use(phi, region, ®ion_cache, region_dom, new_false, new_true, old_false, old_true);
}
-
+ // Every path above deletes a use of the region, except for the region
+ // self-cycle (which is needed by handle_use calling find_use_block
+ // calling get_ctrl calling get_ctrl_no_update looking for dead
+ // regions). So roll back the DUIterator innards.
+ --k;
} // End of while merge point has phis
+ assert(region->outcnt() == 1, "Only self reference should remain"); // Just Self on the Region
+ region->set_req(0, NULL); // Break the self-cycle
+
// Any leftover bits in the splitting block must not have depended on local
// Phi inputs (these have already been split-up). Hence it's safe to hoist
// these guys to the dominating point.
diff --git a/hotspot/src/share/vm/opto/superword.cpp b/hotspot/src/share/vm/opto/superword.cpp
index 6e1be24..d1d1e1c 100644
--- a/hotspot/src/share/vm/opto/superword.cpp
+++ b/hotspot/src/share/vm/opto/superword.cpp
@@ -70,6 +70,8 @@ void SuperWord::transform_loop(IdealLoopTree* lpt) {
assert(lpt->_head->is_CountedLoop(), "must be");
CountedLoopNode *cl = lpt->_head->as_CountedLoop();
+ if (!cl->is_valid_counted_loop()) return; // skip malformed counted loop
+
if (!cl->is_main_loop() ) return; // skip normal, pre, and post loops
// Check for no control flow in body (other than exit)
@@ -1167,7 +1169,7 @@ void SuperWord::output() {
} else if (n->is_Store()) {
// Promote value to be stored to vector
- VectorNode* val = vector_opd(p, MemNode::ValueIn);
+ Node* val = vector_opd(p, MemNode::ValueIn);
int opc = n->Opcode();
Node* ctl = n->in(MemNode::Control);
@@ -1199,7 +1201,7 @@ void SuperWord::output() {
//------------------------------vector_opd---------------------------
// Create a vector operand for the nodes in pack p for operand: in(opd_idx)
-VectorNode* SuperWord::vector_opd(Node_List* p, int opd_idx) {
+Node* SuperWord::vector_opd(Node_List* p, int opd_idx) {
Node* p0 = p->at(0);
uint vlen = p->size();
Node* opd = p0->in(opd_idx);
@@ -1215,9 +1217,10 @@ VectorNode* SuperWord::vector_opd(Node_List* p, int opd_idx) {
}
if (same_opd) {
- if (opd->is_Vector()) {
- return (VectorNode*)opd; // input is matching vector
+ if (opd->is_Vector() || opd->is_VectorLoad()) {
+ return opd; // input is matching vector
}
+ assert(!opd->is_VectorStore(), "such vector is not expected here");
// Convert scalar input to vector. Use p0's type because it's container
// maybe smaller than the operand's container.
const Type* opd_t = velt_type(!in_bb(opd) ? p0 : opd);
diff --git a/hotspot/src/share/vm/opto/superword.hpp b/hotspot/src/share/vm/opto/superword.hpp
index 50ab3d4..5093767 100644
--- a/hotspot/src/share/vm/opto/superword.hpp
+++ b/hotspot/src/share/vm/opto/superword.hpp
@@ -360,7 +360,7 @@ class SuperWord : public ResourceObj {
// Convert packs into vector node operations
void output();
// Create a vector operand for the nodes in pack p for operand: in(opd_idx)
- VectorNode* vector_opd(Node_List* p, int opd_idx);
+ Node* vector_opd(Node_List* p, int opd_idx);
// Can code be generated for pack p?
bool implemented(Node_List* p);
// For pack p, are all operands and all uses (with in the block) vector?
diff --git a/hotspot/src/share/vm/opto/type.hpp b/hotspot/src/share/vm/opto/type.hpp
index 4d08d50..133ce78 100644
--- a/hotspot/src/share/vm/opto/type.hpp
+++ b/hotspot/src/share/vm/opto/type.hpp
@@ -64,6 +64,8 @@ class TypeKlassPtr;
// different kind of Type exists. Types are never modified after creation, so
// all their interesting fields are constant.
class Type {
+ friend class VMStructs;
+
public:
enum TYPES {
Bad=0, // Type check
diff --git a/hotspot/src/share/vm/opto/vectornode.cpp b/hotspot/src/share/vm/opto/vectornode.cpp
index 4d72b73..885a1c8 100644
--- a/hotspot/src/share/vm/opto/vectornode.cpp
+++ b/hotspot/src/share/vm/opto/vectornode.cpp
@@ -426,7 +426,7 @@ VectorLoadNode* VectorLoadNode::make(Compile* C, int opc, Node* ctl, Node* mem,
// Return the vector version of a scalar store node.
VectorStoreNode* VectorStoreNode::make(Compile* C, int opc, Node* ctl, Node* mem,
- Node* adr, const TypePtr* atyp, VectorNode* val,
+ Node* adr, const TypePtr* atyp, Node* val,
uint vlen) {
int vopc = opcode(opc, vlen);
diff --git a/hotspot/src/share/vm/opto/vectornode.hpp b/hotspot/src/share/vm/opto/vectornode.hpp
index 4d28703..7d1905c 100644
--- a/hotspot/src/share/vm/opto/vectornode.hpp
+++ b/hotspot/src/share/vm/opto/vectornode.hpp
@@ -47,10 +47,10 @@ class VectorNode : public Node {
friend class VectorStoreNode; // ditto.
VectorNode(Node* n1, uint vlen) : Node(NULL, n1), _length(vlen) {
- init_flags(Flag_is_Vector);
+ init_class_id(Class_Vector);
}
VectorNode(Node* n1, Node* n2, uint vlen) : Node(NULL, n1, n2), _length(vlen) {
- init_flags(Flag_is_Vector);
+ init_class_id(Class_Vector);
}
virtual int Opcode() const;
@@ -389,7 +389,7 @@ class VectorLoadNode : public LoadNode {
public:
VectorLoadNode(Node* c, Node* mem, Node* adr, const TypePtr* at, const Type *rt)
: LoadNode(c,mem,adr,at,rt) {
- init_flags(Flag_is_Vector);
+ init_class_id(Class_VectorLoad);
}
virtual int Opcode() const;
@@ -617,7 +617,7 @@ class VectorStoreNode : public StoreNode {
public:
VectorStoreNode(Node* c, Node* mem, Node* adr, const TypePtr* at, Node* val)
: StoreNode(c,mem,adr,at,val) {
- init_flags(Flag_is_Vector);
+ init_class_id(Class_VectorStore);
}
virtual int Opcode() const;
@@ -635,7 +635,7 @@ class VectorStoreNode : public StoreNode {
static int opcode(int sopc, uint vlen);
static VectorStoreNode* make(Compile* C, int opc, Node* ctl, Node* mem,
- Node* adr, const TypePtr* atyp, VectorNode* val,
+ Node* adr, const TypePtr* atyp, Node* val,
uint vlen);
};
diff --git a/hotspot/src/share/vm/precompiled.hpp b/hotspot/src/share/vm/precompiled.hpp
index 87129d1..686f256 100644
--- a/hotspot/src/share/vm/precompiled.hpp
+++ b/hotspot/src/share/vm/precompiled.hpp
@@ -206,7 +206,6 @@
# include "runtime/perfMemory.hpp"
# include "runtime/prefetch.hpp"
# include "runtime/reflection.hpp"
-# include "runtime/reflectionCompat.hpp"
# include "runtime/reflectionUtils.hpp"
# include "runtime/registerMap.hpp"
# include "runtime/safepoint.hpp"
diff --git a/hotspot/src/share/vm/prims/forte.cpp b/hotspot/src/share/vm/prims/forte.cpp
index 023921c..d5eb0a6 100644
--- a/hotspot/src/share/vm/prims/forte.cpp
+++ b/hotspot/src/share/vm/prims/forte.cpp
@@ -522,25 +522,6 @@ static void forte_fill_call_trace_given_top(JavaThread* thd,
extern "C" {
JNIEXPORT
void AsyncGetCallTrace(ASGCT_CallTrace *trace, jint depth, void* ucontext) {
-
-// This is if'd out because we no longer use thread suspension.
-// However if someone wanted to backport this to a 5.0 jvm then this
-// code would be important.
-#if 0
- if (SafepointSynchronize::is_synchronizing()) {
- // The safepoint mechanism is trying to synchronize all the threads.
- // Since this can involve thread suspension, it is not safe for us
- // to be here. We can reduce the deadlock risk window by quickly
- // returning to the SIGPROF handler. However, it is still possible
- // for VMThread to catch us here or in the SIGPROF handler. If we
- // are suspended while holding a resource and another thread blocks
- // on that resource in the SIGPROF handler, then we will have a
- // three-thread deadlock (VMThread, this thread, the other thread).
- trace->num_frames = ticks_safepoint; // -10
- return;
- }
-#endif
-
JavaThread* thread;
if (trace->env_id == NULL ||
@@ -640,6 +621,11 @@ void AsyncGetCallTrace(ASGCT_CallTrace *trace, jint depth, void* ucontext) {
// Method to let libcollector know about a dynamically loaded function.
// Because it is weakly bound, the calls become NOP's when the library
// isn't present.
+#ifdef __APPLE__
+// XXXDARWIN: Link errors occur even when __attribute__((weak_import))
+// is added
+#define collector_func_load(x0,x1,x2,x3,x4,x5,x6) (0)
+#else
void collector_func_load(char* name,
void* null_argument_1,
void* null_argument_2,
@@ -650,6 +636,7 @@ void collector_func_load(char* name,
#pragma weak collector_func_load
#define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
+#endif // __APPLE__
#endif // !_WINDOWS
} // end extern "C"
diff --git a/hotspot/src/share/vm/prims/jni.cpp b/hotspot/src/share/vm/prims/jni.cpp
index b8e61c1..4e46f6a 100644
--- a/hotspot/src/share/vm/prims/jni.cpp
+++ b/hotspot/src/share/vm/prims/jni.cpp
@@ -82,6 +82,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
static jint CurrentVersion = JNI_VERSION_1_6;
@@ -492,7 +496,7 @@ JNI_ENTRY(jfieldID, jni_FromReflectedField(JNIEnv *env, jobject field))
// First check if this is a static field
if (modifiers & JVM_ACC_STATIC) {
- intptr_t offset = instanceKlass::cast(k1())->offset_from_fields( slot );
+ intptr_t offset = instanceKlass::cast(k1())->field_offset( slot );
JNIid* id = instanceKlass::cast(k1())->jni_id_for(offset);
assert(id != NULL, "corrupt Field object");
debug_only(id->set_is_static_field_id();)
@@ -504,7 +508,7 @@ JNI_ENTRY(jfieldID, jni_FromReflectedField(JNIEnv *env, jobject field))
// The slot is the index of the field description in the field-array
// The jfieldID is the offset of the field within the object
// It may also have hash bits for k, if VerifyJNIFields is turned on.
- intptr_t offset = instanceKlass::cast(k1())->offset_from_fields( slot );
+ intptr_t offset = instanceKlass::cast(k1())->field_offset( slot );
assert(instanceKlass::cast(k1())->contains_field_offset(offset), "stay within object");
ret = jfieldIDWorkaround::to_instance_jfieldID(k1(), offset);
return ret;
diff --git a/hotspot/src/share/vm/prims/jvm.cpp b/hotspot/src/share/vm/prims/jvm.cpp
index 4abc11c..f98d1b7 100644
--- a/hotspot/src/share/vm/prims/jvm.cpp
+++ b/hotspot/src/share/vm/prims/jvm.cpp
@@ -32,6 +32,7 @@
#include "gc_interface/collectedHeap.inline.hpp"
#include "memory/oopFactory.hpp"
#include "memory/universe.inline.hpp"
+#include "oops/fieldStreams.hpp"
#include "oops/instanceKlass.hpp"
#include "oops/objArrayKlass.hpp"
#include "prims/jvm.h"
@@ -72,6 +73,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "jvm_windows.h"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "jvm_bsd.h"
+#endif
#include <errno.h>
@@ -1504,7 +1508,7 @@ JVM_ENTRY(jbyteArray, JVM_GetFieldAnnotations(JNIEnv *env, jobject field))
fieldDescriptor fd;
KlassHandle kh(THREAD, k);
- intptr_t offset = instanceKlass::cast(kh())->offset_from_fields(slot);
+ intptr_t offset = instanceKlass::cast(kh())->field_offset(slot);
if (modifiers & JVM_ACC_STATIC) {
// for static fields we only look in the current class
@@ -1604,9 +1608,6 @@ JVM_ENTRY(jobjectArray, JVM_GetClassDeclaredFields(JNIEnv *env, jclass ofClass,
// Ensure class is linked
k->link_class(CHECK_NULL);
- typeArrayHandle fields(THREAD, k->fields());
- int fields_len = fields->length();
-
// 4496456 We need to filter out java.lang.Throwable.backtrace
bool skip_backtrace = false;
@@ -1615,12 +1616,11 @@ JVM_ENTRY(jobjectArray, JVM_GetClassDeclaredFields(JNIEnv *env, jclass ofClass,
if (publicOnly) {
num_fields = 0;
- for (int i = 0, j = 0; i < fields_len; i += instanceKlass::next_offset, j++) {
- int mods = fields->ushort_at(i + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS;
- if (mods & JVM_ACC_PUBLIC) ++num_fields;
+ for (JavaFieldStream fs(k()); !fs.done(); fs.next()) {
+ if (fs.access_flags().is_public()) ++num_fields;
}
} else {
- num_fields = fields_len / instanceKlass::next_offset;
+ num_fields = k->java_fields_count();
if (k() == SystemDictionary::Throwable_klass()) {
num_fields--;
@@ -1633,16 +1633,15 @@ JVM_ENTRY(jobjectArray, JVM_GetClassDeclaredFields(JNIEnv *env, jclass ofClass,
int out_idx = 0;
fieldDescriptor fd;
- for (int i = 0; i < fields_len; i += instanceKlass::next_offset) {
+ for (JavaFieldStream fs(k); !fs.done(); fs.next()) {
if (skip_backtrace) {
// 4496456 skip java.lang.Throwable.backtrace
- int offset = k->offset_from_fields(i);
+ int offset = fs.offset();
if (offset == java_lang_Throwable::get_backtrace_offset()) continue;
}
- int mods = fields->ushort_at(i + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS;
- if (!publicOnly || (mods & JVM_ACC_PUBLIC)) {
- fd.initialize(k(), i);
+ if (!publicOnly || fs.access_flags().is_public()) {
+ fd.initialize(k(), fs.index());
oop field = Reflection::new_field(&fd, UseNewReflection, CHECK_NULL);
result->obj_at_put(out_idx, field);
++out_idx;
@@ -2130,7 +2129,7 @@ JVM_QUICK_ENTRY(jint, JVM_GetClassFieldsCount(JNIEnv *env, jclass cls))
k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
if (!Klass::cast(k)->oop_is_instance())
return 0;
- return instanceKlass::cast(k)->fields()->length() / instanceKlass::next_offset;
+ return instanceKlass::cast(k)->java_fields_count();
JVM_END
@@ -2226,8 +2225,7 @@ JVM_QUICK_ENTRY(jint, JVM_GetFieldIxModifiers(JNIEnv *env, jclass cls, int field
JVMWrapper("JVM_GetFieldIxModifiers");
klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls));
k = JvmtiThreadState::class_to_verify_considering_redefinition(k, thread);
- typeArrayOop fields = instanceKlass::cast(k)->fields();
- return fields->ushort_at(field_index * instanceKlass::next_offset + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS;
+ return instanceKlass::cast(k)->field_access_flags(field_index) & JVM_RECOGNIZED_FIELD_MODIFIERS;
JVM_END
@@ -2410,7 +2408,7 @@ JVM_ENTRY(const char*, JVM_GetCPMethodClassNameUTF(JNIEnv *env, jclass cls, jint
JVM_END
-JVM_QUICK_ENTRY(jint, JVM_GetCPFieldModifiers(JNIEnv *env, jclass cls, int cp_index, jclass called_cls))
+JVM_ENTRY(jint, JVM_GetCPFieldModifiers(JNIEnv *env, jclass cls, int cp_index, jclass called_cls))
JVMWrapper("JVM_GetCPFieldModifiers");
klassOop k = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls));
klassOop k_called = java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(called_cls));
@@ -2422,12 +2420,9 @@ JVM_QUICK_ENTRY(jint, JVM_GetCPFieldModifiers(JNIEnv *env, jclass cls, int cp_in
case JVM_CONSTANT_Fieldref: {
Symbol* name = cp->uncached_name_ref_at(cp_index);
Symbol* signature = cp->uncached_signature_ref_at(cp_index);
- typeArrayOop fields = instanceKlass::cast(k_called)->fields();
- int fields_count = fields->length();
- for (int i = 0; i < fields_count; i += instanceKlass::next_offset) {
- if (cp_called->symbol_at(fields->ushort_at(i + instanceKlass::name_index_offset)) == name &&
- cp_called->symbol_at(fields->ushort_at(i + instanceKlass::signature_index_offset)) == signature) {
- return fields->ushort_at(i + instanceKlass::access_flags_offset) & JVM_RECOGNIZED_FIELD_MODIFIERS;
+ for (JavaFieldStream fs(k_called); !fs.done(); fs.next()) {
+ if (fs.name() == name && fs.signature() == signature) {
+ return fs.access_flags().as_short() & JVM_RECOGNIZED_FIELD_MODIFIERS;
}
}
return -1;
@@ -4031,249 +4026,6 @@ JVM_END
#endif
-//---------------------------------------------------------------------------
-//
-// Support for old native code-based reflection (pre-JDK 1.4)
-// Disabled by default in the product build.
-//
-// See reflection.hpp for information on SUPPORT_OLD_REFLECTION
-//
-//---------------------------------------------------------------------------
-
-#ifdef SUPPORT_OLD_REFLECTION
-
-JVM_ENTRY(jobjectArray, JVM_GetClassFields(JNIEnv *env, jclass cls, jint which))
- JVMWrapper("JVM_GetClassFields");
- JvmtiVMObjectAllocEventCollector oam;
- oop mirror = JNIHandles::resolve_non_null(cls);
- objArrayOop result = Reflection::reflect_fields(mirror, which, CHECK_NULL);
- return (jobjectArray) JNIHandles::make_local(env, result);
-JVM_END
-
-
-JVM_ENTRY(jobjectArray, JVM_GetClassMethods(JNIEnv *env, jclass cls, jint which))
- JVMWrapper("JVM_GetClassMethods");
- JvmtiVMObjectAllocEventCollector oam;
- oop mirror = JNIHandles::resolve_non_null(cls);
- objArrayOop result = Reflection::reflect_methods(mirror, which, CHECK_NULL);
- //%note jvm_r4
- return (jobjectArray) JNIHandles::make_local(env, result);
-JVM_END
-
-
-JVM_ENTRY(jobjectArray, JVM_GetClassConstructors(JNIEnv *env, jclass cls, jint which))
- JVMWrapper("JVM_GetClassConstructors");
- JvmtiVMObjectAllocEventCollector oam;
- oop mirror = JNIHandles::resolve_non_null(cls);
- objArrayOop result = Reflection::reflect_constructors(mirror, which, CHECK_NULL);
- //%note jvm_r4
- return (jobjectArray) JNIHandles::make_local(env, result);
-JVM_END
-
-
-JVM_ENTRY(jobject, JVM_GetClassField(JNIEnv *env, jclass cls, jstring name, jint which))
- JVMWrapper("JVM_GetClassField");
- JvmtiVMObjectAllocEventCollector oam;
- if (name == NULL) return NULL;
- Handle str (THREAD, JNIHandles::resolve_non_null(name));
-
- const char* cstr = java_lang_String::as_utf8_string(str());
- TempNewSymbol field_name = SymbolTable::probe(cstr, (int)strlen(cstr));
- if (field_name == NULL) {
- THROW_0(vmSymbols::java_lang_NoSuchFieldException());
- }
-
- oop mirror = JNIHandles::resolve_non_null(cls);
- oop result = Reflection::reflect_field(mirror, field_name, which, CHECK_NULL);
- if (result == NULL) {
- THROW_0(vmSymbols::java_lang_NoSuchFieldException());
- }
- return JNIHandles::make_local(env, result);
-JVM_END
-
-
-JVM_ENTRY(jobject, JVM_GetClassMethod(JNIEnv *env, jclass cls, jstring name, jobjectArray types, jint which))
- JVMWrapper("JVM_GetClassMethod");
- JvmtiVMObjectAllocEventCollector oam;
- if (name == NULL) {
- THROW_0(vmSymbols::java_lang_NullPointerException());
- }
- Handle str (THREAD, JNIHandles::resolve_non_null(name));
-
- const char* cstr = java_lang_String::as_utf8_string(str());
- TempNewSymbol method_name = SymbolTable::probe(cstr, (int)strlen(cstr));
- if (method_name == NULL) {
- THROW_0(vmSymbols::java_lang_NoSuchMethodException());
- }
-
- oop mirror = JNIHandles::resolve_non_null(cls);
- objArrayHandle tarray (THREAD, objArrayOop(JNIHandles::resolve(types)));
- oop result = Reflection::reflect_method(mirror, method_name, tarray,
- which, CHECK_NULL);
- if (result == NULL) {
- THROW_0(vmSymbols::java_lang_NoSuchMethodException());
- }
- return JNIHandles::make_local(env, result);
-JVM_END
-
-
-JVM_ENTRY(jobject, JVM_GetClassConstructor(JNIEnv *env, jclass cls, jobjectArray types, jint which))
- JVMWrapper("JVM_GetClassConstructor");
- JvmtiVMObjectAllocEventCollector oam;
- oop mirror = JNIHandles::resolve_non_null(cls);
- objArrayHandle tarray (THREAD, objArrayOop(JNIHandles::resolve(types)));
- oop result = Reflection::reflect_constructor(mirror, tarray, which, CHECK_NULL);
- if (result == NULL) {
- THROW_0(vmSymbols::java_lang_NoSuchMethodException());
- }
- return (jobject) JNIHandles::make_local(env, result);
-JVM_END
-
-
-// Instantiation ///////////////////////////////////////////////////////////////////////////////
-
-JVM_ENTRY(jobject, JVM_NewInstance(JNIEnv *env, jclass cls))
- JVMWrapper("JVM_NewInstance");
- Handle mirror(THREAD, JNIHandles::resolve_non_null(cls));
-
- methodOop resolved_constructor = java_lang_Class::resolved_constructor(mirror());
- if (resolved_constructor == NULL) {
- klassOop k = java_lang_Class::as_klassOop(mirror());
- // The java.lang.Class object caches a resolved constructor if all the checks
- // below were done successfully and a constructor was found.
-
- // Do class based checks
- if (java_lang_Class::is_primitive(mirror())) {
- const char* msg = "";
- if (mirror == Universe::bool_mirror()) msg = "java/lang/Boolean";
- else if (mirror == Universe::char_mirror()) msg = "java/lang/Character";
- else if (mirror == Universe::float_mirror()) msg = "java/lang/Float";
- else if (mirror == Universe::double_mirror()) msg = "java/lang/Double";
- else if (mirror == Universe::byte_mirror()) msg = "java/lang/Byte";
- else if (mirror == Universe::short_mirror()) msg = "java/lang/Short";
- else if (mirror == Universe::int_mirror()) msg = "java/lang/Integer";
- else if (mirror == Universe::long_mirror()) msg = "java/lang/Long";
- THROW_MSG_0(vmSymbols::java_lang_NullPointerException(), msg);
- }
-
- // Check whether we are allowed to instantiate this class
- Klass::cast(k)->check_valid_for_instantiation(false, CHECK_NULL); // Array classes get caught here
- instanceKlassHandle klass(THREAD, k);
- // Make sure class is initialized (also so all methods are rewritten)
- klass->initialize(CHECK_NULL);
-
- // Lookup default constructor
- resolved_constructor = klass->find_method(vmSymbols::object_initializer_name(), vmSymbols::void_method_signature());
- if (resolved_constructor == NULL) {
- ResourceMark rm(THREAD);
- THROW_MSG_0(vmSymbols::java_lang_InstantiationException(), klass->external_name());
- }
-
- // Cache result in java.lang.Class object. Does not have to be MT safe.
- java_lang_Class::set_resolved_constructor(mirror(), resolved_constructor);
- }
-
- assert(resolved_constructor != NULL, "sanity check");
- methodHandle constructor = methodHandle(THREAD, resolved_constructor);
-
- // We have an initialized instanceKlass with a default constructor
- instanceKlassHandle klass(THREAD, java_lang_Class::as_klassOop(JNIHandles::resolve_non_null(cls)));
- assert(klass->is_initialized() || klass->is_being_initialized(), "sanity check");
-
- // Do security check
- klassOop caller_klass = NULL;
- if (UsePrivilegedStack) {
- caller_klass = thread->security_get_caller_class(2);
-
- if (!Reflection::verify_class_access(caller_klass, klass(), false) ||
- !Reflection::verify_field_access(caller_klass,
- klass(),
- klass(),
- constructor->access_flags(),
- false,
- true)) {
- ResourceMark rm(THREAD);
- THROW_MSG_0(vmSymbols::java_lang_IllegalAccessException(), klass->external_name());
- }
- }
-
- // Allocate object and call constructor
- Handle receiver = klass->allocate_instance_handle(CHECK_NULL);
- JavaCalls::call_default_constructor(thread, constructor, receiver, CHECK_NULL);
-
- jobject res = JNIHandles::make_local(env, receiver());
- if (JvmtiExport::should_post_vm_object_alloc()) {
- JvmtiExport::post_vm_object_alloc(JavaThread::current(), receiver());
- }
- return res;
-JVM_END
-
-
-// Field ////////////////////////////////////////////////////////////////////////////////////////////
-
-JVM_ENTRY(jobject, JVM_GetField(JNIEnv *env, jobject field, jobject obj))
- JVMWrapper("JVM_GetField");
- JvmtiVMObjectAllocEventCollector oam;
- Handle field_mirror(thread, JNIHandles::resolve(field));
- Handle receiver (thread, JNIHandles::resolve(obj));
- fieldDescriptor fd;
- Reflection::resolve_field(field_mirror, receiver, &fd, false, CHECK_NULL);
- jvalue value;
- BasicType type = Reflection::field_get(&value, &fd, receiver);
- oop box = Reflection::box(&value, type, CHECK_NULL);
- return JNIHandles::make_local(env, box);
-JVM_END
-
-
-JVM_ENTRY(jvalue, JVM_GetPrimitiveField(JNIEnv *env, jobject field, jobject obj, unsigned char wCode))
- JVMWrapper("JVM_GetPrimitiveField");
- Handle field_mirror(thread, JNIHandles::resolve(field));
- Handle receiver (thread, JNIHandles::resolve(obj));
- fieldDescriptor fd;
- jvalue value;
- value.j = 0;
- Reflection::resolve_field(field_mirror, receiver, &fd, false, CHECK_(value));
- BasicType type = Reflection::field_get(&value, &fd, receiver);
- BasicType wide_type = (BasicType) wCode;
- if (type != wide_type) {
- Reflection::widen(&value, type, wide_type, CHECK_(value));
- }
- return value;
-JVM_END // should really be JVM_END, but that doesn't work for union types!
-
-
-JVM_ENTRY(void, JVM_SetField(JNIEnv *env, jobject field, jobject obj, jobject val))
- JVMWrapper("JVM_SetField");
- Handle field_mirror(thread, JNIHandles::resolve(field));
- Handle receiver (thread, JNIHandles::resolve(obj));
- oop box = JNIHandles::resolve(val);
- fieldDescriptor fd;
- Reflection::resolve_field(field_mirror, receiver, &fd, true, CHECK);
- BasicType field_type = fd.field_type();
- jvalue value;
- BasicType value_type;
- if (field_type == T_OBJECT || field_type == T_ARRAY) {
- // Make sure we do no unbox e.g. java/lang/Integer instances when storing into an object array
- value_type = Reflection::unbox_for_regular_object(box, &value);
- Reflection::field_set(&value, &fd, receiver, field_type, CHECK);
- } else {
- value_type = Reflection::unbox_for_primitive(box, &value, CHECK);
- Reflection::field_set(&value, &fd, receiver, value_type, CHECK);
- }
-JVM_END
-
-
-JVM_ENTRY(void, JVM_SetPrimitiveField(JNIEnv *env, jobject field, jobject obj, jvalue v, unsigned char vCode))
- JVMWrapper("JVM_SetPrimitiveField");
- Handle field_mirror(thread, JNIHandles::resolve(field));
- Handle receiver (thread, JNIHandles::resolve(obj));
- fieldDescriptor fd;
- Reflection::resolve_field(field_mirror, receiver, &fd, true, CHECK);
- BasicType value_type = (BasicType) vCode;
- Reflection::field_set(&v, &fd, receiver, value_type, CHECK);
-JVM_END
-
-
// Method ///////////////////////////////////////////////////////////////////////////////////////////
JVM_ENTRY(jobject, JVM_InvokeMethod(JNIEnv *env, jobject method, jobject obj, jobjectArray args0))
@@ -4313,8 +4065,6 @@ JVM_ENTRY(jobject, JVM_NewInstanceFromConstructor(JNIEnv *env, jobject c, jobjec
return res;
JVM_END
-#endif /* SUPPORT_OLD_REFLECTION */
-
// Atomic ///////////////////////////////////////////////////////////////////////////////////////////
JVM_LEAF(jboolean, JVM_SupportsCX8())
diff --git a/hotspot/src/share/vm/prims/jvm.h b/hotspot/src/share/vm/prims/jvm.h
index cc78453..70d1649 100644
--- a/hotspot/src/share/vm/prims/jvm.h
+++ b/hotspot/src/share/vm/prims/jvm.h
@@ -26,7 +26,6 @@
#define SHARE_VM_PRIMS_JVM_H
#include "prims/jni.h"
-#include "runtime/reflectionCompat.hpp"
#ifdef TARGET_OS_FAMILY_linux
# include "jvm_linux.h"
#endif
@@ -36,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "jvm_windows.h"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "jvm_bsd.h"
+#endif
#ifndef _JAVASOFT_JVM_H_
#define _JAVASOFT_JVM_H_
@@ -43,8 +45,7 @@
// HotSpot integration note:
//
// This file and jvm.h used with the JDK are identical,
-// except for the three includes removed below and the
-// SUPPORT_OLD_REFLECTION sections cut out of the JDK's jvm.h.
+// except for the three includes removed below
// #include <sys/stat.h>
// #include "jni.h"
@@ -443,14 +444,6 @@ JVM_DefineClassWithSourceCond(JNIEnv *env, const char *name,
jsize len, jobject pd, const char *source,
jboolean verify);
-/* Define a class with a source (MLVM) */
-JNIEXPORT jclass JNICALL
-JVM_DefineClassWithCP(JNIEnv *env, const char *name, jobject loader,
- const jbyte *buf, jsize len, jobject pd,
- const char *source,
- // same args as JVM_DefineClassWithSource to this point
- jobjectArray constants);
-
/*
* Append a path to the boot class path
*/
@@ -1448,65 +1441,6 @@ JVM_RawMonitorEnter(void *mon);
JNIEXPORT void JNICALL
JVM_RawMonitorExit(void *mon);
-
-#ifdef SUPPORT_OLD_REFLECTION
-
-/*
- * Support for old native code-based (pre-JDK 1.4) reflection implementation.
- * Disabled by default in the product build.
- *
- * See reflection.hpp for information on SUPPORT_OLD_REFLECTION
- */
-
-/*
- * reflecting fields and methods.
- * which: 0 --- MEMBER_PUBLIC
- * 1 --- MEMBER_DECLARED
- * NOTE: absent in product build by default
- */
-
-JNIEXPORT jobjectArray JNICALL
-JVM_GetClassFields(JNIEnv *env, jclass cls, jint which);
-
-JNIEXPORT jobjectArray JNICALL
-JVM_GetClassMethods(JNIEnv *env, jclass cls, jint which);
-
-JNIEXPORT jobjectArray JNICALL
-JVM_GetClassConstructors(JNIEnv *env, jclass cls, jint which);
-
-JNIEXPORT jobject JNICALL
-JVM_GetClassField(JNIEnv *env, jclass cls, jstring name, jint which);
-
-JNIEXPORT jobject JNICALL
-JVM_GetClassMethod(JNIEnv *env, jclass cls, jstring name, jobjectArray types,
- jint which);
-JNIEXPORT jobject JNICALL
-JVM_GetClassConstructor(JNIEnv *env, jclass cls, jobjectArray types,
- jint which);
-
-/*
- * Implements Class.newInstance
- */
-JNIEXPORT jobject JNICALL
-JVM_NewInstance(JNIEnv *env, jclass cls);
-
-/*
- * java.lang.reflect.Field
- */
-JNIEXPORT jobject JNICALL
-JVM_GetField(JNIEnv *env, jobject field, jobject obj);
-
-JNIEXPORT jvalue JNICALL
-JVM_GetPrimitiveField(JNIEnv *env, jobject field, jobject obj,
- unsigned char wCode);
-
-JNIEXPORT void JNICALL
-JVM_SetField(JNIEnv *env, jobject field, jobject obj, jobject val);
-
-JNIEXPORT void JNICALL
-JVM_SetPrimitiveField(JNIEnv *env, jobject field, jobject obj, jvalue v,
- unsigned char vCode);
-
/*
* java.lang.reflect.Method
*/
@@ -1519,8 +1453,6 @@ JVM_InvokeMethod(JNIEnv *env, jobject method, jobject obj, jobjectArray args0);
JNIEXPORT jobject JNICALL
JVM_NewInstanceFromConstructor(JNIEnv *env, jobject c, jobjectArray args0);
-#endif /* SUPPORT_OLD_REFLECTION */
-
/*
* java.lang.management support
*/
@@ -1656,7 +1588,8 @@ typedef struct {
*/
unsigned int thread_park_blocker : 1;
unsigned int post_vm_init_hook_enabled : 1;
- unsigned int : 30;
+ unsigned int pending_list_uses_discovered_field : 1;
+ unsigned int : 29;
unsigned int : 32;
unsigned int : 32;
} jdk_version_info;
diff --git a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
index d12d69c..35ae707 100644
--- a/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp
@@ -25,6 +25,7 @@
#include "precompiled.hpp"
#include "classfile/symbolTable.hpp"
#include "interpreter/bytecodeStream.hpp"
+#include "oops/fieldStreams.hpp"
#include "prims/jvmtiClassFileReconstituter.hpp"
#include "runtime/signature.hpp"
#ifdef TARGET_ARCH_x86
@@ -52,25 +53,22 @@
// JVMSpec| field_info fields[fields_count];
void JvmtiClassFileReconstituter::write_field_infos() {
HandleMark hm(thread());
- typeArrayHandle fields(thread(), ikh()->fields());
- int fields_length = fields->length();
- int num_fields = fields_length / instanceKlass::next_offset;
objArrayHandle fields_anno(thread(), ikh()->fields_annotations());
- write_u2(num_fields);
- for (int index = 0; index < fields_length; index += instanceKlass::next_offset) {
- AccessFlags access_flags;
- int flags = fields->ushort_at(index + instanceKlass::access_flags_offset);
- access_flags.set_flags(flags);
- int name_index = fields->ushort_at(index + instanceKlass::name_index_offset);
- int signature_index = fields->ushort_at(index + instanceKlass::signature_index_offset);
- int initial_value_index = fields->ushort_at(index + instanceKlass::initval_index_offset);
+ // Compute the real number of Java fields
+ int java_fields = ikh()->java_fields_count();
+
+ write_u2(java_fields);
+ for (JavaFieldStream fs(ikh()); !fs.done(); fs.next()) {
+ AccessFlags access_flags = fs.access_flags();
+ int name_index = fs.name_index();
+ int signature_index = fs.signature_index();
+ int initial_value_index = fs.initval_index();
guarantee(name_index != 0 && signature_index != 0, "bad constant pool index for field");
- int offset = ikh()->offset_from_fields( index );
- int generic_signature_index =
- fields->ushort_at(index + instanceKlass::generic_signature_offset);
+ // int offset = ikh()->field_offset( index );
+ int generic_signature_index = fs.generic_signature_index();
typeArrayHandle anno(thread(), fields_anno.not_null() ?
- (typeArrayOop)(fields_anno->obj_at(index / instanceKlass::next_offset)) :
+ (typeArrayOop)(fields_anno->obj_at(fs.index())) :
(typeArrayOop)NULL);
// JVMSpec| field_info {
@@ -81,7 +79,7 @@ void JvmtiClassFileReconstituter::write_field_infos() {
// JVMSpec| attribute_info attributes[attributes_count];
// JVMSpec| }
- write_u2(flags & JVM_RECOGNIZED_FIELD_MODIFIERS);
+ write_u2(access_flags.as_int() & JVM_RECOGNIZED_FIELD_MODIFIERS);
write_u2(name_index);
write_u2(signature_index);
int attr_count = 0;
diff --git a/hotspot/src/share/vm/prims/jvmtiEnv.cpp b/hotspot/src/share/vm/prims/jvmtiEnv.cpp
index 61a8a23..652be9a 100644
--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp
@@ -68,6 +68,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
@@ -2044,7 +2047,6 @@ JvmtiEnv::SetFieldAccessWatch(fieldDescriptor* fdesc_ptr) {
// make sure we haven't set this watch before
if (fdesc_ptr->is_field_access_watched()) return JVMTI_ERROR_DUPLICATE;
fdesc_ptr->set_is_field_access_watched(true);
- update_klass_field_access_flag(fdesc_ptr);
JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_ACCESS, true);
@@ -2057,7 +2059,6 @@ JvmtiEnv::ClearFieldAccessWatch(fieldDescriptor* fdesc_ptr) {
// make sure we have a watch to clear
if (!fdesc_ptr->is_field_access_watched()) return JVMTI_ERROR_NOT_FOUND;
fdesc_ptr->set_is_field_access_watched(false);
- update_klass_field_access_flag(fdesc_ptr);
JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_ACCESS, false);
@@ -2070,7 +2071,6 @@ JvmtiEnv::SetFieldModificationWatch(fieldDescriptor* fdesc_ptr) {
// make sure we haven't set this watch before
if (fdesc_ptr->is_field_modification_watched()) return JVMTI_ERROR_DUPLICATE;
fdesc_ptr->set_is_field_modification_watched(true);
- update_klass_field_access_flag(fdesc_ptr);
JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_MODIFICATION, true);
@@ -2083,7 +2083,6 @@ JvmtiEnv::ClearFieldModificationWatch(fieldDescriptor* fdesc_ptr) {
// make sure we have a watch to clear
if (!fdesc_ptr->is_field_modification_watched()) return JVMTI_ERROR_NOT_FOUND;
fdesc_ptr->set_is_field_modification_watched(false);
- update_klass_field_access_flag(fdesc_ptr);
JvmtiEventController::change_field_watch(JVMTI_EVENT_FIELD_MODIFICATION, false);
diff --git a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
index 30903a6..fd42642 100644
--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
@@ -565,15 +565,6 @@ JvmtiEnvBase::get_JavaThread(jthread jni_thread) {
}
-// update the access_flags for the field in the klass
-void
-JvmtiEnvBase::update_klass_field_access_flag(fieldDescriptor *fd) {
- instanceKlass* ik = instanceKlass::cast(fd->field_holder());
- typeArrayOop fields = ik->fields();
- fields->ushort_at_put(fd->index(), (jushort)fd->access_flags().as_short());
-}
-
-
// return the vframe on the specified thread and depth, NULL if no such frame
vframe*
JvmtiEnvBase::vframeFor(JavaThread* java_thread, jint depth) {
diff --git a/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp b/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp
index 0ad1b92..ba03746 100644
--- a/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp
+++ b/hotspot/src/share/vm/prims/jvmtiEnvBase.hpp
@@ -267,8 +267,6 @@ class JvmtiEnvBase : public CHeapObj {
// convert to a jni jclass from a non-null klassOop
jclass get_jni_class_non_null(klassOop k);
- void update_klass_field_access_flag(fieldDescriptor *fd);
-
jint count_locked_objects(JavaThread *java_thread, Handle hobj);
jvmtiError get_locked_objects_in_frame(JavaThread *calling_thread,
JavaThread* java_thread,
diff --git a/hotspot/src/share/vm/prims/jvmtiExport.hpp b/hotspot/src/share/vm/prims/jvmtiExport.hpp
index 07702b1..1bfefa0 100644
--- a/hotspot/src/share/vm/prims/jvmtiExport.hpp
+++ b/hotspot/src/share/vm/prims/jvmtiExport.hpp
@@ -66,6 +66,7 @@ class AttachOperation;
// This class contains the JVMTI interface for the rest of hotspot.
//
class JvmtiExport : public AllStatic {
+ friend class VMStructs;
private:
static int _field_access_count;
static int _field_modification_count;
diff --git a/hotspot/src/share/vm/prims/jvmtiImpl.cpp b/hotspot/src/share/vm/prims/jvmtiImpl.cpp
index f673e92..e0d809d 100644
--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp
@@ -54,6 +54,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
//
// class JvmtiAgentThread
diff --git a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
index 62f8ba8..10a478b 100644
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
@@ -30,6 +30,7 @@
#include "interpreter/rewriter.hpp"
#include "memory/gcLocker.hpp"
#include "memory/universe.inline.hpp"
+#include "oops/fieldStreams.hpp"
#include "oops/klassVtable.hpp"
#include "prims/jvmtiImpl.hpp"
#include "prims/jvmtiRedefineClasses.hpp"
@@ -551,41 +552,35 @@ jvmtiError VM_RedefineClasses::compare_and_normalize_class_versions(
// Check if the number, names, types and order of fields declared in these classes
// are the same.
- typeArrayOop k_old_fields = the_class->fields();
- typeArrayOop k_new_fields = scratch_class->fields();
- int n_fields = k_old_fields->length();
- if (n_fields != k_new_fields->length()) {
- return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
- }
-
- for (i = 0; i < n_fields; i += instanceKlass::next_offset) {
+ JavaFieldStream old_fs(the_class);
+ JavaFieldStream new_fs(scratch_class);
+ for (; !old_fs.done() && !new_fs.done(); old_fs.next(), new_fs.next()) {
// access
- old_flags = k_old_fields->ushort_at(i + instanceKlass::access_flags_offset);
- new_flags = k_new_fields->ushort_at(i + instanceKlass::access_flags_offset);
+ old_flags = old_fs.access_flags().as_short();
+ new_flags = new_fs.access_flags().as_short();
if ((old_flags ^ new_flags) & JVM_RECOGNIZED_FIELD_MODIFIERS) {
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
}
// offset
- if (k_old_fields->short_at(i + instanceKlass::low_offset) !=
- k_new_fields->short_at(i + instanceKlass::low_offset) ||
- k_old_fields->short_at(i + instanceKlass::high_offset) !=
- k_new_fields->short_at(i + instanceKlass::high_offset)) {
+ if (old_fs.offset() != new_fs.offset()) {
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
}
// name and signature
- jshort name_index = k_old_fields->short_at(i + instanceKlass::name_index_offset);
- jshort sig_index = k_old_fields->short_at(i +instanceKlass::signature_index_offset);
- Symbol* name_sym1 = the_class->constants()->symbol_at(name_index);
- Symbol* sig_sym1 = the_class->constants()->symbol_at(sig_index);
- name_index = k_new_fields->short_at(i + instanceKlass::name_index_offset);
- sig_index = k_new_fields->short_at(i + instanceKlass::signature_index_offset);
- Symbol* name_sym2 = scratch_class->constants()->symbol_at(name_index);
- Symbol* sig_sym2 = scratch_class->constants()->symbol_at(sig_index);
+ Symbol* name_sym1 = the_class->constants()->symbol_at(old_fs.name_index());
+ Symbol* sig_sym1 = the_class->constants()->symbol_at(old_fs.signature_index());
+ Symbol* name_sym2 = scratch_class->constants()->symbol_at(new_fs.name_index());
+ Symbol* sig_sym2 = scratch_class->constants()->symbol_at(new_fs.signature_index());
if (name_sym1 != name_sym2 || sig_sym1 != sig_sym2) {
return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
}
}
+ // If both streams aren't done then we have a differing number of
+ // fields.
+ if (!old_fs.done() || !new_fs.done()) {
+ return JVMTI_ERROR_UNSUPPORTED_REDEFINITION_SCHEMA_CHANGED;
+ }
+
// Do a parallel walk through the old and new methods. Detect
// cases where they match (exist in both), have been added in
// the new methods, or have been deleted (exist only in the
@@ -2369,38 +2364,34 @@ void VM_RedefineClasses::set_new_constant_pool(
int i; // for portability
// update each field in klass to use new constant pool indices as needed
- typeArrayHandle fields(THREAD, scratch_class->fields());
- int n_fields = fields->length();
- for (i = 0; i < n_fields; i += instanceKlass::next_offset) {
- jshort cur_index = fields->short_at(i + instanceKlass::name_index_offset);
+ for (JavaFieldStream fs(scratch_class); !fs.done(); fs.next()) {
+ jshort cur_index = fs.name_index();
jshort new_index = find_new_index(cur_index);
if (new_index != 0) {
RC_TRACE_WITH_THREAD(0x00080000, THREAD,
("field-name_index change: %d to %d", cur_index, new_index));
- fields->short_at_put(i + instanceKlass::name_index_offset, new_index);
+ fs.set_name_index(new_index);
}
- cur_index = fields->short_at(i + instanceKlass::signature_index_offset);
+ cur_index = fs.signature_index();
new_index = find_new_index(cur_index);
if (new_index != 0) {
RC_TRACE_WITH_THREAD(0x00080000, THREAD,
("field-signature_index change: %d to %d", cur_index, new_index));
- fields->short_at_put(i + instanceKlass::signature_index_offset,
- new_index);
+ fs.set_signature_index(new_index);
}
- cur_index = fields->short_at(i + instanceKlass::initval_index_offset);
+ cur_index = fs.initval_index();
new_index = find_new_index(cur_index);
if (new_index != 0) {
RC_TRACE_WITH_THREAD(0x00080000, THREAD,
("field-initval_index change: %d to %d", cur_index, new_index));
- fields->short_at_put(i + instanceKlass::initval_index_offset, new_index);
+ fs.set_initval_index(new_index);
}
- cur_index = fields->short_at(i + instanceKlass::generic_signature_offset);
+ cur_index = fs.generic_signature_index();
new_index = find_new_index(cur_index);
if (new_index != 0) {
RC_TRACE_WITH_THREAD(0x00080000, THREAD,
("field-generic_signature change: %d to %d", cur_index, new_index));
- fields->short_at_put(i + instanceKlass::generic_signature_offset,
- new_index);
+ fs.set_generic_signature_index(new_index);
}
} // end for each field
diff --git a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
index a7caebe..650db65 100644
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp
@@ -1647,6 +1647,7 @@ class ObjectMarker : AllStatic {
// saved headers
static GrowableArray<oop>* _saved_oop_stack;
static GrowableArray<markOop>* _saved_mark_stack;
+ static bool _needs_reset; // do we need to reset mark bits?
public:
static void init(); // initialize
@@ -1654,10 +1655,14 @@ class ObjectMarker : AllStatic {
static inline void mark(oop o); // mark an object
static inline bool visited(oop o); // check if object has been visited
+
+ static inline bool needs_reset() { return _needs_reset; }
+ static inline void set_needs_reset(bool v) { _needs_reset = v; }
};
GrowableArray<oop>* ObjectMarker::_saved_oop_stack = NULL;
GrowableArray<markOop>* ObjectMarker::_saved_mark_stack = NULL;
+bool ObjectMarker::_needs_reset = true; // need to reset mark bits by default
// initialize ObjectMarker - prepares for object marking
void ObjectMarker::init() {
@@ -1680,7 +1685,13 @@ void ObjectMarker::done() {
// iterate over all objects and restore the mark bits to
// their initial value
RestoreMarksClosure blk;
- Universe::heap()->object_iterate(&blk);
+ if (needs_reset()) {
+ Universe::heap()->object_iterate(&blk);
+ } else {
+ // We don't need to reset mark bits on this call, but reset the
+ // flag to the default for the next call.
+ set_needs_reset(true);
+ }
// When sharing is enabled we need to restore the headers of the objects
// in the readwrite space too.
@@ -3023,7 +3034,8 @@ inline bool VM_HeapWalkOperation::iterate_over_object(oop o) {
}
-// collects all simple (non-stack) roots.
+// Collects all simple (non-stack) roots except for threads;
+// threads are handled in collect_stack_roots() as an optimization.
// if there's a heap root callback provided then the callback is
// invoked for each simple root.
// if an object reference callback is provided then all simple
@@ -3054,16 +3066,7 @@ inline bool VM_HeapWalkOperation::collect_simple_roots() {
return false;
}
- // Threads
- for (JavaThread* thread = Threads::first(); thread != NULL ; thread = thread->next()) {
- oop threadObj = thread->threadObj();
- if (threadObj != NULL && !thread->is_exiting() && !thread->is_hidden_from_external_view()) {
- bool cont = CallbackInvoker::report_simple_root(JVMTI_HEAP_REFERENCE_THREAD, threadObj);
- if (!cont) {
- return false;
- }
- }
- }
+ // threads are now handled in collect_stack_roots()
// Other kinds of roots maintained by HotSpot
// Many of these won't be visible but others (such as instances of important
@@ -3175,13 +3178,20 @@ inline bool VM_HeapWalkOperation::collect_stack_roots(JavaThread* java_thread,
}
-// collects all stack roots - for each thread it walks the execution
+// Collects the simple roots for all threads and collects all
+// stack roots - for each thread it walks the execution
// stack to find all references and local JNI refs.
inline bool VM_HeapWalkOperation::collect_stack_roots() {
JNILocalRootsClosure blk;
for (JavaThread* thread = Threads::first(); thread != NULL ; thread = thread->next()) {
oop threadObj = thread->threadObj();
if (threadObj != NULL && !thread->is_exiting() && !thread->is_hidden_from_external_view()) {
+ // Collect the simple root for this thread before we
+ // collect its stack roots
+ if (!CallbackInvoker::report_simple_root(JVMTI_HEAP_REFERENCE_THREAD,
+ threadObj)) {
+ return false;
+ }
if (!collect_stack_roots(thread, &blk)) {
return false;
}
@@ -3235,8 +3245,20 @@ void VM_HeapWalkOperation::doit() {
// the heap walk starts with an initial object or the heap roots
if (initial_object().is_null()) {
- if (!collect_simple_roots()) return;
+ // If either collect_stack_roots() or collect_simple_roots()
+ // returns false at this point, then there are no mark bits
+ // to reset.
+ ObjectMarker::set_needs_reset(false);
+
+ // Calling collect_stack_roots() before collect_simple_roots()
+ // can result in a big performance boost for an agent that is
+ // focused on analyzing references in the thread stacks.
if (!collect_stack_roots()) return;
+
+ if (!collect_simple_roots()) return;
+
+ // no early return so enable heap traversal to reset the mark bits
+ ObjectMarker::set_needs_reset(true);
} else {
visit_stack()->push(initial_object()());
}
diff --git a/hotspot/src/share/vm/prims/methodHandleWalk.cpp b/hotspot/src/share/vm/prims/methodHandleWalk.cpp
index 504b900..3f31307 100644
--- a/hotspot/src/share/vm/prims/methodHandleWalk.cpp
+++ b/hotspot/src/share/vm/prims/methodHandleWalk.cpp
@@ -182,10 +182,6 @@ void MethodHandleChain::print(oopDesc* m) {
HandleMark hm;
ResourceMark rm;
Handle mh(m);
- print(mh);
-}
-
-void MethodHandleChain::print(Handle mh) {
EXCEPTION_MARK;
MethodHandleChain mhc(mh, THREAD);
if (HAS_PENDING_EXCEPTION) {
@@ -222,16 +218,33 @@ void MethodHandleChain::print_impl(TRAPS) {
if (o != NULL) {
if (o->is_instance()) {
tty->print(" instance %s", o->klass()->klass_part()->internal_name());
+ if (java_lang_invoke_CountingMethodHandle::is_instance(o)) {
+ tty->print(" vmcount: %d", java_lang_invoke_CountingMethodHandle::vmcount(o));
+ }
} else {
o->print();
}
}
+ oop vmt = chain.vmtarget_oop();
+ if (vmt != NULL) {
+ if (vmt->is_method()) {
+ tty->print(" ");
+ methodOop(vmt)->print_short_name(tty);
+ } else if (java_lang_invoke_MethodHandle::is_instance(vmt)) {
+ tty->print(" method handle " INTPTR_FORMAT, vmt);
+ } else {
+ ShouldNotReachHere();
+ }
+ }
} else if (chain.is_adapter()) {
tty->print("adapter: arg_slot %d conversion op %s",
chain.adapter_arg_slot(),
adapter_op_to_string(chain.adapter_conversion_op()));
switch (chain.adapter_conversion_op()) {
case java_lang_invoke_AdapterMethodHandle::OP_RETYPE_ONLY:
+ if (java_lang_invoke_CountingMethodHandle::is_instance(chain.method_handle_oop())) {
+ tty->print(" vmcount: %d", java_lang_invoke_CountingMethodHandle::vmcount(chain.method_handle_oop()));
+ }
case java_lang_invoke_AdapterMethodHandle::OP_RETYPE_RAW:
case java_lang_invoke_AdapterMethodHandle::OP_CHECK_CAST:
case java_lang_invoke_AdapterMethodHandle::OP_PRIM_TO_PRIM:
@@ -907,7 +920,10 @@ MethodHandleCompiler::MethodHandleCompiler(Handle root, Symbol* name, Symbol* si
_non_bcp_klasses(THREAD, 5),
_cur_stack(0),
_max_stack(0),
- _rtype(T_ILLEGAL)
+ _rtype(T_ILLEGAL),
+ _selectAlternative_bci(-1),
+ _taken_count(0),
+ _not_taken_count(0)
{
// Element zero is always the null constant.
@@ -1115,11 +1131,50 @@ void MethodHandleCompiler::emit_bc(Bytecodes::Code op, int index, int args_size)
_bytecode.push(0);
break;
+ case Bytecodes::_ifeq:
+ assert((unsigned short) index == index, "index does not fit in 16-bit");
+ _bytecode.push(op);
+ _bytecode.push(index >> 8);
+ _bytecode.push(index);
+ break;
+
default:
ShouldNotReachHere();
}
}
+void MethodHandleCompiler::update_branch_dest(int src, int dst) {
+ switch (_bytecode.at(src)) {
+ case Bytecodes::_ifeq:
+ dst -= src; // compute the offset
+ assert((unsigned short) dst == dst, "index does not fit in 16-bit");
+ _bytecode.at_put(src + 1, dst >> 8);
+ _bytecode.at_put(src + 2, dst);
+ break;
+ default:
+ ShouldNotReachHere();
+ }
+}
+
+void MethodHandleCompiler::emit_load(ArgToken arg) {
+ TokenType tt = arg.token_type();
+ BasicType bt = arg.basic_type();
+
+ switch (tt) {
+ case tt_parameter:
+ case tt_temporary:
+ emit_load(bt, arg.index());
+ break;
+ case tt_constant:
+ emit_load_constant(arg);
+ break;
+ case tt_illegal:
+ case tt_void:
+ default:
+ ShouldNotReachHere();
+ }
+}
+
void MethodHandleCompiler::emit_load(BasicType bt, int index) {
if (index <= 3) {
@@ -1318,6 +1373,29 @@ MethodHandleCompiler::make_conversion(BasicType type, klassOop tk, Bytecodes::Co
jvalue MethodHandleCompiler::zero_jvalue = { 0 };
jvalue MethodHandleCompiler::one_jvalue = { 1 };
+// Fetch any values from CountingMethodHandles and capture them for profiles
+bool MethodHandleCompiler::fetch_counts(ArgToken arg1, ArgToken arg2) {
+ int count1 = -1, count2 = -1;
+ if (arg1.token_type() == tt_constant && arg1.basic_type() == T_OBJECT &&
+ java_lang_invoke_CountingMethodHandle::is_instance(arg1.object()())) {
+ count1 = java_lang_invoke_CountingMethodHandle::vmcount(arg1.object()());
+ }
+ if (arg2.token_type() == tt_constant && arg2.basic_type() == T_OBJECT &&
+ java_lang_invoke_CountingMethodHandle::is_instance(arg2.object()())) {
+ count2 = java_lang_invoke_CountingMethodHandle::vmcount(arg2.object()());
+ }
+ int total = count1 + count2;
+ if (count1 != -1 && count2 != -1 && total != 0) {
+ // Normalize the collect counts to the invoke_count
+ tty->print("counts %d %d scaled by %d = ", count2, count1, _invoke_count);
+ if (count1 != 0) _not_taken_count = (int)(_invoke_count * count1 / (double)total);
+ if (count2 != 0) _taken_count = (int)(_invoke_count * count2 / (double)total);
+ tty->print_cr("%d %d", _taken_count, _not_taken_count);
+ return true;
+ }
+ return false;
+}
+
// Emit bytecodes for the given invoke instruction.
MethodHandleWalker::ArgToken
MethodHandleCompiler::make_invoke(methodHandle m, vmIntrinsics::ID iid,
@@ -1367,6 +1445,29 @@ MethodHandleCompiler::make_invoke(methodHandle m, vmIntrinsics::ID iid,
}
}
+ if (m->intrinsic_id() == vmIntrinsics::_selectAlternative &&
+ fetch_counts(argv[1], argv[2])) {
+ assert(argc == 3, "three arguments");
+ assert(tailcall, "only");
+
+ // do inline bytecodes so we can drop profile data into it,
+ // 0: iload_0
+ emit_load(argv[0]);
+ // 1: ifeq 8
+ _selectAlternative_bci = _bytecode.length();
+ emit_bc(Bytecodes::_ifeq, 0); // emit placeholder offset
+ // 4: aload_1
+ emit_load(argv[1]);
+ // 5: areturn;
+ emit_bc(Bytecodes::_areturn);
+ // 8: aload_2
+ update_branch_dest(_selectAlternative_bci, cur_bci());
+ emit_load(argv[2]);
+ // 9: areturn
+ emit_bc(Bytecodes::_areturn);
+ return ArgToken(); // Dummy return value.
+ }
+
check_non_bcp_klass(klass, CHECK_(zero));
if (m->is_method_handle_invoke()) {
check_non_bcp_klasses(m->method_handle_type(), CHECK_(zero));
@@ -1377,10 +1478,6 @@ MethodHandleCompiler::make_invoke(methodHandle m, vmIntrinsics::ID iid,
assert(argc == asc.size() + ((op == Bytecodes::_invokestatic || op == Bytecodes::_invokedynamic) ? 0 : 1),
"argc mismatch");
- // Inline the method.
- InvocationCounter* ic = m->invocation_counter();
- ic->set_carry_flag();
-
for (int i = 0; i < argc; i++) {
ArgToken arg = argv[i];
TokenType tt = arg.token_type();
@@ -1686,7 +1783,7 @@ constantPoolHandle MethodHandleCompiler::get_constant_pool(TRAPS) const {
}
-methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const {
+methodHandle MethodHandleCompiler::get_method_oop(TRAPS) {
methodHandle empty;
// Create a method that holds the generated bytecode. invokedynamic
// has no receiver, normal MH calls do.
@@ -1765,6 +1862,7 @@ methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const {
assert(m->method_data() == NULL, "there should not be an MDO yet");
m->set_method_data(mdo);
+ bool found_selectAlternative = false;
// Iterate over all profile data and set the count of the counter
// data entries to the original call site counter.
for (ProfileData* profile_data = mdo->first_data();
@@ -1774,7 +1872,15 @@ methodHandle MethodHandleCompiler::get_method_oop(TRAPS) const {
CounterData* counter_data = profile_data->as_CounterData();
counter_data->set_count(_invoke_count);
}
+ if (profile_data->is_BranchData() &&
+ profile_data->bci() == _selectAlternative_bci) {
+ BranchData* bd = profile_data->as_BranchData();
+ bd->set_taken(_taken_count);
+ bd->set_not_taken(_not_taken_count);
+ found_selectAlternative = true;
+ }
}
+ assert(_selectAlternative_bci == -1 || found_selectAlternative, "must have found profile entry");
}
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/prims/methodHandleWalk.hpp b/hotspot/src/share/vm/prims/methodHandleWalk.hpp
index 783b55b..8697c0b 100644
--- a/hotspot/src/share/vm/prims/methodHandleWalk.hpp
+++ b/hotspot/src/share/vm/prims/methodHandleWalk.hpp
@@ -74,6 +74,7 @@ public:
set_method_handle(MethodHandle_vmtarget_oop(), THREAD);
}
+ Handle root() { return _root; }
Handle method_handle() { return _method_handle; }
oop method_handle_oop() { return _method_handle(); }
oop method_type_oop() { return MethodHandle_type_oop(); }
@@ -110,7 +111,6 @@ public:
// the signature for each method. The signatures are printed in
// slot order to make it easier to understand.
void print();
- static void print(Handle mh);
static void print(oopDesc* mh);
#endif
};
@@ -277,6 +277,10 @@ private:
KlassHandle _target_klass;
Thread* _thread;
+ int _selectAlternative_bci; // These are used for capturing profiles from GWTs
+ int _taken_count;
+ int _not_taken_count;
+
// Values used by the compiler.
static jvalue zero_jvalue;
static jvalue one_jvalue;
@@ -372,6 +376,7 @@ private:
unsigned char* bytecode() const { return _bytecode.adr_at(0); }
int bytecode_length() const { return _bytecode.length(); }
+ int cur_bci() const { return _bytecode.length(); }
// Fake constant pool.
int cpool_oop_put(int tag, Handle con) {
@@ -436,6 +441,8 @@ private:
}
void emit_bc(Bytecodes::Code op, int index = 0, int args_size = -1);
+ void update_branch_dest(int src, int dst);
+ void emit_load(ArgToken arg);
void emit_load(BasicType bt, int index);
void emit_store(BasicType bt, int index);
void emit_load_constant(ArgToken arg);
@@ -455,11 +462,14 @@ private:
virtual ArgToken make_fetch(BasicType type, klassOop tk, Bytecodes::Code op, const ArgToken& base, const ArgToken& offset, TRAPS);
virtual ArgToken make_invoke(methodHandle m, vmIntrinsics::ID iid, Bytecodes::Code op, bool tailcall, int argc, ArgToken* argv, TRAPS);
+ // Check for profiling information on a GWT and return true if it's found
+ bool fetch_counts(ArgToken a1, ArgToken a2);
+
// Get a real constant pool.
constantPoolHandle get_constant_pool(TRAPS) const;
// Get a real methodOop.
- methodHandle get_method_oop(TRAPS) const;
+ methodHandle get_method_oop(TRAPS);
public:
MethodHandleCompiler(Handle root, Symbol* name, Symbol* signature, int invoke_count, bool for_invokedynamic, TRAPS);
diff --git a/hotspot/src/share/vm/prims/methodHandles.cpp b/hotspot/src/share/vm/prims/methodHandles.cpp
index 6dc40a3..c5d5c88 100644
--- a/hotspot/src/share/vm/prims/methodHandles.cpp
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp
@@ -158,6 +158,8 @@ const char* MethodHandles::_entry_names[_EK_LIMIT+1] = {
"adapter_fold/4/ref",
"adapter_fold/5/ref",
+ "adapter_opt_profiling",
+
NULL
};
@@ -518,7 +520,7 @@ void MethodHandles::init_MemberName(oop mname_oop, oop target_oop) {
int slot = java_lang_reflect_Field::slot(target_oop); // fd.index()
int mods = java_lang_reflect_Field::modifiers(target_oop);
klassOop k = java_lang_Class::as_klassOop(clazz);
- int offset = instanceKlass::cast(k)->offset_from_fields(slot);
+ int offset = instanceKlass::cast(k)->field_offset(slot);
init_MemberName(mname_oop, k, accessFlags_from(mods), offset);
} else {
KlassHandle receiver_limit; int decode_flags = 0;
@@ -1016,7 +1018,7 @@ oop MethodHandles::encode_target(Handle mh, int format, TRAPS) {
&& CompilationPolicy::can_be_compiled(m)) {
// Force compilation
CompileBroker::compile_method(m, InvocationEntryBci,
- CompLevel_initial_compile,
+ CompilationPolicy::policy()->initial_compile_level(),
methodHandle(), 0, "MethodHandleNatives.getTarget",
CHECK_NULL);
}
@@ -1630,8 +1632,6 @@ void MethodHandles::init_DirectMethodHandle(Handle mh, methodHandle m, bool do_d
THROW(vmSymbols::java_lang_InternalError());
}
- java_lang_invoke_MethodHandle::init_vmslots(mh());
-
if (VerifyMethodHandles) {
// The privileged code which invokes this routine should not make
// a mistake about types, but it's better to verify.
@@ -1754,7 +1754,6 @@ void MethodHandles::init_BoundMethodHandle_with_receiver(Handle mh,
if (m.is_null()) { THROW(vmSymbols::java_lang_InternalError()); }
if (m->is_abstract()) { THROW(vmSymbols::java_lang_AbstractMethodError()); }
- java_lang_invoke_MethodHandle::init_vmslots(mh());
int vmargslot = m->size_of_parameters() - 1;
assert(java_lang_invoke_BoundMethodHandle::vmargslot(mh()) == vmargslot, "");
@@ -1860,7 +1859,6 @@ void MethodHandles::init_BoundMethodHandle(Handle mh, Handle target, int argnum,
THROW(vmSymbols::java_lang_InternalError());
}
- java_lang_invoke_MethodHandle::init_vmslots(mh());
int argslot = java_lang_invoke_BoundMethodHandle::vmargslot(mh());
if (VerifyMethodHandles) {
@@ -2653,6 +2651,11 @@ void MethodHandles::init_AdapterMethodHandle(Handle mh, Handle target, int argnu
// Finalize the conversion field. (Note that it is final to Java code.)
java_lang_invoke_AdapterMethodHandle::set_conversion(mh(), new_conversion);
+ if (java_lang_invoke_CountingMethodHandle::is_instance(mh())) {
+ assert(ek_orig == _adapter_retype_only, "only one handled");
+ ek_opt = _adapter_opt_profiling;
+ }
+
// Done!
java_lang_invoke_MethodHandle::set_vmentry(mh(), entry(ek_opt));
@@ -2679,6 +2682,7 @@ void MethodHandles::ensure_vmlayout_field(Handle target, TRAPS) {
java_lang_invoke_MethodTypeForm::init_vmlayout(mtform(), cookie);
}
}
+ assert(java_lang_invoke_MethodTypeForm::vmslots(mtform()) == argument_slot_count(mtype()), "must agree");
}
#ifdef ASSERT
@@ -2713,7 +2717,7 @@ static void stress_method_handle_walk_impl(Handle mh, TRAPS) {
&& CompilationPolicy::can_be_compiled(m)) {
// Force compilation
CompileBroker::compile_method(m, InvocationEntryBci,
- CompLevel_initial_compile,
+ CompilationPolicy::policy()->initial_compile_level(),
methodHandle(), 0, "StressMethodHandleWalk",
CHECK);
}
@@ -2905,8 +2909,12 @@ JVM_ENTRY(jint, MHN_getConstant(JNIEnv *env, jobject igcls, jint which)) {
return MethodHandles::stack_move_unit();
case MethodHandles::GC_CONV_OP_IMPLEMENTED_MASK:
return MethodHandles::adapter_conversion_ops_supported_mask();
- case MethodHandles::GC_OP_ROT_ARGS_DOWN_LIMIT_BIAS:
- return MethodHandles::OP_ROT_ARGS_DOWN_LIMIT_BIAS;
+ case MethodHandles::GC_COUNT_GWT:
+#ifdef COMPILER2
+ return true;
+#else
+ return false;
+#endif
}
return 0;
}
@@ -3070,6 +3078,30 @@ JVM_ENTRY(jint, MHN_getMembers(JNIEnv *env, jobject igcls,
}
JVM_END
+JVM_ENTRY(void, MHN_setCallSiteTargetNormal(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) {
+ oop call_site = JNIHandles::resolve_non_null(call_site_jh);
+ oop target = JNIHandles::resolve(target_jh);
+ {
+ // Walk all nmethods depending on this call site.
+ MutexLocker mu(Compile_lock, thread);
+ Universe::flush_dependents_on(call_site, target);
+ }
+ java_lang_invoke_CallSite::set_target(call_site, target);
+}
+JVM_END
+
+JVM_ENTRY(void, MHN_setCallSiteTargetVolatile(JNIEnv* env, jobject igcls, jobject call_site_jh, jobject target_jh)) {
+ oop call_site = JNIHandles::resolve_non_null(call_site_jh);
+ oop target = JNIHandles::resolve(target_jh);
+ {
+ // Walk all nmethods depending on this call site.
+ MutexLocker mu(Compile_lock, thread);
+ Universe::flush_dependents_on(call_site, target);
+ }
+ java_lang_invoke_CallSite::set_target_volatile(call_site, target);
+}
+JVM_END
+
methodOop MethodHandles::resolve_raise_exception_method(TRAPS) {
if (_raise_exception_method != NULL) {
// no need to do it twice
@@ -3126,12 +3158,15 @@ JVM_END
/// JVM_RegisterMethodHandleMethods
+#undef CS // Solaris builds complain
+
#define LANG "Ljava/lang/"
#define JLINV "Ljava/lang/invoke/"
#define OBJ LANG"Object;"
#define CLS LANG"Class;"
#define STRG LANG"String;"
+#define CS JLINV"CallSite;"
#define MT JLINV"MethodType;"
#define MH JLINV"MethodHandle;"
#define MEM JLINV"MemberName;"
@@ -3142,29 +3177,34 @@ JVM_END
#define CC (char*) /*cast a literal from (const char*)*/
#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
-// These are the native methods on sun.invoke.MethodHandleNatives.
+// These are the native methods on java.lang.invoke.MethodHandleNatives.
static JNINativeMethod methods[] = {
// void init(MemberName self, AccessibleObject ref)
- {CC"init", CC"("AMH""MH"I)V", FN_PTR(MHN_init_AMH)},
- {CC"init", CC"("BMH""OBJ"I)V", FN_PTR(MHN_init_BMH)},
- {CC"init", CC"("DMH""OBJ"Z"CLS")V", FN_PTR(MHN_init_DMH)},
- {CC"init", CC"("MT")V", FN_PTR(MHN_init_MT)},
- {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)},
- {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)},
- {CC"resolve", CC"("MEM""CLS")V", FN_PTR(MHN_resolve_Mem)},
- {CC"getTarget", CC"("MH"I)"OBJ, FN_PTR(MHN_getTarget)},
- {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)},
+ {CC"init", CC"("AMH""MH"I)V", FN_PTR(MHN_init_AMH)},
+ {CC"init", CC"("BMH""OBJ"I)V", FN_PTR(MHN_init_BMH)},
+ {CC"init", CC"("DMH""OBJ"Z"CLS")V", FN_PTR(MHN_init_DMH)},
+ {CC"init", CC"("MT")V", FN_PTR(MHN_init_MT)},
+ {CC"init", CC"("MEM""OBJ")V", FN_PTR(MHN_init_Mem)},
+ {CC"expand", CC"("MEM")V", FN_PTR(MHN_expand_Mem)},
+ {CC"resolve", CC"("MEM""CLS")V", FN_PTR(MHN_resolve_Mem)},
+ {CC"getTarget", CC"("MH"I)"OBJ, FN_PTR(MHN_getTarget)},
+ {CC"getConstant", CC"(I)I", FN_PTR(MHN_getConstant)},
// static native int getNamedCon(int which, Object[] name)
- {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)},
+ {CC"getNamedCon", CC"(I["OBJ")I", FN_PTR(MHN_getNamedCon)},
// static native int getMembers(Class<?> defc, String matchName, String matchSig,
// int matchFlags, Class<?> caller, int skip, MemberName[] results);
- {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)}
+ {CC"getMembers", CC"("CLS""STRG""STRG"I"CLS"I["MEM")I", FN_PTR(MHN_getMembers)}
+};
+
+static JNINativeMethod call_site_methods[] = {
+ {CC"setCallSiteTargetNormal", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetNormal)},
+ {CC"setCallSiteTargetVolatile", CC"("CS""MH")V", FN_PTR(MHN_setCallSiteTargetVolatile)}
};
static JNINativeMethod invoke_methods[] = {
// void init(MemberName self, AccessibleObject ref)
- {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
- {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
+ {CC"invoke", CC"(["OBJ")"OBJ, FN_PTR(MH_invoke_UOE)},
+ {CC"invokeExact", CC"(["OBJ")"OBJ, FN_PTR(MH_invokeExact_UOE)}
};
// This one function is exported, used by NativeLookup.
@@ -3177,11 +3217,11 @@ JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class))
return; // bind nothing
}
+ assert(!MethodHandles::enabled(), "must not be enabled");
bool enable_MH = true;
{
ThreadToNativeFromVM ttnfv(thread);
-
int status = env->RegisterNatives(MHN_class, methods, sizeof(methods)/sizeof(JNINativeMethod));
if (!env->ExceptionOccurred()) {
const char* L_MH_name = (JLINV "MethodHandle");
@@ -3190,11 +3230,16 @@ JVM_ENTRY(void, JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass MHN_class))
status = env->RegisterNatives(MH_class, invoke_methods, sizeof(invoke_methods)/sizeof(JNINativeMethod));
}
if (env->ExceptionOccurred()) {
- MethodHandles::set_enabled(false);
warning("JSR 292 method handle code is mismatched to this JVM. Disabling support.");
enable_MH = false;
env->ExceptionClear();
}
+
+ status = env->RegisterNatives(MHN_class, call_site_methods, sizeof(call_site_methods)/sizeof(JNINativeMethod));
+ if (env->ExceptionOccurred()) {
+ // Exception is okay until 7087357
+ env->ExceptionClear();
+ }
}
if (enable_MH) {
diff --git a/hotspot/src/share/vm/prims/methodHandles.hpp b/hotspot/src/share/vm/prims/methodHandles.hpp
index dbf6416..f1c44ba 100644
--- a/hotspot/src/share/vm/prims/methodHandles.hpp
+++ b/hotspot/src/share/vm/prims/methodHandles.hpp
@@ -187,6 +187,8 @@ class MethodHandles: AllStatic {
_adapter_opt_fold_FIRST = _adapter_opt_fold_ref,
_adapter_opt_fold_LAST = _adapter_opt_fold_5_ref,
+ _adapter_opt_profiling,
+
_EK_LIMIT,
_EK_FIRST = 0
};
@@ -266,6 +268,8 @@ class MethodHandles: AllStatic {
return _adapter_fold_args;
if (ek >= _adapter_opt_return_FIRST && ek <= _adapter_opt_return_LAST)
return _adapter_opt_return_any;
+ if (ek == _adapter_opt_profiling)
+ return _adapter_retype_only;
assert(false, "oob");
return _EK_LIMIT;
}
@@ -511,11 +515,12 @@ class MethodHandles: AllStatic {
}
// Here is the transformation the i2i adapter must perform:
static int truncate_subword_from_vminfo(jint value, int vminfo) {
- jint tem = value << vminfo;
+ int shift = vminfo & ~CONV_VMINFO_SIGN_FLAG;
+ jint tem = value << shift;
if ((vminfo & CONV_VMINFO_SIGN_FLAG) != 0) {
- return (jint)tem >> vminfo;
+ return (jint)tem >> shift;
} else {
- return (juint)tem >> vminfo;
+ return (juint)tem >> shift;
}
}
@@ -582,6 +587,7 @@ class MethodHandles: AllStatic {
GC_JVM_STACK_MOVE_UNIT = 1,
GC_CONV_OP_IMPLEMENTED_MASK = 2,
GC_OP_ROT_ARGS_DOWN_LIMIT_BIAS = 3,
+ GC_COUNT_GWT = 4,
// format of result from getTarget / encode_target:
ETF_HANDLE_OR_METHOD_NAME = 0, // all available data (immediate MH or method)
diff --git a/hotspot/src/share/vm/prims/nativeLookup.cpp b/hotspot/src/share/vm/prims/nativeLookup.cpp
index af62593..874c54d 100644
--- a/hotspot/src/share/vm/prims/nativeLookup.cpp
+++ b/hotspot/src/share/vm/prims/nativeLookup.cpp
@@ -49,6 +49,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
static void mangle_name_on(outputStream* st, Symbol* name, int begin, int end) {
diff --git a/hotspot/src/share/vm/prims/unsafe.cpp b/hotspot/src/share/vm/prims/unsafe.cpp
index e1a21f0..48d13db 100644
--- a/hotspot/src/share/vm/prims/unsafe.cpp
+++ b/hotspot/src/share/vm/prims/unsafe.cpp
@@ -33,7 +33,6 @@
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/reflection.hpp"
-#include "runtime/reflectionCompat.hpp"
#include "runtime/synchronizer.hpp"
#include "services/threadService.hpp"
#include "utilities/copy.hpp"
@@ -303,6 +302,19 @@ UNSAFE_ENTRY(void, Unsafe_SetObjectVolatile(JNIEnv *env, jobject unsafe, jobject
UnsafeWrapper("Unsafe_SetObjectVolatile");
oop x = JNIHandles::resolve(x_h);
oop p = JNIHandles::resolve(obj);
+ // Catch VolatileCallSite.target stores (via
+ // CallSite.setTargetVolatile) and check call site dependencies.
+ if ((offset == java_lang_invoke_CallSite::target_offset_in_bytes()) && p->is_a(SystemDictionary::CallSite_klass())) {
+ oop call_site = p;
+ oop method_handle = x;
+ assert(call_site ->is_a(SystemDictionary::CallSite_klass()), "must be");
+ assert(method_handle->is_a(SystemDictionary::MethodHandle_klass()), "must be");
+ {
+ // Walk all nmethods depending on this call site.
+ MutexLocker mu(Compile_lock, thread);
+ Universe::flush_dependents_on(call_site, method_handle);
+ }
+ }
void* addr = index_oop_from_field_offset_long(p, offset);
OrderAccess::release();
if (UseCompressedOops) {
@@ -707,7 +719,7 @@ jint find_field_offset(jobject field, int must_be_static, TRAPS) {
}
}
- int offset = instanceKlass::cast(k)->offset_from_fields(slot);
+ int offset = instanceKlass::cast(k)->field_offset(slot);
return field_offset_from_byte_offset(offset);
}
diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
index 550d84d..758bf5c 100644
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.cpp
@@ -189,7 +189,8 @@ CompileTask* AdvancedThresholdPolicy::select_task(CompileQueue* compile_queue) {
task = next_task;
}
- if (max_task->comp_level() == CompLevel_full_profile && is_method_profiled(max_method)) {
+ if (max_task->comp_level() == CompLevel_full_profile && TieredStopAtLevel > CompLevel_full_profile
+ && is_method_profiled(max_method)) {
max_task->set_comp_level(CompLevel_limited_profile);
if (PrintTieredEvents) {
print_event(UPDATE_IN_QUEUE, max_method, max_method, max_task->osr_bci(), (CompLevel)max_task->comp_level());
@@ -321,77 +322,79 @@ void AdvancedThresholdPolicy::create_mdo(methodHandle mh, TRAPS) {
*/
// Common transition function. Given a predicate determines if a method should transition to another level.
-CompLevel AdvancedThresholdPolicy::common(Predicate p, methodOop method, CompLevel cur_level) {
- if (is_trivial(method)) return CompLevel_simple;
-
+CompLevel AdvancedThresholdPolicy::common(Predicate p, methodOop method, CompLevel cur_level, bool disable_feedback) {
CompLevel next_level = cur_level;
int i = method->invocation_count();
int b = method->backedge_count();
- switch(cur_level) {
- case CompLevel_none:
- // If we were at full profile level, would we switch to full opt?
- if (common(p, method, CompLevel_full_profile) == CompLevel_full_optimization) {
- next_level = CompLevel_full_optimization;
- } else if ((this->*p)(i, b, cur_level)) {
- // C1-generated fully profiled code is about 30% slower than the limited profile
- // code that has only invocation and backedge counters. The observation is that
- // if C2 queue is large enough we can spend too much time in the fully profiled code
- // while waiting for C2 to pick the method from the queue. To alleviate this problem
- // we introduce a feedback on the C2 queue size. If the C2 queue is sufficiently long
- // we choose to compile a limited profiled version and then recompile with full profiling
- // when the load on C2 goes down.
- if (CompileBroker::queue_size(CompLevel_full_optimization) >
- Tier3DelayOn * compiler_count(CompLevel_full_optimization)) {
- next_level = CompLevel_limited_profile;
- } else {
- next_level = CompLevel_full_profile;
+ if (is_trivial(method)) {
+ next_level = CompLevel_simple;
+ } else {
+ switch(cur_level) {
+ case CompLevel_none:
+ // If we were at full profile level, would we switch to full opt?
+ if (common(p, method, CompLevel_full_profile, disable_feedback) == CompLevel_full_optimization) {
+ next_level = CompLevel_full_optimization;
+ } else if ((this->*p)(i, b, cur_level)) {
+ // C1-generated fully profiled code is about 30% slower than the limited profile
+ // code that has only invocation and backedge counters. The observation is that
+ // if C2 queue is large enough we can spend too much time in the fully profiled code
+ // while waiting for C2 to pick the method from the queue. To alleviate this problem
+ // we introduce a feedback on the C2 queue size. If the C2 queue is sufficiently long
+ // we choose to compile a limited profiled version and then recompile with full profiling
+ // when the load on C2 goes down.
+ if (!disable_feedback && CompileBroker::queue_size(CompLevel_full_optimization) >
+ Tier3DelayOn * compiler_count(CompLevel_full_optimization)) {
+ next_level = CompLevel_limited_profile;
+ } else {
+ next_level = CompLevel_full_profile;
+ }
}
- }
- break;
- case CompLevel_limited_profile:
- if (is_method_profiled(method)) {
- // Special case: we got here because this method was fully profiled in the interpreter.
- next_level = CompLevel_full_optimization;
- } else {
- methodDataOop mdo = method->method_data();
- if (mdo != NULL) {
- if (mdo->would_profile()) {
- if (CompileBroker::queue_size(CompLevel_full_optimization) <=
- Tier3DelayOff * compiler_count(CompLevel_full_optimization) &&
- (this->*p)(i, b, cur_level)) {
- next_level = CompLevel_full_profile;
+ break;
+ case CompLevel_limited_profile:
+ if (is_method_profiled(method)) {
+ // Special case: we got here because this method was fully profiled in the interpreter.
+ next_level = CompLevel_full_optimization;
+ } else {
+ methodDataOop mdo = method->method_data();
+ if (mdo != NULL) {
+ if (mdo->would_profile()) {
+ if (disable_feedback || (CompileBroker::queue_size(CompLevel_full_optimization) <=
+ Tier3DelayOff * compiler_count(CompLevel_full_optimization) &&
+ (this->*p)(i, b, cur_level))) {
+ next_level = CompLevel_full_profile;
+ }
+ } else {
+ next_level = CompLevel_full_optimization;
}
- } else {
- next_level = CompLevel_full_optimization;
}
}
- }
- break;
- case CompLevel_full_profile:
- {
- methodDataOop mdo = method->method_data();
- if (mdo != NULL) {
- if (mdo->would_profile()) {
- int mdo_i = mdo->invocation_count_delta();
- int mdo_b = mdo->backedge_count_delta();
- if ((this->*p)(mdo_i, mdo_b, cur_level)) {
+ break;
+ case CompLevel_full_profile:
+ {
+ methodDataOop mdo = method->method_data();
+ if (mdo != NULL) {
+ if (mdo->would_profile()) {
+ int mdo_i = mdo->invocation_count_delta();
+ int mdo_b = mdo->backedge_count_delta();
+ if ((this->*p)(mdo_i, mdo_b, cur_level)) {
+ next_level = CompLevel_full_optimization;
+ }
+ } else {
next_level = CompLevel_full_optimization;
}
- } else {
- next_level = CompLevel_full_optimization;
}
}
+ break;
}
- break;
}
- return next_level;
+ return MIN2(next_level, (CompLevel)TieredStopAtLevel);
}
// Determine if a method should be compiled with a normal entry point at a different level.
CompLevel AdvancedThresholdPolicy::call_event(methodOop method, CompLevel cur_level) {
CompLevel osr_level = MIN2((CompLevel) method->highest_osr_comp_level(),
- common(&AdvancedThresholdPolicy::loop_predicate, method, cur_level));
+ common(&AdvancedThresholdPolicy::loop_predicate, method, cur_level, true));
CompLevel next_level = common(&AdvancedThresholdPolicy::call_predicate, method, cur_level);
// If OSR method level is greater than the regular method level, the levels should be
@@ -406,13 +409,12 @@ CompLevel AdvancedThresholdPolicy::call_event(methodOop method, CompLevel cur_le
} else {
next_level = MAX2(osr_level, next_level);
}
-
return next_level;
}
// Determine if we should do an OSR compilation of a given method.
CompLevel AdvancedThresholdPolicy::loop_event(methodOop method, CompLevel cur_level) {
- CompLevel next_level = common(&AdvancedThresholdPolicy::loop_predicate, method, cur_level);
+ CompLevel next_level = common(&AdvancedThresholdPolicy::loop_predicate, method, cur_level, true);
if (cur_level == CompLevel_none) {
// If there is a live OSR method that means that we deopted to the interpreter
// for the transition.
@@ -460,22 +462,9 @@ void AdvancedThresholdPolicy::method_back_branch_event(methodHandle mh, methodHa
if (is_compilation_enabled()) {
CompLevel next_osr_level = loop_event(imh(), level);
CompLevel max_osr_level = (CompLevel)imh->highest_osr_comp_level();
- if (next_osr_level == CompLevel_limited_profile) {
- next_osr_level = CompLevel_full_profile; // OSRs are supposed to be for very hot methods.
- }
-
// At the very least compile the OSR version
- if (!CompileBroker::compilation_is_in_queue(imh, bci)) {
- // Check if there's a method like that already
- nmethod* osr_nm = NULL;
- if (max_osr_level >= next_osr_level) {
- // There is an osr method already with the same
- // or greater level, check if it has the bci we need
- osr_nm = imh->lookup_osr_nmethod_for(bci, next_osr_level, false);
- }
- if (osr_nm == NULL) {
- compile(imh, bci, next_osr_level, THREAD);
- }
+ if (!CompileBroker::compilation_is_in_queue(imh, bci) && next_osr_level != level) {
+ compile(imh, bci, next_osr_level, THREAD);
}
// Use loop event as an opportunity to also check if there's been
diff --git a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
index 7f000b9..58be8b2 100644
--- a/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/advancedThresholdPolicy.hpp
@@ -168,7 +168,7 @@ class AdvancedThresholdPolicy : public SimpleThresholdPolicy {
bool call_predicate(int i, int b, CompLevel cur_level);
bool loop_predicate(int i, int b, CompLevel cur_level);
// Common transition function. Given a predicate determines if a method should transition to another level.
- CompLevel common(Predicate p, methodOop method, CompLevel cur_level);
+ CompLevel common(Predicate p, methodOop method, CompLevel cur_level, bool disable_feedback = false);
// Transition functions.
// call_event determines if a method should be compiled at a different
// level with a regular invocation entry.
diff --git a/hotspot/src/share/vm/runtime/arguments.cpp b/hotspot/src/share/vm/runtime/arguments.cpp
index f2b482c..c78805a 100644
--- a/hotspot/src/share/vm/runtime/arguments.cpp
+++ b/hotspot/src/share/vm/runtime/arguments.cpp
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
#endif
@@ -1447,6 +1450,9 @@ void Arguments::set_parallel_gc_flags() {
if (FLAG_IS_DEFAULT(MinHeapDeltaBytes)) {
FLAG_SET_DEFAULT(MinHeapDeltaBytes, 64*M);
}
+ // For those collectors or operating systems (eg, Windows) that do
+ // not support full UseNUMA, we will map to UseNUMAInterleaving for now
+ UseNUMAInterleaving = true;
}
}
@@ -3061,9 +3067,6 @@ jint Arguments::parse(const JavaVMInitArgs* args) {
}
#ifdef JAVASE_EMBEDDED
- #ifdef PPC
- UNSUPPORTED_OPTION(EnableInvokeDynamic, "Invoke dynamic");
- #endif
UNSUPPORTED_OPTION(UseG1GC, "G1 GC");
#endif
diff --git a/hotspot/src/share/vm/runtime/atomic.cpp b/hotspot/src/share/vm/runtime/atomic.cpp
index 3b012e0..80780d7 100644
--- a/hotspot/src/share/vm/runtime/atomic.cpp
+++ b/hotspot/src/share/vm/runtime/atomic.cpp
@@ -33,6 +33,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "atomic_linux_x86.inline.hpp"
#endif
@@ -57,6 +60,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "atomic_linux_ppc.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "atomic_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "atomic_bsd_zero.inline.hpp"
+#endif
jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
assert(sizeof(jbyte) == 1, "assumption.");
diff --git a/hotspot/src/share/vm/runtime/compilationPolicy.hpp b/hotspot/src/share/vm/runtime/compilationPolicy.hpp
index 6282688..b9d7066 100644
--- a/hotspot/src/share/vm/runtime/compilationPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/compilationPolicy.hpp
@@ -59,6 +59,8 @@ public:
// Profiling
elapsedTimer* accumulated_time() { return &_accumulated_time; }
void print_time() PRODUCT_RETURN;
+ // Return initial compile level that is used with Xcomp
+ virtual CompLevel initial_compile_level() = 0;
virtual int compiler_count(CompLevel comp_level) = 0;
// main notification entry, return a pointer to an nmethod if the OSR is required,
// returns NULL otherwise.
@@ -94,6 +96,7 @@ protected:
void reset_counter_for_back_branch_event(methodHandle method);
public:
NonTieredCompPolicy() : _compiler_count(0) { }
+ virtual CompLevel initial_compile_level() { return CompLevel_initial_compile; }
virtual int compiler_count(CompLevel comp_level);
virtual void do_safepoint_work();
virtual void reprofile(ScopeDesc* trap_scope, bool is_osr);
diff --git a/hotspot/src/share/vm/runtime/deoptimization.cpp b/hotspot/src/share/vm/runtime/deoptimization.cpp
index b2f172d..db95bad 100644
--- a/hotspot/src/share/vm/runtime/deoptimization.cpp
+++ b/hotspot/src/share/vm/runtime/deoptimization.cpp
@@ -103,7 +103,7 @@ Deoptimization::UnrollBlock::UnrollBlock(int size_of_deoptimized_frame,
_frame_pcs = frame_pcs;
_register_block = NEW_C_HEAP_ARRAY(intptr_t, RegisterMap::reg_count * 2);
_return_type = return_type;
- _initial_fp = 0;
+ _initial_info = 0;
// PD (x86 only)
_counter_temp = 0;
_unpack_kind = 0;
@@ -486,9 +486,10 @@ Deoptimization::UnrollBlock* Deoptimization::fetch_unroll_info_helper(JavaThread
frame_sizes,
frame_pcs,
return_type);
- // On some platforms, we need a way to pass fp to the unpacking code
- // so the skeletal frames come out correct.
- info->set_initial_fp((intptr_t) array->sender().fp());
+ // On some platforms, we need a way to pass some platform dependent
+ // information to the unpacking code so the skeletal frames come out
+ // correct (initial fp value, unextended sp, ...)
+ info->set_initial_info((intptr_t) array->sender().initial_deoptimization_info());
if (array->frames() > 1) {
if (VerifyStack && TraceDeoptimization) {
diff --git a/hotspot/src/share/vm/runtime/deoptimization.hpp b/hotspot/src/share/vm/runtime/deoptimization.hpp
index 853cd9a..1822546 100644
--- a/hotspot/src/share/vm/runtime/deoptimization.hpp
+++ b/hotspot/src/share/vm/runtime/deoptimization.hpp
@@ -34,6 +34,8 @@ class MonitorValue;
class ObjectValue;
class Deoptimization : AllStatic {
+ friend class VMStructs;
+
public:
// What condition caused the deoptimization?
enum DeoptReason {
@@ -137,7 +139,7 @@ class Deoptimization : AllStatic {
address* _frame_pcs; // Array of frame pc's, in bytes, for unrolling the stack
intptr_t* _register_block; // Block for storing callee-saved registers.
BasicType _return_type; // Tells if we have to restore double or long return value
- intptr_t _initial_fp; // FP of the sender frame
+ intptr_t _initial_info; // Platform dependent data for the sender frame (was FP on x86)
int _caller_actual_parameters; // The number of actual arguments at the
// interpreted caller of the deoptimized frame
@@ -170,7 +172,7 @@ class Deoptimization : AllStatic {
// Returns the total size of frames
int size_of_frames() const;
- void set_initial_fp(intptr_t fp) { _initial_fp = fp; }
+ void set_initial_info(intptr_t info) { _initial_info = info; }
int caller_actual_parameters() const { return _caller_actual_parameters; }
@@ -184,7 +186,7 @@ class Deoptimization : AllStatic {
static int register_block_offset_in_bytes() { return offset_of(UnrollBlock, _register_block); }
static int return_type_offset_in_bytes() { return offset_of(UnrollBlock, _return_type); }
static int counter_temp_offset_in_bytes() { return offset_of(UnrollBlock, _counter_temp); }
- static int initial_fp_offset_in_bytes() { return offset_of(UnrollBlock, _initial_fp); }
+ static int initial_info_offset_in_bytes() { return offset_of(UnrollBlock, _initial_info); }
static int unpack_kind_offset_in_bytes() { return offset_of(UnrollBlock, _unpack_kind); }
static int sender_sp_temp_offset_in_bytes() { return offset_of(UnrollBlock, _sender_sp_temp); }
diff --git a/hotspot/src/share/vm/runtime/fieldDescriptor.cpp b/hotspot/src/share/vm/runtime/fieldDescriptor.cpp
index 0832d31..1fb0ce0 100644
--- a/hotspot/src/share/vm/runtime/fieldDescriptor.cpp
+++ b/hotspot/src/share/vm/runtime/fieldDescriptor.cpp
@@ -42,59 +42,51 @@ typeArrayOop fieldDescriptor::annotations() const {
objArrayOop md = ik->fields_annotations();
if (md == NULL)
return NULL;
- assert((index() % instanceKlass::next_offset) == 0, "");
- return typeArrayOop(md->obj_at(index() / instanceKlass::next_offset));
+ return typeArrayOop(md->obj_at(index()));
}
constantTag fieldDescriptor::initial_value_tag() const {
- return constants()->tag_at(_initial_value_index);
+ return constants()->tag_at(initial_value_index());
}
jint fieldDescriptor::int_initial_value() const {
- return constants()->int_at(_initial_value_index);
+ return constants()->int_at(initial_value_index());
}
jlong fieldDescriptor::long_initial_value() const {
- return constants()->long_at(_initial_value_index);
+ return constants()->long_at(initial_value_index());
}
jfloat fieldDescriptor::float_initial_value() const {
- return constants()->float_at(_initial_value_index);
+ return constants()->float_at(initial_value_index());
}
jdouble fieldDescriptor::double_initial_value() const {
- return constants()->double_at(_initial_value_index);
+ return constants()->double_at(initial_value_index());
}
oop fieldDescriptor::string_initial_value(TRAPS) const {
- return constants()->string_at(_initial_value_index, CHECK_0);
+ return constants()->string_at(initial_value_index(), CHECK_0);
}
void fieldDescriptor::initialize(klassOop k, int index) {
instanceKlass* ik = instanceKlass::cast(k);
_cp = ik->constants();
- typeArrayOop fields = ik->fields();
-
- assert(fields->length() % instanceKlass::next_offset == 0, "Illegal size of field array");
- assert(fields->length() >= index + instanceKlass::next_offset, "Illegal size of field array");
-
- _access_flags.set_field_flags(fields->ushort_at(index + instanceKlass::access_flags_offset));
- _name_index = fields->ushort_at(index + instanceKlass::name_index_offset);
- _signature_index = fields->ushort_at(index + instanceKlass::signature_index_offset);
- _initial_value_index = fields->ushort_at(index + instanceKlass::initval_index_offset);
- guarantee(_name_index != 0 && _signature_index != 0, "bad constant pool index for fieldDescriptor");
- _offset = ik->offset_from_fields( index );
- _generic_signature_index = fields->ushort_at(index + instanceKlass::generic_signature_offset);
+ FieldInfo* f = ik->field(index);
+ assert(!f->is_internal(), "regular Java fields only");
+
+ _access_flags = accessFlags_from(f->access_flags());
+ guarantee(f->name_index() != 0 && f->signature_index() != 0, "bad constant pool index for fieldDescriptor");
_index = index;
}
#ifndef PRODUCT
void fieldDescriptor::print_on(outputStream* st) const {
- _access_flags.print_on(st);
- constants()->symbol_at(_name_index)->print_value_on(st);
+ access_flags().print_on(st);
+ name()->print_value_on(st);
st->print(" ");
- constants()->symbol_at(_signature_index)->print_value_on(st);
+ signature()->print_value_on(st);
st->print(" @%d ", offset());
if (WizardMode && has_initial_value()) {
st->print("(initval ");
diff --git a/hotspot/src/share/vm/runtime/fieldDescriptor.hpp b/hotspot/src/share/vm/runtime/fieldDescriptor.hpp
index 00f8864..e68b5c5 100644
--- a/hotspot/src/share/vm/runtime/fieldDescriptor.hpp
+++ b/hotspot/src/share/vm/runtime/fieldDescriptor.hpp
@@ -40,29 +40,40 @@
class fieldDescriptor VALUE_OBJ_CLASS_SPEC {
private:
AccessFlags _access_flags;
- int _name_index;
- int _signature_index;
- int _initial_value_index;
- int _offset;
- int _generic_signature_index;
- int _index; // index into fields() array
+ int _index; // the field index
constantPoolHandle _cp;
+ // update the access_flags for the field in the klass
+ void update_klass_field_access_flag() {
+ instanceKlass* ik = instanceKlass::cast(field_holder());
+ ik->field(index())->set_access_flags(_access_flags.as_short());
+ }
+
+ FieldInfo* field() const {
+ instanceKlass* ik = instanceKlass::cast(field_holder());
+ return ik->field(_index);
+ }
+
public:
- Symbol* name() const { return _cp->symbol_at(_name_index); }
- Symbol* signature() const { return _cp->symbol_at(_signature_index); }
+ Symbol* name() const {
+ return field()->name(_cp);
+ }
+ Symbol* signature() const {
+ return field()->signature(_cp);
+ }
klassOop field_holder() const { return _cp->pool_holder(); }
constantPoolOop constants() const { return _cp(); }
AccessFlags access_flags() const { return _access_flags; }
oop loader() const;
// Offset (in words) of field from start of instanceOop / klassOop
- int offset() const { return _offset; }
- Symbol* generic_signature() const { return (_generic_signature_index > 0 ? _cp->symbol_at(_generic_signature_index) : (Symbol*)NULL); }
+ int offset() const { return field()->offset(); }
+ Symbol* generic_signature() const { return field()->generic_signature(_cp); }
int index() const { return _index; }
typeArrayOop annotations() const;
// Initial field value
- bool has_initial_value() const { return _initial_value_index != 0; }
+ bool has_initial_value() const { return field()->initval_index() != 0; }
+ int initial_value_index() const { return field()->initval_index(); }
constantTag initial_value_tag() const; // The tag will return true on one of is_int(), is_long(), is_single(), is_double()
jint int_initial_value() const;
jlong long_initial_value() const;
@@ -74,25 +85,31 @@ class fieldDescriptor VALUE_OBJ_CLASS_SPEC {
BasicType field_type() const { return FieldType::basic_type(signature()); }
// Access flags
- bool is_public() const { return _access_flags.is_public(); }
- bool is_private() const { return _access_flags.is_private(); }
- bool is_protected() const { return _access_flags.is_protected(); }
+ bool is_public() const { return access_flags().is_public(); }
+ bool is_private() const { return access_flags().is_private(); }
+ bool is_protected() const { return access_flags().is_protected(); }
bool is_package_private() const { return !is_public() && !is_private() && !is_protected(); }
- bool is_static() const { return _access_flags.is_static(); }
- bool is_final() const { return _access_flags.is_final(); }
- bool is_volatile() const { return _access_flags.is_volatile(); }
- bool is_transient() const { return _access_flags.is_transient(); }
+ bool is_static() const { return access_flags().is_static(); }
+ bool is_final() const { return access_flags().is_final(); }
+ bool is_volatile() const { return access_flags().is_volatile(); }
+ bool is_transient() const { return access_flags().is_transient(); }
- bool is_synthetic() const { return _access_flags.is_synthetic(); }
+ bool is_synthetic() const { return access_flags().is_synthetic(); }
- bool is_field_access_watched() const { return _access_flags.is_field_access_watched(); }
+ bool is_field_access_watched() const { return access_flags().is_field_access_watched(); }
bool is_field_modification_watched() const
- { return _access_flags.is_field_modification_watched(); }
- void set_is_field_access_watched(const bool value)
- { _access_flags.set_is_field_access_watched(value); }
- void set_is_field_modification_watched(const bool value)
- { _access_flags.set_is_field_modification_watched(value); }
+ { return access_flags().is_field_modification_watched(); }
+
+ void set_is_field_access_watched(const bool value) {
+ _access_flags.set_is_field_access_watched(value);
+ update_klass_field_access_flag();
+ }
+
+ void set_is_field_modification_watched(const bool value) {
+ _access_flags.set_is_field_modification_watched(value);
+ update_klass_field_access_flag();
+ }
// Initialization
void initialize(klassOop k, int index);
diff --git a/hotspot/src/share/vm/runtime/fprofiler.hpp b/hotspot/src/share/vm/runtime/fprofiler.hpp
index 60e51d2..2f8d615 100644
--- a/hotspot/src/share/vm/runtime/fprofiler.hpp
+++ b/hotspot/src/share/vm/runtime/fprofiler.hpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// a simple flat profiler for Java
diff --git a/hotspot/src/share/vm/runtime/frame.hpp b/hotspot/src/share/vm/runtime/frame.hpp
index 0273edf..ec3e3e6 100644
--- a/hotspot/src/share/vm/runtime/frame.hpp
+++ b/hotspot/src/share/vm/runtime/frame.hpp
@@ -221,6 +221,10 @@ class frame VALUE_OBJ_CLASS_SPEC {
// returns the stack pointer of the calling frame
intptr_t* sender_sp() const;
+ // Deoptimization info, if needed (platform dependent).
+ // Stored in the initial_info field of the unroll info, to be used by
+ // the platform dependent deoptimization blobs.
+ intptr_t *initial_deoptimization_info();
// Interpreter frames:
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index 9c2a081..e4ba36a 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -50,6 +50,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "globals_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "globals_bsd.hpp"
+#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "globals_linux_x86.hpp"
#endif
@@ -74,6 +77,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "globals_linux_ppc.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "globals_bsd_x86.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "globals_bsd_zero.hpp"
+#endif
#ifdef COMPILER1
#ifdef TARGET_ARCH_x86
# include "c1_globals_x86.hpp"
@@ -96,6 +105,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "c1_globals_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "c1_globals_bsd.hpp"
+#endif
#endif
#ifdef COMPILER2
#ifdef TARGET_ARCH_x86
@@ -116,6 +128,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "c2_globals_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "c2_globals_bsd.hpp"
+#endif
#endif
#ifdef SHARK
#ifdef TARGET_ARCH_zero
@@ -475,6 +490,12 @@ class CommandLineFlags {
product(bool, UseNUMA, false, \
"Use NUMA if available") \
\
+ product(bool, UseNUMAInterleaving, false, \
+ "Interleave memory across NUMA nodes if available") \
+ \
+ product(uintx, NUMAInterleaveGranularity, 2*M, \
+ "Granularity to use for NUMA interleaving on Windows OS") \
+ \
product(bool, ForceNUMA, false, \
"Force NUMA optimizations on single-node/UMA systems") \
\
@@ -1205,6 +1226,9 @@ class CommandLineFlags {
product(bool, UseUnalignedLoadStores, false, \
"Use SSE2 MOVDQU instruction for Arraycopy") \
\
+ product(bool, UseCBCond, false, \
+ "Use compare and branch instruction on SPARC") \
+ \
product(intx, FieldsAllocationStyle, 1, \
"0 - type based with oops first, 1 - with oops last, " \
"2 - oops in super and sub classes are together") \
@@ -1976,6 +2000,18 @@ class CommandLineFlags {
product(bool, TLABStats, true, \
"Print various TLAB related information") \
\
+ product(bool, UseBlockZeroing, false, \
+ "Use special cpu instructions for block zeroing") \
+ \
+ product(intx, BlockZeroingLowLimit, 2048, \
+ "Minimum size in bytes when block zeroing will be used") \
+ \
+ product(bool, UseBlockCopy, false, \
+ "Use special cpu instructions for block copy") \
+ \
+ product(intx, BlockCopyLowLimit, 2048, \
+ "Minimum size in bytes when block copy will be used") \
+ \
product(bool, PrintRevisitStats, false, \
"Print revisit (klass and MDO) stack related information") \
\
@@ -2894,8 +2930,11 @@ class CommandLineFlags {
product(intx, AllocatePrefetchDistance, -1, \
"Distance to prefetch ahead of allocation pointer") \
\
- product(intx, AllocatePrefetchLines, 1, \
- "Number of lines to prefetch ahead of allocation pointer") \
+ product(intx, AllocatePrefetchLines, 3, \
+ "Number of lines to prefetch ahead of array allocation pointer") \
+ \
+ product(intx, AllocateInstancePrefetchLines, 1, \
+ "Number of lines to prefetch ahead of instance allocation pointer") \
\
product(intx, AllocatePrefetchStepSize, 16, \
"Step size in bytes of sequential prefetch instructions") \
@@ -2906,6 +2945,12 @@ class CommandLineFlags {
product(intx, ReadPrefetchInstr, 0, \
"Prefetch instruction to prefetch ahead") \
\
+ product(uintx, ArraycopySrcPrefetchDistance, 0, \
+ "Distance to prefetch source array in arracopy") \
+ \
+ product(uintx, ArraycopyDstPrefetchDistance, 0, \
+ "Distance to prefetch destination array in arracopy") \
+ \
/* deoptimization */ \
develop(bool, TraceDeoptimization, false, \
"Trace deoptimization") \
@@ -3476,6 +3521,9 @@ class CommandLineFlags {
"C1 with MDO profiling (tier 3) invocation notification " \
"frequency.") \
\
+ product(intx, Tier23InlineeNotifyFreqLog, 20, \
+ "Inlinee invocation (tiers 2 and 3) notification frequency") \
+ \
product(intx, Tier0BackedgeNotifyFreqLog, 10, \
"Interpreter (tier 0) invocation notification frequency.") \
\
diff --git a/hotspot/src/share/vm/runtime/handles.cpp b/hotspot/src/share/vm/runtime/handles.cpp
index 4a57d26..3c24f81 100644
--- a/hotspot/src/share/vm/runtime/handles.cpp
+++ b/hotspot/src/share/vm/runtime/handles.cpp
@@ -38,6 +38,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef ASSERT
oop* HandleArea::allocate_handle(oop obj) {
diff --git a/hotspot/src/share/vm/runtime/handles.inline.hpp b/hotspot/src/share/vm/runtime/handles.inline.hpp
index 01060f5..3bd42fb 100644
--- a/hotspot/src/share/vm/runtime/handles.inline.hpp
+++ b/hotspot/src/share/vm/runtime/handles.inline.hpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// these inline functions are in a separate file to break an include cycle
// between Thread and Handle
diff --git a/hotspot/src/share/vm/runtime/interfaceSupport.hpp b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
index b119006..90c0db3 100644
--- a/hotspot/src/share/vm/runtime/interfaceSupport.hpp
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.hpp
@@ -44,6 +44,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Wrapper for all entry points to the virtual machine.
// The HandleMarkCleaner is a faster version of HandleMark.
@@ -115,6 +118,9 @@ class InterfaceSupport: AllStatic {
#ifdef TARGET_OS_FAMILY_windows
# include "interfaceSupport_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "interfaceSupport_bsd.hpp"
+#endif
};
diff --git a/hotspot/src/share/vm/runtime/java.cpp b/hotspot/src/share/vm/runtime/java.cpp
index 73065fe..7636304 100644
--- a/hotspot/src/share/vm/runtime/java.cpp
+++ b/hotspot/src/share/vm/runtime/java.cpp
@@ -85,6 +85,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/parallelScavenge/psScavenge.hpp"
@@ -243,6 +246,7 @@ void print_statistics() {
FlagSetting fs(DisplayVMOutput, DisplayVMOutput && PrintC1Statistics);
Runtime1::print_statistics();
Deoptimization::print_statistics();
+ SharedRuntime::print_statistics();
nmethod::print_statistics();
}
#endif /* COMPILER1 */
@@ -254,8 +258,8 @@ void print_statistics() {
#ifndef COMPILER1
Deoptimization::print_statistics();
nmethod::print_statistics();
-#endif //COMPILER1
SharedRuntime::print_statistics();
+#endif //COMPILER1
os::print_statistics();
}
@@ -671,7 +675,8 @@ void JDK_Version::initialize() {
_current = JDK_Version(major, minor, micro, info.update_version,
info.special_update_version, build,
info.thread_park_blocker == 1,
- info.post_vm_init_hook_enabled == 1);
+ info.post_vm_init_hook_enabled == 1,
+ info.pending_list_uses_discovered_field == 1);
}
}
diff --git a/hotspot/src/share/vm/runtime/java.hpp b/hotspot/src/share/vm/runtime/java.hpp
index 37e29bd..307fcc2 100644
--- a/hotspot/src/share/vm/runtime/java.hpp
+++ b/hotspot/src/share/vm/runtime/java.hpp
@@ -92,6 +92,7 @@ class JDK_Version VALUE_OBJ_CLASS_SPEC {
bool _partially_initialized;
bool _thread_park_blocker;
+ bool _pending_list_uses_discovered_field;
bool _post_vm_init_hook_enabled;
bool is_valid() const {
@@ -114,15 +115,18 @@ class JDK_Version VALUE_OBJ_CLASS_SPEC {
JDK_Version() : _major(0), _minor(0), _micro(0), _update(0),
_special(0), _build(0), _partially_initialized(false),
- _thread_park_blocker(false), _post_vm_init_hook_enabled(false) {}
+ _thread_park_blocker(false), _post_vm_init_hook_enabled(false),
+ _pending_list_uses_discovered_field(false) {}
JDK_Version(uint8_t major, uint8_t minor = 0, uint8_t micro = 0,
uint8_t update = 0, uint8_t special = 0, uint8_t build = 0,
- bool thread_park_blocker = false, bool post_vm_init_hook_enabled = false) :
+ bool thread_park_blocker = false, bool post_vm_init_hook_enabled = false,
+ bool pending_list_uses_discovered_field = false) :
_major(major), _minor(minor), _micro(micro), _update(update),
_special(special), _build(build), _partially_initialized(false),
_thread_park_blocker(thread_park_blocker),
- _post_vm_init_hook_enabled(post_vm_init_hook_enabled) {}
+ _post_vm_init_hook_enabled(post_vm_init_hook_enabled),
+ _pending_list_uses_discovered_field(pending_list_uses_discovered_field) {}
// Returns the current running JDK version
static JDK_Version current() { return _current; }
@@ -149,6 +153,10 @@ class JDK_Version VALUE_OBJ_CLASS_SPEC {
bool post_vm_init_hook_enabled() const {
return _post_vm_init_hook_enabled;
}
+ // For compatibility wrt pre-4965777 JDK's
+ bool pending_list_uses_discovered_field() const {
+ return _pending_list_uses_discovered_field;
+ }
// Performs a full ordering comparison using all fields (update, build, etc.)
int compare(const JDK_Version& other) const;
diff --git a/hotspot/src/share/vm/runtime/javaCalls.cpp b/hotspot/src/share/vm/runtime/javaCalls.cpp
index eca02a4..edbba98 100644
--- a/hotspot/src/share/vm/runtime/javaCalls.cpp
+++ b/hotspot/src/share/vm/runtime/javaCalls.cpp
@@ -48,6 +48,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// -----------------------------------------------------
// Implementation of JavaCallWrapper
@@ -355,7 +358,7 @@ void JavaCalls::call_helper(JavaValue* result, methodHandle* m, JavaCallArgument
assert(!thread->is_Compiler_thread(), "cannot compile from the compiler");
if (CompilationPolicy::must_be_compiled(method)) {
CompileBroker::compile_method(method, InvocationEntryBci,
- CompLevel_initial_compile,
+ CompilationPolicy::policy()->initial_compile_level(),
methodHandle(), 0, "must_be_compiled", CHECK);
}
@@ -557,4 +560,3 @@ void JavaCallArguments::verify(methodHandle method, BasicType return_type,
sc.check_doing_return(true);
sc.iterate_returntype();
}
-
diff --git a/hotspot/src/share/vm/runtime/javaCalls.hpp b/hotspot/src/share/vm/runtime/javaCalls.hpp
index af29462..d4f8595 100644
--- a/hotspot/src/share/vm/runtime/javaCalls.hpp
+++ b/hotspot/src/share/vm/runtime/javaCalls.hpp
@@ -54,6 +54,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// A JavaCallWrapper is constructed before each JavaCall and destructed after the call.
// Its purpose is to allocate/deallocate a new handle block and to save/restore the last
diff --git a/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp b/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp
index 501e59e..8374aa2 100644
--- a/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp
+++ b/hotspot/src/share/vm/runtime/javaFrameAnchor.hpp
@@ -50,6 +50,13 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "orderAccess_linux_ppc.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "orderAccess_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "orderAccess_bsd_zero.inline.hpp"
+#endif
+
//
// An object for encapsulating the machine/os dependent part of a JavaThread frame state
//
diff --git a/hotspot/src/share/vm/runtime/jniHandles.cpp b/hotspot/src/share/vm/runtime/jniHandles.cpp
index e9c791d..3cbcaca 100644
--- a/hotspot/src/share/vm/runtime/jniHandles.cpp
+++ b/hotspot/src/share/vm/runtime/jniHandles.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
JNIHandleBlock* JNIHandles::_global_handles = NULL;
diff --git a/hotspot/src/share/vm/runtime/memprofiler.cpp b/hotspot/src/share/vm/runtime/memprofiler.cpp
index cf49dd3..ab53d92 100644
--- a/hotspot/src/share/vm/runtime/memprofiler.cpp
+++ b/hotspot/src/share/vm/runtime/memprofiler.cpp
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/runtime/mutex.cpp b/hotspot/src/share/vm/runtime/mutex.cpp
index 634ec43..80d3d87 100644
--- a/hotspot/src/share/vm/runtime/mutex.cpp
+++ b/hotspot/src/share/vm/runtime/mutex.cpp
@@ -39,6 +39,10 @@
# include "mutex_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "mutex_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
// o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o
//
diff --git a/hotspot/src/share/vm/runtime/mutexLocker.cpp b/hotspot/src/share/vm/runtime/mutexLocker.cpp
index b3d082f..7653b5b 100644
--- a/hotspot/src/share/vm/runtime/mutexLocker.cpp
+++ b/hotspot/src/share/vm/runtime/mutexLocker.cpp
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Mutexes used in the VM (see comment in mutexLocker.hpp):
//
diff --git a/hotspot/src/share/vm/runtime/mutexLocker.hpp b/hotspot/src/share/vm/runtime/mutexLocker.hpp
index 58060b8..37a3d31 100644
--- a/hotspot/src/share/vm/runtime/mutexLocker.hpp
+++ b/hotspot/src/share/vm/runtime/mutexLocker.hpp
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// Mutexes used in the VM.
diff --git a/hotspot/src/share/vm/runtime/objectMonitor.cpp b/hotspot/src/share/vm/runtime/objectMonitor.cpp
index e2b4bf2..3fa0e32 100644
--- a/hotspot/src/share/vm/runtime/objectMonitor.cpp
+++ b/hotspot/src/share/vm/runtime/objectMonitor.cpp
@@ -50,6 +50,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
#if defined(__GNUC__) && !defined(IA64)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
diff --git a/hotspot/src/share/vm/runtime/os.cpp b/hotspot/src/share/vm/runtime/os.cpp
index 53e918d..0563d8a 100644
--- a/hotspot/src/share/vm/runtime/os.cpp
+++ b/hotspot/src/share/vm/runtime/os.cpp
@@ -60,6 +60,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
# include <signal.h>
@@ -116,7 +120,11 @@ char* os::iso8601_time(char* buffer, size_t buffer_length) {
assert(false, "Failed localtime_pd");
return NULL;
}
+#if defined(_ALLBSD_SOURCE)
+ const time_t zone = (time_t) time_struct.tm_gmtoff;
+#else
const time_t zone = timezone;
+#endif
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
@@ -384,6 +392,13 @@ void* os::native_java_library() {
if (_native_java_library == NULL) {
vm_exit_during_initialization("Unable to load native library", ebuf);
}
+
+#if defined(__OpenBSD__)
+ // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so
+ // ignore errors
+ dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net");
+ dll_load(buffer, ebuf, sizeof(ebuf));
+#endif
}
static jboolean onLoaded = JNI_FALSE;
if (onLoaded) {
@@ -1279,6 +1294,17 @@ size_t os::page_size_for_region(size_t region_min_size, size_t region_max_size,
}
#ifndef PRODUCT
+void os::trace_page_sizes(const char* str, const size_t* page_sizes, int count)
+{
+ if (TracePageSizes) {
+ tty->print("%s: ", str);
+ for (int i = 0; i < count; ++i) {
+ tty->print(" " SIZE_FORMAT, page_sizes[i]);
+ }
+ tty->cr();
+ }
+}
+
void os::trace_page_sizes(const char* str, const size_t region_min_size,
const size_t region_max_size, const size_t page_size,
const char* base, const size_t size)
@@ -1346,7 +1372,7 @@ int os::get_line_chars(int fd, char* buf, const size_t bsize){
size_t sz, i = 0;
// read until EOF, EOL or buf is full
- while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-1) && buf[i] != '\n') {
+ while ((sz = (int) read(fd, &buf[i], 1)) == 1 && i < (bsize-2) && buf[i] != '\n') {
++i;
}
@@ -1367,7 +1393,7 @@ int os::get_line_chars(int fd, char* buf, const size_t bsize){
}
// line is longer than size of buf, skip to EOL
- int ch;
+ char ch;
while (read(fd, &ch, 1) == 1 && ch != '\n') {
// Do nothing
}
diff --git a/hotspot/src/share/vm/runtime/os.hpp b/hotspot/src/share/vm/runtime/os.hpp
index 0b401b1..f92d92d 100644
--- a/hotspot/src/share/vm/runtime/os.hpp
+++ b/hotspot/src/share/vm/runtime/os.hpp
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "jvm_windows.h"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "jvm_bsd.h"
+#endif
// os defines the interface to operating system; this includes traditional
// OS services (time, I/O) as well as other functionality with system-
@@ -208,11 +211,13 @@ class os: AllStatic {
size_t region_max_size,
uint min_pages);
- // Method for tracing page sizes returned by the above method; enabled by
+ // Methods for tracing page sizes returned by the above method; enabled by
// TracePageSizes. The region_{min,max}_size parameters should be the values
// passed to page_size_for_region() and page_size should be the result of that
// call. The (optional) base and size parameters should come from the
// ReservedSpace base() and size() methods.
+ static void trace_page_sizes(const char* str, const size_t* page_sizes,
+ int count) PRODUCT_RETURN;
static void trace_page_sizes(const char* str, const size_t region_min_size,
const size_t region_max_size,
const size_t page_size,
@@ -673,6 +678,9 @@ class os: AllStatic {
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.hpp"
+#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "os_linux_x86.hpp"
#endif
@@ -697,6 +705,12 @@ class os: AllStatic {
#ifdef TARGET_OS_ARCH_linux_ppc
# include "os_linux_ppc.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "os_bsd_x86.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "os_bsd_zero.hpp"
+#endif
// debugging support (mostly used by debug.cpp but also fatal error handler)
diff --git a/hotspot/src/share/vm/runtime/osThread.hpp b/hotspot/src/share/vm/runtime/osThread.hpp
index 5df645a..984bc9b 100644
--- a/hotspot/src/share/vm/runtime/osThread.hpp
+++ b/hotspot/src/share/vm/runtime/osThread.hpp
@@ -109,6 +109,9 @@ class OSThread: public CHeapObj {
#ifdef TARGET_OS_FAMILY_windows
# include "osThread_windows.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "osThread_bsd.hpp"
+#endif
};
diff --git a/hotspot/src/share/vm/runtime/reflection.cpp b/hotspot/src/share/vm/runtime/reflection.cpp
index e25c1af..29858be 100644
--- a/hotspot/src/share/vm/runtime/reflection.cpp
+++ b/hotspot/src/share/vm/runtime/reflection.cpp
@@ -844,16 +844,6 @@ oop Reflection::new_field(fieldDescriptor* fd, bool intern_name, TRAPS) {
}
-//---------------------------------------------------------------------------
-//
-// Supporting routines for old native code-based reflection (pre-JDK 1.4).
-//
-// See reflection.hpp for details.
-//
-//---------------------------------------------------------------------------
-
-#ifdef SUPPORT_OLD_REFLECTION
-
methodHandle Reflection::resolve_interface_call(instanceKlassHandle klass, methodHandle method,
KlassHandle recv_klass, Handle receiver, TRAPS) {
assert(!method.is_null() , "method should not be null");
@@ -1081,519 +1071,6 @@ BasicType Reflection::basic_type_mirror_to_basic_type(oop basic_type_mirror, TRA
return java_lang_Class::primitive_type(basic_type_mirror);
}
-
-bool Reflection::match_parameter_types(methodHandle method, objArrayHandle types, int parameter_count, TRAPS) {
- int types_len = types.is_null() ? 0 : types->length();
- if (types_len != parameter_count) return false;
- if (parameter_count > 0) {
- objArrayHandle method_types = get_parameter_types(method, parameter_count, NULL, CHECK_false);
- for (int index = 0; index < parameter_count; index++) {
- if (types->obj_at(index) != method_types->obj_at(index)) {
- return false;
- }
- }
- }
- return true;
-}
-
-
-oop Reflection::new_field(FieldStream* st, TRAPS) {
- Symbol* field_name = st->name();
- Handle name = java_lang_String::create_from_symbol(field_name, CHECK_NULL);
- Symbol* signature = st->signature();
- Handle type = new_type(signature, st->klass(), CHECK_NULL);
- Handle rh = java_lang_reflect_Field::create(CHECK_NULL);
- oop result = rh();
-
- java_lang_reflect_Field::set_clazz(result, st->klass()->java_mirror());
- java_lang_reflect_Field::set_slot(result, st->index());
- java_lang_reflect_Field::set_name(result, name());
- java_lang_reflect_Field::set_type(result, type());
- // Note the ACC_ANNOTATION bit, which is a per-class access flag, is never set here.
- java_lang_reflect_Field::set_modifiers(result, st->access_flags().as_int() & JVM_RECOGNIZED_FIELD_MODIFIERS);
- java_lang_reflect_Field::set_override(result, false);
- return result;
-}
-
-
-bool Reflection::resolve_field(Handle field_mirror, Handle& receiver, fieldDescriptor* fd, bool check_final, TRAPS) {
- if (field_mirror.is_null()) {
- THROW_(vmSymbols::java_lang_NullPointerException(), false);
- }
-
- instanceKlassHandle klass (THREAD, java_lang_Class::as_klassOop(java_lang_reflect_Field::clazz(field_mirror())));
- int slot = java_lang_reflect_Field::slot(field_mirror());
-
- // Ensure klass is initialized
- klass->initialize(CHECK_false);
- fd->initialize(klass(), slot);
-
- bool is_static = fd->is_static();
- KlassHandle receiver_klass;
-
- if (is_static) {
- receiver = KlassHandle(THREAD, klass());
- receiver_klass = klass;
- } else {
- // Check object is a non-null instance of declaring class
- if (receiver.is_null()) {
- THROW_(vmSymbols::java_lang_NullPointerException(), false);
- }
- if (!receiver->is_a(klass())) {
- THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), "object is not an instance of declaring class", false);
- }
- receiver_klass = KlassHandle(THREAD, receiver->klass());
- }
-
- // Access checking (unless overridden by Field)
- if (!java_lang_reflect_Field::override(field_mirror())) {
- if (!(klass->is_public() && fd->is_public())) {
- bool access_check = reflect_check_access(klass(), fd->access_flags(), receiver_klass(), false, CHECK_false);
- if (!access_check) {
- return false; // exception
- }
- }
- }
-
- if (check_final && fd->is_final()) {
- // In 1.3 we always throw an error when attempting to set a final field.
- // In 1.2.x, this was allowed in the override bit was set by calling Field.setAccessible(true).
- // We currently maintain backwards compatibility. See bug 4250960.
- bool strict_final_check = !JDK_Version::is_jdk12x_version();
- if (strict_final_check || !java_lang_reflect_Field::override(field_mirror())) {
- THROW_MSG_(vmSymbols::java_lang_IllegalAccessException(), "field is final", false);
- }
- }
- return true;
-}
-
-
-BasicType Reflection::field_get(jvalue* value, fieldDescriptor* fd, Handle receiver) {
- BasicType field_type = fd->field_type();
- int offset = fd->offset();
- switch (field_type) {
- case T_BOOLEAN:
- value->z = receiver->bool_field(offset);
- break;
- case T_CHAR:
- value->c = receiver->char_field(offset);
- break;
- case T_FLOAT:
- value->f = receiver->float_field(offset);
- break;
- case T_DOUBLE:
- value->d = receiver->double_field(offset);
- break;
- case T_BYTE:
- value->b = receiver->byte_field(offset);
- break;
- case T_SHORT:
- value->s = receiver->short_field(offset);
- break;
- case T_INT:
- value->i = receiver->int_field(offset);
- break;
- case T_LONG:
- value->j = receiver->long_field(offset);
- break;
- case T_OBJECT:
- case T_ARRAY:
- value->l = (jobject) receiver->obj_field(offset);
- break;
- default:
- return T_ILLEGAL;
- }
- return field_type;
-}
-
-
-void Reflection::field_set(jvalue* value, fieldDescriptor* fd, Handle receiver, BasicType value_type, TRAPS) {
- BasicType field_type = fd->field_type();
- if (field_type != value_type) {
- widen(value, value_type, field_type, CHECK);
- }
-
- int offset = fd->offset();
- switch (field_type) {
- case T_BOOLEAN:
- receiver->bool_field_put(offset, value->z);
- break;
- case T_CHAR:
- receiver->char_field_put(offset, value->c);
- break;
- case T_FLOAT:
- receiver->float_field_put(offset, value->f);
- break;
- case T_DOUBLE:
- receiver->double_field_put(offset, value->d);
- break;
- case T_BYTE:
- receiver->byte_field_put(offset, value->b);
- break;
- case T_SHORT:
- receiver->short_field_put(offset, value->s);
- break;
- case T_INT:
- receiver->int_field_put(offset, value->i);
- break;
- case T_LONG:
- receiver->long_field_put(offset, value->j);
- break;
- case T_OBJECT:
- case T_ARRAY: {
- Handle obj(THREAD, (oop) value->l);
- if (obj.not_null()) {
- Symbol* signature = fd->signature();
- Handle loader (THREAD, fd->loader());
- Handle protect (THREAD, Klass::cast(fd->field_holder())->protection_domain());
- klassOop k = SystemDictionary::resolve_or_fail(signature, loader, protect, true, CHECK); // may block
- if (!obj->is_a(k)) {
- THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "field type mismatch");
- }
- }
- receiver->obj_field_put(offset, obj());
- break;
- }
- default:
- THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), "field type mismatch");
- }
-}
-
-
-oop Reflection::reflect_field(oop mirror, Symbol* field_name, jint which, TRAPS) {
- // Exclude primitive types and array types
- if (java_lang_Class::is_primitive(mirror)) return NULL;
- if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) return NULL;
-
- instanceKlassHandle k(THREAD, java_lang_Class::as_klassOop(mirror));
- bool local_fields_only = (which == DECLARED);
-
- // Ensure class is linked
- k->link_class(CHECK_NULL);
-
- // Search class and interface fields
- for (FieldStream st(k, local_fields_only, false); !st.eos(); st.next()) {
- if (st.name() == field_name) {
- if (local_fields_only || st.access_flags().is_public()) {
- return new_field(&st, THREAD);
- }
- }
- }
-
- return NULL;
-}
-
-
-objArrayOop Reflection::reflect_fields(oop mirror, jint which, TRAPS) {
- // Exclude primitive types and array types
- if (java_lang_Class::is_primitive(mirror)
- || Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
- Symbol* name = vmSymbols::java_lang_reflect_Field();
- klassOop klass = SystemDictionary::resolve_or_fail(name, true, CHECK_NULL);
- return oopFactory::new_objArray(klass, 0, CHECK_NULL); // Return empty array
- }
-
- instanceKlassHandle k(THREAD, java_lang_Class::as_klassOop(mirror));
-
- // Ensure class is linked
- k->link_class(CHECK_NULL);
-
- bool local_fields_only = (which == DECLARED);
- int count = 0;
- { // Compute fields count for class and interface fields
- for (FieldStream st(k, local_fields_only, false); !st.eos(); st.next()) {
- if (local_fields_only || st.access_flags().is_public()) {
- count++;
- }
- }
- }
-
- // Allocate result
- Symbol* name = vmSymbols::java_lang_reflect_Field();
- klassOop klass = SystemDictionary::resolve_or_fail(name, true, CHECK_NULL);
- objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
- objArrayHandle result (THREAD, r);
-
- // Fill in results backwards
- {
- for (FieldStream st(k, local_fields_only, false); !st.eos(); st.next()) {
- if (local_fields_only || st.access_flags().is_public()) {
- oop field = new_field(&st, CHECK_NULL);
- result->obj_at_put(--count, field);
- }
- }
- assert(count == 0, "just checking");
- }
- return result();
-}
-
-
-oop Reflection::reflect_method(oop mirror, Symbol* method_name, objArrayHandle types, jint which, TRAPS) {
- if (java_lang_Class::is_primitive(mirror)) return NULL;
- klassOop klass = java_lang_Class::as_klassOop(mirror);
- if (Klass::cast(klass)->oop_is_array() && which == MEMBER_DECLARED) return NULL;
-
- if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
- klass = SystemDictionary::Object_klass();
- }
- instanceKlassHandle h_k(THREAD, klass);
-
- // Ensure klass is linked (need not be initialized)
- h_k->link_class(CHECK_NULL);
-
- // For interfaces include static initializers under jdk1.2.x (since classic does that)
- bool include_clinit = JDK_Version::is_jdk12x_version() && h_k->is_interface();
-
- switch (which) {
- case MEMBER_PUBLIC:
- // First the public non-static methods (works if method holder is an interface)
- // Note that we can ignore checks for overridden methods, since we go up the hierarchy.
- {
- for (MethodStream st(h_k, false, false); !st.eos(); st.next()) {
- methodHandle m(THREAD, st.method());
- // For interfaces include static initializers since classic does that!
- if (method_name == m->name() && (include_clinit || (m->is_public() && !m->is_static() && !m->is_initializer()))) {
- Symbol* signature = m->signature();
- bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL);
- if (parameter_match) {
- return new_method(m, false, false, THREAD);
- }
- }
- }
- }
- // Then the public static methods (works if method holder is an interface)
- {
- for (MethodStream st(h_k, false, false); !st.eos(); st.next()) {
- methodHandle m(THREAD, st.method());
- if (method_name == m->name() && m->is_public() && m->is_static() && !m->is_initializer()) {
- Symbol* signature = m->signature();
- bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL);
- if (parameter_match) {
- return new_method(m, false, false, THREAD);
- }
- }
- }
- }
- break;
- case MEMBER_DECLARED:
- // All local methods
- {
- for (MethodStream st(h_k, true, true); !st.eos(); st.next()) {
- methodHandle m(THREAD, st.method());
- if (method_name == m->name() && !m->is_initializer()) {
- Symbol* signature = m->signature();
- bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL);
- if (parameter_match) {
- return new_method(m, false, false, THREAD);
- }
- }
- }
- }
- break;
- default:
- break;
- }
- return NULL;
-}
-
-
-objArrayOop Reflection::reflect_methods(oop mirror, jint which, TRAPS) {
- // Exclude primitive types
- if (java_lang_Class::is_primitive(mirror) ||
- (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array() && (which == MEMBER_DECLARED))) {
- klassOop klass = SystemDictionary::reflect_Method_klass();
- return oopFactory::new_objArray(klass, 0, CHECK_NULL); // Return empty array
- }
-
- klassOop klass = java_lang_Class::as_klassOop(mirror);
- if (Klass::cast(java_lang_Class::as_klassOop(mirror))->oop_is_array()) {
- klass = SystemDictionary::Object_klass();
- }
- instanceKlassHandle h_k(THREAD, klass);
-
- // Ensure klass is linked (need not be initialized)
- h_k->link_class(CHECK_NULL);
-
- // We search the (super)interfaces only if h_k is an interface itself
- bool is_interface = h_k->is_interface();
-
- // For interfaces include static initializers under jdk1.2.x (since classic does that)
- bool include_clinit = JDK_Version::is_jdk12x_version() && is_interface;
-
- switch (which) {
- case MEMBER_PUBLIC:
- {
-
- // Count public methods (non-static and static)
- int count = 0;
- {
- for (MethodStream st(h_k, false, false); !st.eos(); st.next()) {
- methodOop m = st.method();
- // For interfaces include static initializers since classic does that!
- if (include_clinit || (!m->is_initializer() && m->is_public() && !m->is_overridden_in(h_k()))) {
- count++;
- }
- }
- }
-
- // Allocate result
- klassOop klass = SystemDictionary::reflect_Method_klass();
- objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
- objArrayHandle h_result (THREAD, r);
-
- // Fill in results backwards
- {
- // First the non-static public methods
- for (MethodStream st(h_k, false, false); !st.eos(); st.next()) {
- methodHandle m (THREAD, st.method());
- if (!m->is_static() && !m->is_initializer() && m->is_public() && !m->is_overridden_in(h_k())) {
- oop method = new_method(m, false, false, CHECK_NULL);
- if (method == NULL) {
- return NULL;
- } else {
- h_result->obj_at_put(--count, method);
- }
- }
- }
- }
- {
- // Then the static public methods
- for (MethodStream st(h_k, false, !is_interface); !st.eos(); st.next()) {
- methodHandle m (THREAD, st.method());
- if (m->is_static() && (include_clinit || (!m->is_initializer()) && m->is_public() && !m->is_overridden_in(h_k()))) {
- oop method = new_method(m, false, false, CHECK_NULL);
- if (method == NULL) {
- return NULL;
- } else {
- h_result->obj_at_put(--count, method);
- }
- }
- }
- }
-
- assert(count == 0, "just checking");
- return h_result();
- }
-
- case MEMBER_DECLARED:
- {
- // Count all methods
- int count = 0;
- {
- for (MethodStream st(h_k, true, !is_interface); !st.eos(); st.next()) {
- methodOop m = st.method();
- if (!m->is_initializer()) {
- count++;
- }
- }
- }
- // Allocate result
- klassOop klass = SystemDictionary::reflect_Method_klass();
- objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
- objArrayHandle h_result (THREAD, r);
-
- // Fill in results backwards
- {
- for (MethodStream st(h_k, true, true); !st.eos(); st.next()) {
- methodHandle m (THREAD, st.method());
- if (!m->is_initializer()) {
- oop method = new_method(m, false, false, CHECK_NULL);
- if (method == NULL) {
- return NULL;
- } else {
- h_result->obj_at_put(--count, method);
- }
- }
- }
- }
- assert(count == 0, "just checking");
- return h_result();
- }
- }
- ShouldNotReachHere();
- return NULL;
-}
-
-
-oop Reflection::reflect_constructor(oop mirror, objArrayHandle types, jint which, TRAPS) {
-
- // Exclude primitive, interface and array types
- bool prim = java_lang_Class::is_primitive(mirror);
- Klass* klass = prim ? NULL : Klass::cast(java_lang_Class::as_klassOop(mirror));
- if (prim || klass->is_interface() || klass->oop_is_array()) return NULL;
-
- // Must be instance klass
- instanceKlassHandle h_k(THREAD, java_lang_Class::as_klassOop(mirror));
-
- // Ensure klass is linked (need not be initialized)
- h_k->link_class(CHECK_NULL);
-
- bool local_only = (which == MEMBER_DECLARED);
- for (MethodStream st(h_k, true, true); !st.eos(); st.next()) {
- methodHandle m(THREAD, st.method());
- if (m->name() == vmSymbols::object_initializer_name() && (local_only || m->is_public())) {
- Symbol* signature = m->signature();
- bool parameter_match = match_parameter_types(m, types, ArgumentCount(signature).size(), CHECK_NULL);
- if (parameter_match) {
- return new_constructor(m, THREAD);
- }
- }
- }
-
- return NULL;
-}
-
-
-objArrayOop Reflection::reflect_constructors(oop mirror, jint which, TRAPS) {
- // Exclude primitive, interface and array types
- bool prim = java_lang_Class::is_primitive(mirror);
- Klass* k = prim ? NULL : Klass::cast(java_lang_Class::as_klassOop(mirror));
- if (prim || k->is_interface() || k->oop_is_array()) {
- return oopFactory::new_objArray(SystemDictionary::reflect_Constructor_klass(), 0, CHECK_NULL); // Return empty array
- }
-
- // Must be instanceKlass at this point
- instanceKlassHandle h_k(THREAD, java_lang_Class::as_klassOop(mirror));
-
- // Ensure klass is linked (need not be initialized)
- h_k->link_class(CHECK_NULL);
-
- bool local_only = (which == MEMBER_DECLARED);
- int count = 0;
- {
- for (MethodStream st(h_k, true, true); !st.eos(); st.next()) {
- methodOop m = st.method();
- if (m->name() == vmSymbols::object_initializer_name() && (local_only || m->is_public())) {
- count++;
- }
- }
- }
-
- // Allocate result
- Symbol* name = vmSymbols::java_lang_reflect_Constructor();
- klassOop klass = SystemDictionary::resolve_or_fail(name, true, CHECK_NULL);
- objArrayOop r = oopFactory::new_objArray(klass, count, CHECK_NULL);
- objArrayHandle h_result (THREAD, r);
-
- // Fill in results backwards
- {
- for (MethodStream st(h_k, true, true); !st.eos(); st.next()) {
- methodHandle m (THREAD, st.method());
- if (m->name() == vmSymbols::object_initializer_name() && (local_only || m->is_public())) {
- oop constr = new_constructor(m, CHECK_NULL);
- if (constr == NULL) {
- return NULL;
- } else {
- h_result->obj_at_put(--count, constr);
- }
- }
- }
- assert(count == 0, "just checking");
- }
- return h_result();
-}
-
-
// This would be nicer if, say, java.lang.reflect.Method was a subclass
// of java.lang.reflect.Constructor
@@ -1647,6 +1124,3 @@ oop Reflection::invoke_constructor(oop constructor_mirror, objArrayHandle args,
invoke(klass, method, receiver, override, ptypes, T_VOID, args, false, CHECK_NULL);
return receiver();
}
-
-
-#endif /* SUPPORT_OLD_REFLECTION */
diff --git a/hotspot/src/share/vm/runtime/reflection.hpp b/hotspot/src/share/vm/runtime/reflection.hpp
index 90a3c0c..cf54253 100644
--- a/hotspot/src/share/vm/runtime/reflection.hpp
+++ b/hotspot/src/share/vm/runtime/reflection.hpp
@@ -27,7 +27,6 @@
#include "oops/oop.hpp"
#include "runtime/fieldDescriptor.hpp"
-#include "runtime/reflectionCompat.hpp"
#include "utilities/accessFlags.hpp"
#include "utilities/growableArray.hpp"
@@ -120,16 +119,6 @@ class Reflection: public AllStatic {
// Create a java.lang.reflect.Field object based on a field descriptor
static oop new_field(fieldDescriptor* fd, bool intern_name, TRAPS);
- //---------------------------------------------------------------------------
- //
- // Support for old native code-based reflection (pre-JDK 1.4)
- //
- // NOTE: the method and constructor invocation code is still used
- // for startup time reasons; see reflectionCompat.hpp.
- //
- //---------------------------------------------------------------------------
-
-#ifdef SUPPORT_OLD_REFLECTION
private:
// method resolution for invoke
static methodHandle resolve_interface_call(instanceKlassHandle klass, methodHandle method, KlassHandle recv_klass, Handle receiver, TRAPS);
@@ -144,35 +133,11 @@ private:
// Conversion
static BasicType basic_type_mirror_to_basic_type(oop basic_type_mirror, TRAPS);
- static bool match_parameter_types(methodHandle method, objArrayHandle types, int parameter_count, TRAPS);
- // Creating new java.lang.reflect.xxx wrappers
- static oop new_field(FieldStream* st, TRAPS);
-
public:
- // Field lookup and verification.
- static bool resolve_field(Handle field_mirror, Handle& receiver, fieldDescriptor* fd, bool check_final, TRAPS);
-
- // Reflective field access. Returns type code. Throws IllegalArgumentException.
- static BasicType field_get(jvalue* value, fieldDescriptor* fd, Handle receiver);
- static void field_set(jvalue* value, fieldDescriptor* fd, Handle receiver, BasicType value_type, TRAPS);
-
- // Reflective lookup of fields. Returns java.lang.reflect.Field instances.
- static oop reflect_field(oop mirror, Symbol* field_name, jint which, TRAPS);
- static objArrayOop reflect_fields(oop mirror, jint which, TRAPS);
-
- // Reflective lookup of methods. Returns java.lang.reflect.Method instances.
- static oop reflect_method(oop mirror, Symbol* method_name, objArrayHandle types, jint which, TRAPS);
- static objArrayOop reflect_methods(oop mirror, jint which, TRAPS);
-
- // Reflective lookup of constructors. Returns java.lang.reflect.Constructor instances.
- static oop reflect_constructor(oop mirror, objArrayHandle types, jint which, TRAPS);
- static objArrayOop reflect_constructors(oop mirror, jint which, TRAPS);
-
// Method invokation through java.lang.reflect.Method
static oop invoke_method(oop method_mirror, Handle receiver, objArrayHandle args, TRAPS);
// Method invokation through java.lang.reflect.Constructor
static oop invoke_constructor(oop method_mirror, objArrayHandle args, TRAPS);
-#endif /* SUPPORT_OLD_REFLECTION */
};
diff --git a/hotspot/src/share/vm/runtime/reflectionUtils.hpp b/hotspot/src/share/vm/runtime/reflectionUtils.hpp
index c9eecaa..5d4ba50 100644
--- a/hotspot/src/share/vm/runtime/reflectionUtils.hpp
+++ b/hotspot/src/share/vm/runtime/reflectionUtils.hpp
@@ -107,10 +107,8 @@ class MethodStream : public KlassStream {
class FieldStream : public KlassStream {
private:
- int length() const { return fields()->length(); }
- constantPoolOop constants() const { return _klass->constants(); }
- protected:
- typeArrayOop fields() const { return _klass->fields(); }
+ int length() const { return _klass->java_fields_count(); }
+
public:
FieldStream(instanceKlassHandle klass, bool local_only, bool classes_only)
: KlassStream(klass, local_only, classes_only) {
@@ -118,26 +116,23 @@ class FieldStream : public KlassStream {
next();
}
- void next() { _index -= instanceKlass::next_offset; }
+ void next() { _index -= 1; }
// Accessors for current field
AccessFlags access_flags() const {
AccessFlags flags;
- flags.set_flags(fields()->ushort_at(index() + instanceKlass::access_flags_offset));
+ flags.set_flags(_klass->field_access_flags(_index));
return flags;
}
Symbol* name() const {
- int name_index = fields()->ushort_at(index() + instanceKlass::name_index_offset);
- return constants()->symbol_at(name_index);
+ return _klass->field_name(_index);
}
Symbol* signature() const {
- int signature_index = fields()->ushort_at(index() +
- instanceKlass::signature_index_offset);
- return constants()->symbol_at(signature_index);
+ return _klass->field_signature(_index);
}
// missing: initval()
int offset() const {
- return _klass->offset_from_fields( index() );
+ return _klass->field_offset( index() );
}
};
@@ -213,10 +208,10 @@ class FilteredFieldStream : public FieldStream {
}
int field_count();
void next() {
- _index -= instanceKlass::next_offset;
+ _index -= 1;
if (has_filtered_field()) {
while (_index >=0 && FilteredFieldsMap::is_filtered_field((klassOop)_klass(), offset())) {
- _index -= instanceKlass::next_offset;
+ _index -= 1;
}
}
}
diff --git a/hotspot/src/share/vm/runtime/safepoint.cpp b/hotspot/src/share/vm/runtime/safepoint.cpp
index bef8d6c..d338931 100644
--- a/hotspot/src/share/vm/runtime/safepoint.cpp
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp
@@ -78,6 +78,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/shared/concurrentGCThread.hpp"
diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.cpp b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
index fb08745..34369e8 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp
@@ -2130,9 +2130,9 @@ class AdapterFingerPrint : public CHeapObj {
public:
AdapterFingerPrint(int total_args_passed, BasicType* sig_bt) {
// The fingerprint is based on the BasicType signature encoded
- // into an array of ints with four entries per int.
+ // into an array of ints with eight entries per int.
int* ptr;
- int len = (total_args_passed + 3) >> 2;
+ int len = (total_args_passed + 7) >> 3;
if (len <= (int)(sizeof(_value._compact) / sizeof(int))) {
_value._compact[0] = _value._compact[1] = _value._compact[2] = 0;
// Storing the signature encoded as signed chars hits about 98%
@@ -2145,11 +2145,11 @@ class AdapterFingerPrint : public CHeapObj {
ptr = _value._fingerprint;
}
- // Now pack the BasicTypes with 4 per int
+ // Now pack the BasicTypes with 8 per int
int sig_index = 0;
for (int index = 0; index < len; index++) {
int value = 0;
- for (int byte = 0; byte < 4; byte++) {
+ for (int byte = 0; byte < 8; byte++) {
if (sig_index < total_args_passed) {
value = (value << 4) | adapter_encoding(sig_bt[sig_index++]);
}
@@ -2190,8 +2190,9 @@ class AdapterFingerPrint : public CHeapObj {
const char* as_string() {
stringStream st;
+ st.print("0x");
for (int i = 0; i < length(); i++) {
- st.print(PTR_FORMAT, value(i));
+ st.print("%08x", value(i));
}
return st.as_string();
}
diff --git a/hotspot/src/share/vm/runtime/sharedRuntime.hpp b/hotspot/src/share/vm/runtime/sharedRuntime.hpp
index d42ade4..145dacd 100644
--- a/hotspot/src/share/vm/runtime/sharedRuntime.hpp
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.hpp
@@ -45,6 +45,8 @@ class vframeStream;
// information, etc.
class SharedRuntime: AllStatic {
+ friend class VMStructs;
+
private:
static methodHandle resolve_sub_helper(JavaThread *thread,
bool is_virtual,
diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
index 13e3b82..d132c0e 100644
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.cpp
@@ -206,11 +206,7 @@ nmethod* SimpleThresholdPolicy::event(methodHandle method, methodHandle inlinee,
// Check if the method can be compiled, change level if necessary
void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, TRAPS) {
- // Take the given ceiling into the account.
- // NOTE: You can set it to 1 to get a pure C1 version.
- if ((CompLevel)TieredStopAtLevel < level) {
- level = (CompLevel)TieredStopAtLevel;
- }
+ assert(level <= TieredStopAtLevel, "Invalid compilation level");
if (level == CompLevel_none) {
return;
}
@@ -227,10 +223,10 @@ void SimpleThresholdPolicy::compile(methodHandle mh, int bci, CompLevel level, T
if (bci != InvocationEntryBci && mh->is_not_osr_compilable()) {
return;
}
- if (PrintTieredEvents) {
- print_event(COMPILE, mh, mh, bci, level);
- }
if (!CompileBroker::compilation_is_in_queue(mh, bci)) {
+ if (PrintTieredEvents) {
+ print_event(COMPILE, mh, mh, bci, level);
+ }
submit_compile(mh, bci, level, THREAD);
}
}
@@ -288,40 +284,42 @@ bool SimpleThresholdPolicy::is_mature(methodOop method) {
// Common transition function. Given a predicate determines if a method should transition to another level.
CompLevel SimpleThresholdPolicy::common(Predicate p, methodOop method, CompLevel cur_level) {
- if (is_trivial(method)) return CompLevel_simple;
-
CompLevel next_level = cur_level;
int i = method->invocation_count();
int b = method->backedge_count();
- switch(cur_level) {
- case CompLevel_none:
- // If we were at full profile level, would we switch to full opt?
- if (common(p, method, CompLevel_full_profile) == CompLevel_full_optimization) {
- next_level = CompLevel_full_optimization;
- } else if ((this->*p)(i, b, cur_level)) {
- next_level = CompLevel_full_profile;
- }
- break;
- case CompLevel_limited_profile:
- case CompLevel_full_profile:
- {
- methodDataOop mdo = method->method_data();
- if (mdo != NULL) {
- if (mdo->would_profile()) {
- int mdo_i = mdo->invocation_count_delta();
- int mdo_b = mdo->backedge_count_delta();
- if ((this->*p)(mdo_i, mdo_b, cur_level)) {
+ if (is_trivial(method)) {
+ next_level = CompLevel_simple;
+ } else {
+ switch(cur_level) {
+ case CompLevel_none:
+ // If we were at full profile level, would we switch to full opt?
+ if (common(p, method, CompLevel_full_profile) == CompLevel_full_optimization) {
+ next_level = CompLevel_full_optimization;
+ } else if ((this->*p)(i, b, cur_level)) {
+ next_level = CompLevel_full_profile;
+ }
+ break;
+ case CompLevel_limited_profile:
+ case CompLevel_full_profile:
+ {
+ methodDataOop mdo = method->method_data();
+ if (mdo != NULL) {
+ if (mdo->would_profile()) {
+ int mdo_i = mdo->invocation_count_delta();
+ int mdo_b = mdo->backedge_count_delta();
+ if ((this->*p)(mdo_i, mdo_b, cur_level)) {
+ next_level = CompLevel_full_optimization;
+ }
+ } else {
next_level = CompLevel_full_optimization;
}
- } else {
- next_level = CompLevel_full_optimization;
}
}
+ break;
}
- break;
}
- return next_level;
+ return MIN2(next_level, (CompLevel)TieredStopAtLevel);
}
// Determine if a method should be compiled with a normal entry point at a different level.
diff --git a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
index a7bad85..5aad121 100644
--- a/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
+++ b/hotspot/src/share/vm/runtime/simpleThresholdPolicy.hpp
@@ -98,6 +98,7 @@ public:
if (is_c2_compile(comp_level)) return c2_count();
return 0;
}
+ virtual CompLevel initial_compile_level() { return MIN2((CompLevel)TieredStopAtLevel, CompLevel_initial_compile); }
virtual void do_safepoint_work() { }
virtual void delay_compilation(methodOop method) { }
virtual void disable_compilation(methodOop method) { }
diff --git a/hotspot/src/share/vm/runtime/stubRoutines.cpp b/hotspot/src/share/vm/runtime/stubRoutines.cpp
index 6dd3a9f..f38173f 100644
--- a/hotspot/src/share/vm/runtime/stubRoutines.cpp
+++ b/hotspot/src/share/vm/runtime/stubRoutines.cpp
@@ -51,8 +51,6 @@ address StubRoutines::_catch_exception_entry = NULL;
address StubRoutines::_forward_exception_entry = NULL;
address StubRoutines::_throw_AbstractMethodError_entry = NULL;
address StubRoutines::_throw_IncompatibleClassChangeError_entry = NULL;
-address StubRoutines::_throw_ArithmeticException_entry = NULL;
-address StubRoutines::_throw_NullPointerException_entry = NULL;
address StubRoutines::_throw_NullPointerException_at_call_entry = NULL;
address StubRoutines::_throw_StackOverflowError_entry = NULL;
address StubRoutines::_throw_WrongMethodTypeException_entry = NULL;
@@ -108,6 +106,7 @@ address StubRoutines::_arrayof_jlong_disjoint_arraycopy = CAST_FROM_FN_PTR(addr
address StubRoutines::_arrayof_oop_disjoint_arraycopy = CAST_FROM_FN_PTR(address, StubRoutines::arrayof_oop_copy);
address StubRoutines::_arrayof_oop_disjoint_arraycopy_uninit = CAST_FROM_FN_PTR(address, StubRoutines::arrayof_oop_copy_uninit);
+address StubRoutines::_zero_aligned_words = CAST_FROM_FN_PTR(address, Copy::zero_to_words);
address StubRoutines::_checkcast_arraycopy = NULL;
address StubRoutines::_checkcast_arraycopy_uninit = NULL;
diff --git a/hotspot/src/share/vm/runtime/stubRoutines.hpp b/hotspot/src/share/vm/runtime/stubRoutines.hpp
index fff494e..8481dce 100644
--- a/hotspot/src/share/vm/runtime/stubRoutines.hpp
+++ b/hotspot/src/share/vm/runtime/stubRoutines.hpp
@@ -128,8 +128,6 @@ class StubRoutines: AllStatic {
static address _catch_exception_entry;
static address _throw_AbstractMethodError_entry;
static address _throw_IncompatibleClassChangeError_entry;
- static address _throw_ArithmeticException_entry;
- static address _throw_NullPointerException_entry;
static address _throw_NullPointerException_at_call_entry;
static address _throw_StackOverflowError_entry;
static address _throw_WrongMethodTypeException_entry;
@@ -199,6 +197,9 @@ class StubRoutines: AllStatic {
static address _arrayof_jshort_fill;
static address _arrayof_jint_fill;
+ // zero heap space aligned to jlong (8 bytes)
+ static address _zero_aligned_words;
+
// 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
@@ -251,8 +252,6 @@ class StubRoutines: AllStatic {
// Implicit exceptions
static address throw_AbstractMethodError_entry() { return _throw_AbstractMethodError_entry; }
static address throw_IncompatibleClassChangeError_entry(){ return _throw_IncompatibleClassChangeError_entry; }
- static address throw_ArithmeticException_entry() { return _throw_ArithmeticException_entry; }
- static address throw_NullPointerException_entry() { return _throw_NullPointerException_entry; }
static address throw_NullPointerException_at_call_entry(){ return _throw_NullPointerException_at_call_entry; }
static address throw_StackOverflowError_entry() { return _throw_StackOverflowError_entry; }
static address throw_WrongMethodTypeException_entry() { return _throw_WrongMethodTypeException_entry; }
@@ -332,6 +331,7 @@ class StubRoutines: AllStatic {
static address select_fill_function(BasicType t, bool aligned, const char* &name);
+ static address zero_aligned_words() { return _zero_aligned_words; }
static double intrinsic_log(double d) {
assert(_intrinsic_log != NULL, "must be defined");
diff --git a/hotspot/src/share/vm/runtime/synchronizer.cpp b/hotspot/src/share/vm/runtime/synchronizer.cpp
index d51be5c..09bbc1d 100644
--- a/hotspot/src/share/vm/runtime/synchronizer.cpp
+++ b/hotspot/src/share/vm/runtime/synchronizer.cpp
@@ -51,6 +51,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
#if defined(__GNUC__) && !defined(IA64)
// Need to inhibit inlining for older versions of GCC to avoid build-time failures
diff --git a/hotspot/src/share/vm/runtime/task.cpp b/hotspot/src/share/vm/runtime/task.cpp
index 4c0cff7..bd45d65 100644
--- a/hotspot/src/share/vm/runtime/task.cpp
+++ b/hotspot/src/share/vm/runtime/task.cpp
@@ -39,6 +39,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
int PeriodicTask::_num_tasks = 0;
PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks];
diff --git a/hotspot/src/share/vm/runtime/thread.cpp b/hotspot/src/share/vm/runtime/thread.cpp
index efad706..bc70cd3 100644
--- a/hotspot/src/share/vm/runtime/thread.cpp
+++ b/hotspot/src/share/vm/runtime/thread.cpp
@@ -89,6 +89,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
#include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
@@ -966,7 +970,7 @@ static void call_initializeSystemClass(TRAPS) {
// General purpose hook into Java code, run once when the VM is initialized.
// The Java library method itself may be changed independently from the VM.
static void call_postVMInitHook(TRAPS) {
- klassOop k = SystemDictionary::sun_misc_PostVMInitHook_klass();
+ klassOop k = SystemDictionary::PostVMInitHook_klass();
instanceKlassHandle klass (THREAD, k);
if (klass.not_null()) {
JavaValue result(T_VOID);
@@ -1272,7 +1276,6 @@ void JavaThread::initialize() {
_exception_oop = NULL;
_exception_pc = 0;
_exception_handler_pc = 0;
- _exception_stack_size = 0;
_is_method_handle_return = 0;
_jvmti_thread_state= NULL;
_should_post_on_exceptions_flag = JNI_FALSE;
@@ -2860,6 +2863,44 @@ void JavaThread::trace_frames() {
}
}
+class PrintAndVerifyOopClosure: public OopClosure {
+ protected:
+ template <class T> inline void do_oop_work(T* p) {
+ oop obj = oopDesc::load_decode_heap_oop(p);
+ if (obj == NULL) return;
+ tty->print(INTPTR_FORMAT ": ", p);
+ if (obj->is_oop_or_null()) {
+ if (obj->is_objArray()) {
+ tty->print_cr("valid objArray: " INTPTR_FORMAT, (oopDesc*) obj);
+ } else {
+ obj->print();
+ }
+ } else {
+ tty->print_cr("invalid oop: " INTPTR_FORMAT, (oopDesc*) obj);
+ }
+ tty->cr();
+ }
+ public:
+ virtual void do_oop(oop* p) { do_oop_work(p); }
+ virtual void do_oop(narrowOop* p) { do_oop_work(p); }
+};
+
+
+static void oops_print(frame* f, const RegisterMap *map) {
+ PrintAndVerifyOopClosure print;
+ f->print_value();
+ f->oops_do(&print, NULL, (RegisterMap*)map);
+}
+
+// Print our all the locations that contain oops and whether they are
+// valid or not. This useful when trying to find the oldest frame
+// where an oop has gone bad since the frame walk is from youngest to
+// oldest.
+void JavaThread::trace_oops() {
+ tty->print_cr("[Trace oops]");
+ frames_do(oops_print);
+}
+
#ifdef ASSERT
// Print or validate the layout of stack frames
diff --git a/hotspot/src/share/vm/runtime/thread.hpp b/hotspot/src/share/vm/runtime/thread.hpp
index 8387ab0..d507ebd 100644
--- a/hotspot/src/share/vm/runtime/thread.hpp
+++ b/hotspot/src/share/vm/runtime/thread.hpp
@@ -841,7 +841,6 @@ class JavaThread: public Thread {
volatile oop _exception_oop; // Exception thrown in compiled code
volatile address _exception_pc; // PC where exception happened
volatile address _exception_handler_pc; // PC for handler of exception
- volatile int _exception_stack_size; // Size of frame where exception happened
volatile int _is_method_handle_return; // true (== 1) if the current exception PC is a MethodHandle call site.
// support for compilation
@@ -1182,7 +1181,6 @@ class JavaThread: public Thread {
// Exception handling for compiled methods
oop exception_oop() const { return _exception_oop; }
- int exception_stack_size() const { return _exception_stack_size; }
address exception_pc() const { return _exception_pc; }
address exception_handler_pc() const { return _exception_handler_pc; }
bool is_method_handle_return() const { return _is_method_handle_return == 1; }
@@ -1190,7 +1188,6 @@ class JavaThread: public Thread {
void set_exception_oop(oop o) { _exception_oop = o; }
void set_exception_pc(address a) { _exception_pc = a; }
void set_exception_handler_pc(address a) { _exception_handler_pc = a; }
- void set_exception_stack_size(int size) { _exception_stack_size = size; }
void set_is_method_handle_return(bool value) { _is_method_handle_return = value ? 1 : 0; }
// Stack overflow support
@@ -1264,7 +1261,6 @@ class JavaThread: public Thread {
static ByteSize exception_oop_offset() { return byte_offset_of(JavaThread, _exception_oop ); }
static ByteSize exception_pc_offset() { return byte_offset_of(JavaThread, _exception_pc ); }
static ByteSize exception_handler_pc_offset() { return byte_offset_of(JavaThread, _exception_handler_pc); }
- static ByteSize exception_stack_size_offset() { return byte_offset_of(JavaThread, _exception_stack_size); }
static ByteSize is_method_handle_return_offset() { return byte_offset_of(JavaThread, _is_method_handle_return); }
static ByteSize stack_guard_state_offset() { return byte_offset_of(JavaThread, _stack_guard_state ); }
static ByteSize suspend_flags_offset() { return byte_offset_of(JavaThread, _suspend_flags ); }
@@ -1379,6 +1375,7 @@ public:
void trace_stack() PRODUCT_RETURN;
void trace_stack_from(vframe* start_vf) PRODUCT_RETURN;
void trace_frames() PRODUCT_RETURN;
+ void trace_oops() PRODUCT_RETURN;
// Print an annotated view of the stack frames
void print_frame_layout(int depth = 0, bool validate_only = false) NOT_DEBUG_RETURN;
@@ -1610,6 +1607,12 @@ public:
#ifdef TARGET_OS_ARCH_linux_ppc
# include "thread_linux_ppc.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "thread_bsd_x86.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "thread_bsd_zero.hpp"
+#endif
public:
diff --git a/hotspot/src/share/vm/runtime/threadLocalStorage.cpp b/hotspot/src/share/vm/runtime/threadLocalStorage.cpp
index 0b35cda..0cdc48a 100644
--- a/hotspot/src/share/vm/runtime/threadLocalStorage.cpp
+++ b/hotspot/src/share/vm/runtime/threadLocalStorage.cpp
@@ -36,6 +36,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
// static member initialization
int ThreadLocalStorage::_thread_index = -1;
diff --git a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp b/hotspot/src/share/vm/runtime/threadLocalStorage.hpp
index c936216..c2f7a9e 100644
--- a/hotspot/src/share/vm/runtime/threadLocalStorage.hpp
+++ b/hotspot/src/share/vm/runtime/threadLocalStorage.hpp
@@ -68,6 +68,12 @@ class ThreadLocalStorage : AllStatic {
#ifdef TARGET_OS_ARCH_linux_ppc
# include "threadLS_linux_ppc.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "threadLS_bsd_x86.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "threadLS_bsd_zero.hpp"
+#endif
public:
diff --git a/hotspot/src/share/vm/runtime/timer.cpp b/hotspot/src/share/vm/runtime/timer.cpp
index 8e6bbbe..ea05533 100644
--- a/hotspot/src/share/vm/runtime/timer.cpp
+++ b/hotspot/src/share/vm/runtime/timer.cpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
void elapsedTimer::add(elapsedTimer t) {
diff --git a/hotspot/src/share/vm/runtime/vframeArray.hpp b/hotspot/src/share/vm/runtime/vframeArray.hpp
index 7072d22..6f8d436 100644
--- a/hotspot/src/share/vm/runtime/vframeArray.hpp
+++ b/hotspot/src/share/vm/runtime/vframeArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -47,6 +47,8 @@ class StackValueCollection;
// represent an interpreter frame which will eventually be created.
class vframeArrayElement : public _ValueObj {
+ friend class VMStructs;
+
private:
frame _frame; // the interpreter frame we will unpack into
@@ -107,6 +109,8 @@ class vframeArrayElement : public _ValueObj {
// at the data in each vframeElement
class vframeArray: public CHeapObj {
+ friend class VMStructs;
+
private:
diff --git a/hotspot/src/share/vm/runtime/virtualspace.cpp b/hotspot/src/share/vm/runtime/virtualspace.cpp
index 97a00ca..5eeb1ee 100644
--- a/hotspot/src/share/vm/runtime/virtualspace.cpp
+++ b/hotspot/src/share/vm/runtime/virtualspace.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// ReservedSpace
@@ -68,7 +71,7 @@ ReservedSpace::align_reserved_region(char* addr, const size_t len,
assert(len >= required_size, "len too small");
const size_t s = size_t(addr);
- const size_t beg_ofs = s + prefix_size & suffix_align - 1;
+ const size_t beg_ofs = (s + prefix_size) & (suffix_align - 1);
const size_t beg_delta = beg_ofs == 0 ? 0 : suffix_align - beg_ofs;
if (len < beg_delta + required_size) {
@@ -113,8 +116,8 @@ char* ReservedSpace::reserve_and_align(const size_t reserve_size,
assert(res >= raw, "alignment decreased start addr");
assert(res + prefix_size + suffix_size <= raw + reserve_size,
"alignment increased end addr");
- assert((res & prefix_align - 1) == 0, "bad alignment of prefix");
- assert((res + prefix_size & suffix_align - 1) == 0,
+ assert((res & (prefix_align - 1)) == 0, "bad alignment of prefix");
+ assert(((res + prefix_size) & (suffix_align - 1)) == 0,
"bad alignment of suffix");
}
#endif
@@ -135,7 +138,7 @@ static bool failed_to_reserve_as_requested(char* base, char* requested_address,
assert(UseCompressedOops, "currently requested address used only for compressed oops");
if (PrintCompressedOopsMode) {
tty->cr();
- tty->print_cr("Reserved memory at not requested address: " PTR_FORMAT " vs " PTR_FORMAT, base, requested_address);
+ tty->print_cr("Reserved memory not at requested address: " PTR_FORMAT " vs " PTR_FORMAT, base, requested_address);
}
// OS ignored requested address. Try different address.
if (special) {
@@ -162,11 +165,11 @@ ReservedSpace::ReservedSpace(const size_t prefix_size,
assert(prefix_align != 0, "sanity");
assert(suffix_size != 0, "sanity");
assert(suffix_align != 0, "sanity");
- assert((prefix_size & prefix_align - 1) == 0,
+ assert((prefix_size & (prefix_align - 1)) == 0,
"prefix_size not divisible by prefix_align");
- assert((suffix_size & suffix_align - 1) == 0,
+ assert((suffix_size & (suffix_align - 1)) == 0,
"suffix_size not divisible by suffix_align");
- assert((suffix_align & prefix_align - 1) == 0,
+ assert((suffix_align & (prefix_align - 1)) == 0,
"suffix_align not divisible by prefix_align");
// Assert that if noaccess_prefix is used, it is the same as prefix_align.
@@ -210,8 +213,8 @@ ReservedSpace::ReservedSpace(const size_t prefix_size,
if (addr == NULL) return;
// Check whether the result has the needed alignment (unlikely unless
- // prefix_align == suffix_align).
- const size_t ofs = size_t(addr) + adjusted_prefix_size & suffix_align - 1;
+ // prefix_align < suffix_align).
+ const size_t ofs = (size_t(addr) + adjusted_prefix_size) & (suffix_align - 1);
if (ofs != 0) {
// Wrong alignment. Release, allocate more space and do manual alignment.
//
@@ -232,6 +235,15 @@ ReservedSpace::ReservedSpace(const size_t prefix_size,
addr = reserve_and_align(size + suffix_align, adjusted_prefix_size,
prefix_align, suffix_size, suffix_align);
}
+
+ if (requested_address != 0 &&
+ failed_to_reserve_as_requested(addr, requested_address, size, false)) {
+ // As a result of the alignment constraints, the allocated addr differs
+ // from the requested address. Return back to the caller who can
+ // take remedial action (like try again without a requested address).
+ assert(_base == NULL, "should be");
+ return;
+ }
}
_base = addr;
@@ -245,13 +257,19 @@ void ReservedSpace::initialize(size_t size, size_t alignment, bool large,
const size_t noaccess_prefix,
bool executable) {
const size_t granularity = os::vm_allocation_granularity();
- assert((size & granularity - 1) == 0,
+ assert((size & (granularity - 1)) == 0,
"size not aligned to os::vm_allocation_granularity()");
- assert((alignment & granularity - 1) == 0,
+ assert((alignment & (granularity - 1)) == 0,
"alignment not aligned to os::vm_allocation_granularity()");
assert(alignment == 0 || is_power_of_2((intptr_t)alignment),
"not a power of 2");
+ alignment = MAX2(alignment, (size_t)os::vm_page_size());
+
+ // Assert that if noaccess_prefix is used, it is the same as alignment.
+ assert(noaccess_prefix == 0 ||
+ noaccess_prefix == alignment, "noaccess prefix wrong");
+
_base = NULL;
_size = 0;
_special = false;
@@ -282,10 +300,8 @@ void ReservedSpace::initialize(size_t size, size_t alignment, bool large,
return;
}
// Check alignment constraints
- if (alignment > 0) {
- assert((uintptr_t) base % alignment == 0,
- "Large pages returned a non-aligned address");
- }
+ assert((uintptr_t) base % alignment == 0,
+ "Large pages returned a non-aligned address");
_special = true;
} else {
// failed; try to reserve regular memory below
@@ -321,7 +337,7 @@ void ReservedSpace::initialize(size_t size, size_t alignment, bool large,
if (base == NULL) return;
// Check alignment constraints
- if (alignment > 0 && ((size_t)base & alignment - 1) != 0) {
+ if ((((size_t)base + noaccess_prefix) & (alignment - 1)) != 0) {
// Base not aligned, retry
if (!os::release_memory(base, size)) fatal("os::release_memory failed");
// Reserve size large enough to do manual alignment and
@@ -338,12 +354,21 @@ void ReservedSpace::initialize(size_t size, size_t alignment, bool large,
os::release_memory(extra_base, extra_size);
base = os::reserve_memory(size, base);
} while (base == NULL);
+
+ if (requested_address != 0 &&
+ failed_to_reserve_as_requested(base, requested_address, size, false)) {
+ // As a result of the alignment constraints, the allocated base differs
+ // from the requested address. Return back to the caller who can
+ // take remedial action (like try again without a requested address).
+ assert(_base == NULL, "should be");
+ return;
+ }
}
}
// Done
_base = base;
_size = size;
- _alignment = MAX2(alignment, (size_t) os::vm_page_size());
+ _alignment = alignment;
_noaccess_prefix = noaccess_prefix;
// Assert that if noaccess_prefix is used, it is the same as alignment.
diff --git a/hotspot/src/share/vm/runtime/vmStructs.cpp b/hotspot/src/share/vm/runtime/vmStructs.cpp
index 6924e47..0ce636f 100644
--- a/hotspot/src/share/vm/runtime/vmStructs.cpp
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp
@@ -29,6 +29,11 @@
#include "classfile/placeholders.hpp"
#include "classfile/symbolTable.hpp"
#include "classfile/systemDictionary.hpp"
+#include "ci/ciField.hpp"
+#include "ci/ciInstance.hpp"
+#include "ci/ciObjArrayKlass.hpp"
+#include "ci/ciMethodData.hpp"
+#include "ci/ciSymbol.hpp"
#include "code/codeBlob.hpp"
#include "code/codeCache.hpp"
#include "code/compressedStream.hpp"
@@ -38,6 +43,7 @@
#include "code/stubs.hpp"
#include "code/vmreg.hpp"
#include "compiler/oopMap.hpp"
+#include "compiler/compileBroker.hpp"
#include "gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp"
#include "gc_implementation/shared/immutableSpace.hpp"
#include "gc_implementation/shared/markSweep.hpp"
@@ -90,6 +96,8 @@
#include "oops/typeArrayOop.hpp"
#include "prims/jvmtiAgentThread.hpp"
#include "runtime/arguments.hpp"
+#include "runtime/deoptimization.hpp"
+#include "runtime/vframeArray.hpp"
#include "runtime/globals.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
@@ -125,6 +133,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef TARGET_OS_ARCH_linux_x86
# include "vmStructs_linux_x86.hpp"
#endif
@@ -149,6 +160,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "vmStructs_linux_ppc.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "vmStructs_bsd_x86.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "vmStructs_bsd_zero.hpp"
+#endif
#ifndef SERIALGC
#include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp"
#include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
@@ -167,7 +184,23 @@
#include "gc_implementation/parallelScavenge/vmStructs_parallelgc.hpp"
#endif
#ifdef COMPILER2
+#include "opto/addnode.hpp"
+#include "opto/block.hpp"
+#include "opto/callnode.hpp"
+#include "opto/cfgnode.hpp"
+#include "opto/chaitin.hpp"
+#include "opto/divnode.hpp"
+#include "opto/locknode.hpp"
+#include "opto/loopnode.hpp"
+#include "opto/machnode.hpp"
#include "opto/matcher.hpp"
+#include "opto/mulnode.hpp"
+#include "opto/phaseX.hpp"
+#include "opto/parse.hpp"
+#include "opto/regalloc.hpp"
+#include "opto/rootnode.hpp"
+#include "opto/subnode.hpp"
+#include "opto/vectornode.hpp"
#ifdef TARGET_ARCH_MODEL_x86_32
# include "adfiles/adGlobals_x86_32.hpp"
#endif
@@ -261,6 +294,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(instanceKlass, _nof_implementors, int) \
nonstatic_field(instanceKlass, _implementors[0], klassOop) \
nonstatic_field(instanceKlass, _fields, typeArrayOop) \
+ nonstatic_field(instanceKlass, _java_fields_count, int) \
nonstatic_field(instanceKlass, _constants, constantPoolOop) \
nonstatic_field(instanceKlass, _class_loader, oop) \
nonstatic_field(instanceKlass, _protection_domain, oop) \
@@ -293,6 +327,10 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(instanceKlass, _methods_annotations, objArrayOop) \
nonstatic_field(instanceKlass, _methods_parameter_annotations, objArrayOop) \
nonstatic_field(instanceKlass, _methods_default_annotations, objArrayOop) \
+ nonstatic_field(instanceKlass, _dependencies, nmethodBucket*) \
+ nonstatic_field(nmethodBucket, _nmethod, nmethod*) \
+ nonstatic_field(nmethodBucket, _count, int) \
+ nonstatic_field(nmethodBucket, _next, nmethodBucket*) \
nonstatic_field(Klass, _super_check_offset, juint) \
nonstatic_field(Klass, _secondary_super_cache, klassOop) \
nonstatic_field(Klass, _secondary_supers, objArrayOop) \
@@ -311,17 +349,26 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(methodKlass, _alloc_size, juint) \
nonstatic_field(methodDataOopDesc, _size, int) \
nonstatic_field(methodDataOopDesc, _method, methodOop) \
+ nonstatic_field(methodDataOopDesc, _data_size, int) \
+ nonstatic_field(methodDataOopDesc, _data[0], intptr_t) \
+ nonstatic_field(methodDataOopDesc, _nof_decompiles, uint) \
+ nonstatic_field(methodDataOopDesc, _nof_overflow_recompiles, uint) \
+ nonstatic_field(methodDataOopDesc, _nof_overflow_traps, uint) \
+ nonstatic_field(methodDataOopDesc, _eflags, intx) \
+ nonstatic_field(methodDataOopDesc, _arg_local, intx) \
+ nonstatic_field(methodDataOopDesc, _arg_stack, intx) \
+ nonstatic_field(methodDataOopDesc, _arg_returned, intx) \
nonstatic_field(methodOopDesc, _constMethod, constMethodOop) \
nonstatic_field(methodOopDesc, _constants, constantPoolOop) \
- c2_nonstatic_field(methodOopDesc, _method_data, methodDataOop) \
- c2_nonstatic_field(methodOopDesc, _interpreter_invocation_count, int) \
+ nonstatic_field(methodOopDesc, _method_data, methodDataOop) \
+ nonstatic_field(methodOopDesc, _interpreter_invocation_count, int) \
nonstatic_field(methodOopDesc, _access_flags, AccessFlags) \
nonstatic_field(methodOopDesc, _vtable_index, int) \
nonstatic_field(methodOopDesc, _method_size, u2) \
nonstatic_field(methodOopDesc, _max_stack, u2) \
nonstatic_field(methodOopDesc, _max_locals, u2) \
nonstatic_field(methodOopDesc, _size_of_parameters, u2) \
- c2_nonstatic_field(methodOopDesc, _interpreter_throwout_count, u2) \
+ nonstatic_field(methodOopDesc, _interpreter_throwout_count, u2) \
nonstatic_field(methodOopDesc, _number_of_breakpoints, u2) \
nonstatic_field(methodOopDesc, _invocation_counter, InvocationCounter) \
nonstatic_field(methodOopDesc, _backedge_counter, InvocationCounter) \
@@ -407,7 +454,7 @@ static inline uint64_t cast_uint64_t(size_t x)
static_field(Universe, _constantPoolCacheKlassObj, klassOop) \
static_field(Universe, _compiledICHolderKlassObj, klassOop) \
static_field(Universe, _systemObjArrayKlassObj, klassOop) \
- static_field(Universe, _mirrors[0], oop) \
+ static_field(Universe, _mirrors[0], oop) \
static_field(Universe, _main_thread_group, oop) \
static_field(Universe, _system_thread_group, oop) \
static_field(Universe, _the_empty_byte_array, typeArrayOop) \
@@ -652,9 +699,16 @@ static inline uint64_t cast_uint64_t(size_t x)
static_field(SystemDictionary, WK_KLASS(ThreadGroup_klass), klassOop) \
static_field(SystemDictionary, WK_KLASS(Properties_klass), klassOop) \
static_field(SystemDictionary, WK_KLASS(StringBuffer_klass), klassOop) \
+ static_field(SystemDictionary, WK_KLASS(MethodHandle_klass), klassOop) \
static_field(SystemDictionary, _box_klasses[0], klassOop) \
static_field(SystemDictionary, _java_system_loader, oop) \
\
+ /*************/ \
+ /* vmSymbols */ \
+ /*************/ \
+ \
+ static_field(vmSymbols, _symbols[0], Symbol*) \
+ \
/*******************/ \
/* HashtableBucket */ \
/*******************/ \
@@ -707,6 +761,15 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(LoaderConstraintEntry, _max_loaders, int) \
nonstatic_field(LoaderConstraintEntry, _loaders, oop*) \
\
+ /*******************/ \
+ /* GrowableArrays */ \
+ /*******************/ \
+ \
+ nonstatic_field(GenericGrowableArray, _len, int) \
+ nonstatic_field(GenericGrowableArray, _max, int) \
+ nonstatic_field(GenericGrowableArray, _arena, Arena*) \
+ nonstatic_field(GrowableArray<int>, _data, int*) \
+ \
/********************************/ \
/* CodeCache (NOTE: incomplete) */ \
/********************************/ \
@@ -757,12 +820,19 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(PcDesc, _pc_offset, int) \
nonstatic_field(PcDesc, _scope_decode_offset, int) \
nonstatic_field(PcDesc, _obj_decode_offset, int) \
- nonstatic_field(PcDesc, _flags, PcDesc::PcDescFlags) \
+ nonstatic_field(PcDesc, _flags, int) \
\
/***************************************************/ \
/* CodeBlobs (NOTE: incomplete, but only a little) */ \
/***************************************************/ \
\
+ X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _sender_pc, address)) \
+ X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _exact_sender_sp, intptr_t*)) \
+ X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _sender_link, intptr_t*)) \
+ X86_ONLY(nonstatic_field(MethodHandles::RicochetFrame, _saved_args_base, intptr_t*)) \
+ \
+ static_field(SharedRuntime, _ricochet_blob, RicochetBlob*) \
+ \
nonstatic_field(CodeBlob, _name, const char*) \
nonstatic_field(CodeBlob, _size, int) \
nonstatic_field(CodeBlob, _header_size, int) \
@@ -774,6 +844,8 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(CodeBlob, _frame_size, int) \
nonstatic_field(CodeBlob, _oop_maps, OopMapSet*) \
\
+ nonstatic_field(RuntimeStub, _caller_must_gc_arguments, bool) \
+ \
/**************************************************/ \
/* NMethods (NOTE: incomplete, but only a little) */ \
/**************************************************/ \
@@ -786,6 +858,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(nmethod, _state, unsigned char) \
nonstatic_field(nmethod, _exception_offset, int) \
nonstatic_field(nmethod, _deoptimize_offset, int) \
+ nonstatic_field(nmethod, _deoptimize_mh_offset, int) \
nonstatic_field(nmethod, _orig_pc_offset, int) \
nonstatic_field(nmethod, _stub_offset, int) \
nonstatic_field(nmethod, _consts_offset, int) \
@@ -802,8 +875,14 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(nmethod, _lock_count, jint) \
nonstatic_field(nmethod, _stack_traversal_mark, long) \
nonstatic_field(nmethod, _compile_id, int) \
+ nonstatic_field(nmethod, _exception_cache, ExceptionCache*) \
nonstatic_field(nmethod, _marked_for_deoptimization, bool) \
\
+ nonstatic_field(RicochetBlob, _bounce_offset, int) \
+ nonstatic_field(RicochetBlob, _exception_offset, int) \
+ \
+ unchecked_c2_static_field(Deoptimization, _trap_reason_name, void*) \
+ \
/********************************/ \
/* JavaCalls (NOTE: incomplete) */ \
/********************************/ \
@@ -824,6 +903,9 @@ static inline uint64_t cast_uint64_t(size_t x)
static_field(Threads, _number_of_non_daemon_threads, int) \
static_field(Threads, _return_code, int) \
\
+ nonstatic_field(ThreadShadow, _pending_exception, oop) \
+ nonstatic_field(ThreadShadow, _exception_file, const char*) \
+ nonstatic_field(ThreadShadow, _exception_line, int) \
volatile_nonstatic_field(Thread, _suspend_flags, uint32_t) \
nonstatic_field(Thread, _active_handles, JNIHandleBlock*) \
nonstatic_field(Thread, _tlab, ThreadLocalAllocBuffer) \
@@ -835,10 +917,22 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(JavaThread, _next, JavaThread*) \
nonstatic_field(JavaThread, _threadObj, oop) \
nonstatic_field(JavaThread, _anchor, JavaFrameAnchor) \
+ nonstatic_field(JavaThread, _vm_result, oop) \
+ nonstatic_field(JavaThread, _vm_result_2, oop) \
+ nonstatic_field(JavaThread, _pending_async_exception, oop) \
+ volatile_nonstatic_field(JavaThread, _exception_oop, oop) \
+ volatile_nonstatic_field(JavaThread, _exception_pc, address) \
+ nonstatic_field(JavaThread, _is_compiling, bool) \
+ nonstatic_field(JavaThread, _special_runtime_exit_condition, JavaThread::AsyncRequests) \
+ nonstatic_field(JavaThread, _saved_exception_pc, address) \
volatile_nonstatic_field(JavaThread, _thread_state, JavaThreadState) \
nonstatic_field(JavaThread, _osthread, OSThread*) \
nonstatic_field(JavaThread, _stack_base, address) \
nonstatic_field(JavaThread, _stack_size, size_t) \
+ nonstatic_field(JavaThread, _vframe_array_head, vframeArray*) \
+ nonstatic_field(JavaThread, _vframe_array_last, vframeArray*) \
+ nonstatic_field(Thread, _resource_area, ResourceArea*) \
+ nonstatic_field(CompilerThread, _env, ciEnv*) \
\
/************/ \
/* OSThread */ \
@@ -888,7 +982,83 @@ static inline uint64_t cast_uint64_t(size_t x)
/* Runtime1 (NOTE: incomplete) */ \
/*******************************/ \
\
- unchecked_c1_static_field(Runtime1, _blobs, sizeof(Runtime1::_blobs)) /* NOTE: no type */ \
+ unchecked_c1_static_field(Runtime1, _blobs, sizeof(Runtime1::_blobs)) /* NOTE: no type */ \
+ \
+ /**************/ \
+ /* allocation */ \
+ /**************/ \
+ \
+ nonstatic_field(Chunk, _next, Chunk*) \
+ nonstatic_field(Chunk, _len, const size_t) \
+ \
+ nonstatic_field(Arena, _first, Chunk*) \
+ nonstatic_field(Arena, _chunk, Chunk*) \
+ nonstatic_field(Arena, _hwm, char*) \
+ nonstatic_field(Arena, _max, char*) \
+ \
+ /************/ \
+ /* CI */ \
+ /************/ \
+ \
+ nonstatic_field(ciEnv, _system_dictionary_modification_counter, int) \
+ nonstatic_field(ciEnv, _compiler_data, void*) \
+ nonstatic_field(ciEnv, _failure_reason, const char*) \
+ nonstatic_field(ciEnv, _factory, ciObjectFactory*) \
+ nonstatic_field(ciEnv, _dependencies, Dependencies*) \
+ nonstatic_field(ciEnv, _task, CompileTask*) \
+ nonstatic_field(ciEnv, _arena, Arena*) \
+ \
+ nonstatic_field(ciObject, _handle, jobject) \
+ nonstatic_field(ciObject, _klass, ciKlass*) \
+ nonstatic_field(ciObject, _ident, uint) \
+ \
+ nonstatic_field(ciSymbol, _ident, uint) \
+ nonstatic_field(ciSymbol, _symbol, Symbol*) \
+ \
+ nonstatic_field(ciType, _basic_type, BasicType) \
+ \
+ nonstatic_field(ciKlass, _name, ciSymbol*) \
+ \
+ nonstatic_field(ciArrayKlass, _dimension, jint) \
+ \
+ nonstatic_field(ciObjArrayKlass, _element_klass, ciKlass*) \
+ nonstatic_field(ciObjArrayKlass, _base_element_klass, ciKlass*) \
+ \
+ nonstatic_field(ciInstanceKlass, _init_state, instanceKlass::ClassState) \
+ nonstatic_field(ciInstanceKlass, _is_shared, bool) \
+ \
+ nonstatic_field(ciMethod, _interpreter_invocation_count, int) \
+ nonstatic_field(ciMethod, _interpreter_throwout_count, int) \
+ \
+ nonstatic_field(ciMethodData, _data_size, int) \
+ nonstatic_field(ciMethodData, _state, u_char) \
+ nonstatic_field(ciMethodData, _extra_data_size, int) \
+ nonstatic_field(ciMethodData, _data, intptr_t*) \
+ nonstatic_field(ciMethodData, _hint_di, int) \
+ nonstatic_field(ciMethodData, _eflags, intx) \
+ nonstatic_field(ciMethodData, _arg_local, intx) \
+ nonstatic_field(ciMethodData, _arg_stack, intx) \
+ nonstatic_field(ciMethodData, _arg_returned, intx) \
+ nonstatic_field(ciMethodData, _current_mileage, int) \
+ nonstatic_field(ciMethodData, _orig, methodDataOopDesc) \
+ \
+ nonstatic_field(ciField, _holder, ciInstanceKlass*) \
+ nonstatic_field(ciField, _name, ciSymbol*) \
+ nonstatic_field(ciField, _signature, ciSymbol*) \
+ nonstatic_field(ciField, _offset, int) \
+ nonstatic_field(ciField, _is_constant, bool) \
+ nonstatic_field(ciField, _constant_value, ciConstant) \
+ \
+ nonstatic_field(ciObjectFactory, _ci_objects, GrowableArray<ciObject*>*) \
+ nonstatic_field(ciObjectFactory, _symbols, GrowableArray<ciSymbol*>*) \
+ nonstatic_field(ciObjectFactory, _unloaded_methods, GrowableArray<ciMethod*>*) \
+ \
+ nonstatic_field(ciConstant, _type, BasicType) \
+ nonstatic_field(ciConstant, _value._int, jint) \
+ nonstatic_field(ciConstant, _value._long, jlong) \
+ nonstatic_field(ciConstant, _value._float, jfloat) \
+ nonstatic_field(ciConstant, _value._double, jdouble) \
+ nonstatic_field(ciConstant, _value._object, ciObject*) \
\
/************/ \
/* Monitors */ \
@@ -910,7 +1080,114 @@ static inline uint64_t cast_uint64_t(size_t x)
/* Matcher (C2 only) */ \
/*********************/ \
\
- unchecked_c2_static_field(Matcher, _regEncode, sizeof(Matcher::_regEncode)) /* NOTE: no type */ \
+ unchecked_c2_static_field(Matcher, _regEncode, sizeof(Matcher::_regEncode)) /* NOTE: no type */ \
+ \
+ c2_nonstatic_field(Node, _in, Node**) \
+ c2_nonstatic_field(Node, _out, Node**) \
+ c2_nonstatic_field(Node, _cnt, node_idx_t) \
+ c2_nonstatic_field(Node, _max, node_idx_t) \
+ c2_nonstatic_field(Node, _outcnt, node_idx_t) \
+ c2_nonstatic_field(Node, _outmax, node_idx_t) \
+ c2_nonstatic_field(Node, _idx, const node_idx_t) \
+ c2_nonstatic_field(Node, _class_id, jushort) \
+ c2_nonstatic_field(Node, _flags, jushort) \
+ \
+ c2_nonstatic_field(Compile, _root, RootNode*) \
+ c2_nonstatic_field(Compile, _unique, uint) \
+ c2_nonstatic_field(Compile, _entry_bci, int) \
+ c2_nonstatic_field(Compile, _top, Node*) \
+ c2_nonstatic_field(Compile, _cfg, PhaseCFG*) \
+ c2_nonstatic_field(Compile, _regalloc, PhaseRegAlloc*) \
+ c2_nonstatic_field(Compile, _method, ciMethod*) \
+ c2_nonstatic_field(Compile, _compile_id, const int) \
+ c2_nonstatic_field(Compile, _save_argument_registers, const bool) \
+ c2_nonstatic_field(Compile, _subsume_loads, const bool) \
+ c2_nonstatic_field(Compile, _do_escape_analysis, const bool) \
+ c2_nonstatic_field(Compile, _ilt, InlineTree*) \
+ \
+ c2_nonstatic_field(InlineTree, _caller_jvms, JVMState*) \
+ c2_nonstatic_field(InlineTree, _method, ciMethod*) \
+ c2_nonstatic_field(InlineTree, _caller_tree, InlineTree*) \
+ c2_nonstatic_field(InlineTree, _subtrees, GrowableArray<InlineTree*>) \
+ \
+ c2_nonstatic_field(OptoRegPair, _first, short) \
+ c2_nonstatic_field(OptoRegPair, _second, short) \
+ \
+ c2_nonstatic_field(JVMState, _caller, JVMState*) \
+ c2_nonstatic_field(JVMState, _depth, uint) \
+ c2_nonstatic_field(JVMState, _locoff, uint) \
+ c2_nonstatic_field(JVMState, _stkoff, uint) \
+ c2_nonstatic_field(JVMState, _monoff, uint) \
+ c2_nonstatic_field(JVMState, _scloff, uint) \
+ c2_nonstatic_field(JVMState, _endoff, uint) \
+ c2_nonstatic_field(JVMState, _sp, uint) \
+ c2_nonstatic_field(JVMState, _bci, int) \
+ c2_nonstatic_field(JVMState, _method, ciMethod*) \
+ c2_nonstatic_field(JVMState, _map, SafePointNode*) \
+ \
+ c2_nonstatic_field(SafePointNode, _jvms, JVMState* const) \
+ \
+ c2_nonstatic_field(MachSafePointNode, _jvms, JVMState*) \
+ c2_nonstatic_field(MachSafePointNode, _jvmadj, uint) \
+ \
+ c2_nonstatic_field(MachIfNode, _prob, jfloat) \
+ c2_nonstatic_field(MachIfNode, _fcnt, jfloat) \
+ \
+ c2_nonstatic_field(CallNode, _entry_point, address) \
+ \
+ c2_nonstatic_field(CallJavaNode, _method, ciMethod*) \
+ \
+ c2_nonstatic_field(CallRuntimeNode, _name, const char*) \
+ \
+ c2_nonstatic_field(CallStaticJavaNode, _name, const char*) \
+ \
+ c2_nonstatic_field(MachCallJavaNode, _method, ciMethod*) \
+ c2_nonstatic_field(MachCallJavaNode, _bci, int) \
+ \
+ c2_nonstatic_field(MachCallStaticJavaNode, _name, const char*) \
+ \
+ c2_nonstatic_field(MachCallRuntimeNode, _name, const char*) \
+ \
+ c2_nonstatic_field(PhaseCFG, _num_blocks, uint) \
+ c2_nonstatic_field(PhaseCFG, _blocks, Block_List) \
+ c2_nonstatic_field(PhaseCFG, _bbs, Block_Array) \
+ c2_nonstatic_field(PhaseCFG, _broot, Block*) \
+ \
+ c2_nonstatic_field(PhaseRegAlloc, _node_regs, OptoRegPair*) \
+ c2_nonstatic_field(PhaseRegAlloc, _node_regs_max_index, uint) \
+ c2_nonstatic_field(PhaseRegAlloc, _framesize, uint) \
+ c2_nonstatic_field(PhaseRegAlloc, _max_reg, OptoReg::Name) \
+ \
+ c2_nonstatic_field(PhaseChaitin, _trip_cnt, int) \
+ c2_nonstatic_field(PhaseChaitin, _alternate, int) \
+ c2_nonstatic_field(PhaseChaitin, _lo_degree, uint) \
+ c2_nonstatic_field(PhaseChaitin, _lo_stk_degree, uint) \
+ c2_nonstatic_field(PhaseChaitin, _hi_degree, uint) \
+ c2_nonstatic_field(PhaseChaitin, _simplified, uint) \
+ c2_nonstatic_field(PhaseChaitin, _maxlrg, uint) \
+ \
+ c2_nonstatic_field(Block, _nodes, Node_List) \
+ c2_nonstatic_field(Block, _succs, Block_Array) \
+ c2_nonstatic_field(Block, _num_succs, uint) \
+ c2_nonstatic_field(Block, _pre_order, uint) \
+ c2_nonstatic_field(Block, _dom_depth, uint) \
+ c2_nonstatic_field(Block, _idom, Block*) \
+ c2_nonstatic_field(Block, _freq, jfloat) \
+ \
+ c2_nonstatic_field(CFGElement, _freq, jfloat) \
+ \
+ c2_nonstatic_field(Block_List, _cnt, uint) \
+ \
+ c2_nonstatic_field(Block_Array, _size, uint) \
+ c2_nonstatic_field(Block_Array, _blocks, Block**) \
+ c2_nonstatic_field(Block_Array, _arena, Arena*) \
+ \
+ c2_nonstatic_field(Node_List, _cnt, uint) \
+ \
+ c2_nonstatic_field(Node_Array, _max, uint) \
+ c2_nonstatic_field(Node_Array, _nodes, Node**) \
+ c2_nonstatic_field(Node_Array, _a, Arena*) \
+ \
\
/*********************/ \
/* -XX flags */ \
@@ -920,6 +1197,7 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(Flag, name, const char*) \
unchecked_nonstatic_field(Flag, addr, sizeof(void*)) /* NOTE: no type */ \
nonstatic_field(Flag, kind, const char*) \
+ nonstatic_field(Flag, origin, FlagValueOrigin) \
static_field(Flag, flags, Flag*) \
static_field(Flag, numFlags, size_t) \
\
@@ -937,7 +1215,14 @@ static inline uint64_t cast_uint64_t(size_t x)
nonstatic_field(JDK_Version, _partially_initialized, bool) \
nonstatic_field(JDK_Version, _major, unsigned char) \
\
+ /*************************/ \
+ /* JVMTI */ \
+ /*************************/ \
\
+ static_field(JvmtiExport, _can_access_local_variables, bool) \
+ static_field(JvmtiExport, _can_hotswap_or_post_breakpoint, bool) \
+ static_field(JvmtiExport, _can_post_on_exceptions, bool) \
+ static_field(JvmtiExport, _can_walk_any_space, bool) \
\
/*************/ \
/* Arguments */ \
@@ -953,20 +1238,36 @@ static inline uint64_t cast_uint64_t(size_t x)
/* java_lang_Class fields */ \
/*********************************/ \
\
- static_field(java_lang_Class, klass_offset, int) \
- static_field(java_lang_Class, resolved_constructor_offset, int) \
- static_field(java_lang_Class, array_klass_offset, int) \
- static_field(java_lang_Class, oop_size_offset, int) \
- static_field(java_lang_Class, static_oop_field_count_offset, int) \
+ static_field(java_lang_Class, _klass_offset, int) \
+ static_field(java_lang_Class, _resolved_constructor_offset, int) \
+ static_field(java_lang_Class, _array_klass_offset, int) \
+ static_field(java_lang_Class, _oop_size_offset, int) \
+ static_field(java_lang_Class, _static_oop_field_count_offset, int) \
\
/************************/ \
/* Miscellaneous fields */ \
/************************/ \
\
- nonstatic_field(AccessFlags, _flags, jint) \
- nonstatic_field(elapsedTimer, _counter, jlong) \
- nonstatic_field(elapsedTimer, _active, bool) \
- nonstatic_field(InvocationCounter, _counter, unsigned int)
+ nonstatic_field(CompileTask, _method, jobject) \
+ nonstatic_field(CompileTask, _osr_bci, int) \
+ nonstatic_field(CompileTask, _comp_level, int) \
+ nonstatic_field(CompileTask, _compile_id, uint) \
+ nonstatic_field(CompileTask, _next, CompileTask*) \
+ nonstatic_field(CompileTask, _prev, CompileTask*) \
+ \
+ nonstatic_field(vframeArray, _next, vframeArray*) \
+ nonstatic_field(vframeArray, _original, frame) \
+ nonstatic_field(vframeArray, _caller, frame) \
+ nonstatic_field(vframeArray, _frames, int) \
+ \
+ nonstatic_field(vframeArrayElement, _frame, frame) \
+ nonstatic_field(vframeArrayElement, _bci, int) \
+ nonstatic_field(vframeArrayElement, _method, methodOop) \
+ \
+ nonstatic_field(AccessFlags, _flags, jint) \
+ nonstatic_field(elapsedTimer, _counter, jlong) \
+ nonstatic_field(elapsedTimer, _active, bool) \
+ nonstatic_field(InvocationCounter, _counter, unsigned int)
/* 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 */
@@ -1046,12 +1347,16 @@ static inline uint64_t cast_uint64_t(size_t x)
/* and are valid types for Fields. */ \
/*********************************************************************/ \
declare_integer_type(bool) \
+ declare_integer_type(short) \
declare_integer_type(int) \
declare_integer_type(long) \
declare_integer_type(char) \
declare_unsigned_integer_type(unsigned char) \
+ declare_unsigned_integer_type(u_char) \
declare_unsigned_integer_type(unsigned int) \
+ declare_unsigned_integer_type(uint) \
declare_unsigned_integer_type(unsigned short) \
+ declare_unsigned_integer_type(jushort) \
declare_unsigned_integer_type(unsigned long) \
/* The compiler thinks this is a different type than */ \
/* unsigned short on Win32 */ \
@@ -1065,7 +1370,6 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(int*) \
declare_toplevel_type(char*) \
declare_toplevel_type(char**) \
- declare_toplevel_type(const char*) \
declare_toplevel_type(u_char*) \
declare_toplevel_type(unsigned char*) \
\
@@ -1077,14 +1381,12 @@ static inline uint64_t cast_uint64_t(size_t x)
\
declare_unsigned_integer_type(size_t) \
declare_integer_type(ssize_t) \
- declare_unsigned_integer_type(const size_t) \
declare_integer_type(intx) \
declare_integer_type(intptr_t) \
declare_unsigned_integer_type(uintx) \
declare_unsigned_integer_type(uintptr_t) \
declare_unsigned_integer_type(uint32_t) \
declare_unsigned_integer_type(uint64_t) \
- declare_integer_type(const int) \
\
/*******************************************************************************/ \
/* OopDesc and Klass hierarchies (NOTE: missing methodDataOop-related classes) */ \
@@ -1110,8 +1412,8 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_type(klassKlass, Klass) \
declare_type(klassOopDesc, oopDesc) \
declare_type(markOopDesc, oopDesc) \
- declare_type(methodDataKlass, Klass) \
- declare_type(methodDataOopDesc, oopDesc) \
+ declare_type(methodDataKlass, Klass) \
+ declare_type(methodDataOopDesc, oopDesc) \
declare_type(methodKlass, Klass) \
declare_type(constMethodKlass, Klass) \
declare_type(methodOopDesc, oopDesc) \
@@ -1125,6 +1427,8 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(Symbol) \
declare_toplevel_type(Symbol*) \
\
+ declare_toplevel_type(nmethodBucket) \
+ \
/********/ \
/* Oops */ \
/********/ \
@@ -1192,7 +1496,6 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(GenerationSpec) \
declare_toplevel_type(HeapWord) \
declare_toplevel_type(MemRegion) \
- declare_toplevel_type(const MemRegion) \
declare_toplevel_type(PermanentGenerationSpec) \
declare_toplevel_type(ThreadLocalAllocBuffer) \
declare_toplevel_type(VirtualSpace) \
@@ -1251,8 +1554,15 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_type(LoaderConstraintEntry, HashtableEntry<klassOop>) \
declare_toplevel_type(HashtableBucket) \
declare_toplevel_type(SystemDictionary) \
+ declare_toplevel_type(vmSymbols) \
declare_toplevel_type(ProtectionDomainEntry) \
\
+ declare_toplevel_type(GenericGrowableArray) \
+ declare_toplevel_type(GrowableArray<int>) \
+ declare_toplevel_type(Arena) \
+ declare_type(ResourceArea, Arena) \
+ declare_toplevel_type(Chunk) \
+ \
/***********************************************************/ \
/* Thread hierarchy (needed for run-time type information) */ \
/***********************************************************/ \
@@ -1265,7 +1575,7 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_type(JavaThread, Thread) \
declare_type(JvmtiAgentThread, JavaThread) \
declare_type(ServiceThread, JavaThread) \
- declare_type(CompilerThread, JavaThread) \
+ declare_type(CompilerThread, JavaThread) \
declare_toplevel_type(OSThread) \
declare_toplevel_type(JavaFrameAnchor) \
\
@@ -1281,7 +1591,6 @@ static inline uint64_t cast_uint64_t(size_t x)
\
declare_toplevel_type(StubQueue) \
declare_toplevel_type(StubRoutines) \
- IA32_ONLY(declare_toplevel_type(StubRoutines::x86)) \
declare_toplevel_type(Stub) \
declare_type(InterpreterCodelet, Stub) \
\
@@ -1311,24 +1620,32 @@ static inline uint64_t cast_uint64_t(size_t x)
/* CodeBlob hierarchy (needed for run-time type information) */ \
/*************************************************************/ \
\
+ declare_toplevel_type(SharedRuntime) \
+ X86_ONLY(declare_toplevel_type(MethodHandles::RicochetFrame)) \
+ \
declare_toplevel_type(CodeBlob) \
- declare_type(BufferBlob, CodeBlob) \
- declare_type(AdapterBlob, BufferBlob) \
- declare_type(nmethod, CodeBlob) \
- declare_type(RuntimeStub, CodeBlob) \
- declare_type(SingletonBlob, CodeBlob) \
- declare_type(SafepointBlob, SingletonBlob) \
- declare_type(DeoptimizationBlob, SingletonBlob) \
- declare_type(RicochetBlob, SingletonBlob) \
- declare_c2_type(ExceptionBlob, SingletonBlob) \
- declare_c2_type(UncommonTrapBlob, CodeBlob) \
+ declare_type(BufferBlob, CodeBlob) \
+ declare_type(AdapterBlob, BufferBlob) \
+ declare_type(MethodHandlesAdapterBlob, BufferBlob) \
+ declare_type(nmethod, CodeBlob) \
+ declare_type(RuntimeStub, CodeBlob) \
+ declare_type(SingletonBlob, CodeBlob) \
+ declare_type(SafepointBlob, SingletonBlob) \
+ declare_type(DeoptimizationBlob, SingletonBlob) \
+ declare_type(RicochetBlob, SingletonBlob) \
+ declare_c2_type(ExceptionBlob, SingletonBlob) \
+ declare_c2_type(UncommonTrapBlob, CodeBlob) \
\
/***************************************/ \
/* PcDesc and other compiled code info */ \
/***************************************/ \
\
declare_toplevel_type(PcDesc) \
- declare_integer_type(PcDesc::PcDescFlags) \
+ declare_toplevel_type(ExceptionCache) \
+ declare_toplevel_type(PcDescCache) \
+ declare_toplevel_type(Dependencies) \
+ declare_toplevel_type(CompileTask) \
+ declare_toplevel_type(Deoptimization) \
\
/************************/ \
/* OopMap and OopMapSet */ \
@@ -1355,6 +1672,7 @@ static inline uint64_t cast_uint64_t(size_t x)
\
declare_toplevel_type(JNIHandles) \
declare_toplevel_type(JNIHandleBlock) \
+ declare_toplevel_type(jobject) \
\
/**********************/ \
/* Runtime1 (C1 only) */ \
@@ -1375,9 +1693,349 @@ static inline uint64_t cast_uint64_t(size_t x)
/* Matcher (C2 only) */ \
/*********************/ \
\
- /* NOTE: this is not really a toplevel type, but we only need */ \
- /* this one -- FIXME later if necessary */ \
declare_c2_toplevel_type(Matcher) \
+ declare_c2_toplevel_type(Compile) \
+ declare_c2_toplevel_type(InlineTree) \
+ declare_c2_toplevel_type(OptoRegPair) \
+ declare_c2_toplevel_type(JVMState) \
+ declare_c2_toplevel_type(Phase) \
+ declare_c2_type(PhaseCFG, Phase) \
+ declare_c2_type(PhaseRegAlloc, Phase) \
+ declare_c2_type(PhaseChaitin, PhaseRegAlloc) \
+ declare_c2_toplevel_type(CFGElement) \
+ declare_c2_type(Block, CFGElement) \
+ declare_c2_toplevel_type(Block_Array) \
+ declare_c2_type(Block_List, Block_Array) \
+ declare_c2_toplevel_type(Node_Array) \
+ declare_c2_type(Node_List, Node_Array) \
+ declare_c2_type(Unique_Node_List, Node_List) \
+ declare_c2_toplevel_type(Node) \
+ declare_c2_type(AddNode, Node) \
+ declare_c2_type(AddINode, AddNode) \
+ declare_c2_type(AddLNode, AddNode) \
+ declare_c2_type(AddFNode, AddNode) \
+ declare_c2_type(AddDNode, AddNode) \
+ declare_c2_type(AddPNode, Node) \
+ declare_c2_type(OrINode, AddNode) \
+ declare_c2_type(OrLNode, AddNode) \
+ declare_c2_type(XorINode, AddNode) \
+ declare_c2_type(XorLNode, AddNode) \
+ declare_c2_type(MaxNode, AddNode) \
+ declare_c2_type(MaxINode, MaxNode) \
+ declare_c2_type(MinINode, MaxNode) \
+ declare_c2_type(StartNode, MultiNode) \
+ declare_c2_type(StartOSRNode, StartNode) \
+ declare_c2_type(ParmNode, ProjNode) \
+ declare_c2_type(ReturnNode, Node) \
+ declare_c2_type(RethrowNode, Node) \
+ declare_c2_type(TailCallNode, ReturnNode) \
+ declare_c2_type(TailJumpNode, ReturnNode) \
+ declare_c2_type(SafePointNode, MultiNode) \
+ declare_c2_type(CallNode, SafePointNode) \
+ declare_c2_type(CallJavaNode, CallNode) \
+ declare_c2_type(CallStaticJavaNode, CallJavaNode) \
+ declare_c2_type(CallDynamicJavaNode, CallJavaNode) \
+ declare_c2_type(CallRuntimeNode, CallNode) \
+ declare_c2_type(CallLeafNode, CallRuntimeNode) \
+ declare_c2_type(CallLeafNoFPNode, CallLeafNode) \
+ declare_c2_type(AllocateNode, CallNode) \
+ declare_c2_type(AllocateArrayNode, AllocateNode) \
+ declare_c2_type(LockNode, AbstractLockNode) \
+ declare_c2_type(UnlockNode, AbstractLockNode) \
+ declare_c2_type(FastLockNode, CmpNode) \
+ declare_c2_type(FastUnlockNode, CmpNode) \
+ declare_c2_type(RegionNode, Node) \
+ declare_c2_type(JProjNode, ProjNode) \
+ declare_c2_type(PhiNode, TypeNode) \
+ declare_c2_type(GotoNode, Node) \
+ declare_c2_type(CProjNode, ProjNode) \
+ declare_c2_type(MultiBranchNode, MultiNode) \
+ declare_c2_type(IfNode, MultiBranchNode) \
+ declare_c2_type(IfTrueNode, CProjNode) \
+ declare_c2_type(IfFalseNode, CProjNode) \
+ declare_c2_type(PCTableNode, MultiBranchNode) \
+ declare_c2_type(JumpNode, PCTableNode) \
+ declare_c2_type(JumpProjNode, JProjNode) \
+ declare_c2_type(CatchNode, PCTableNode) \
+ declare_c2_type(CatchProjNode, CProjNode) \
+ declare_c2_type(CreateExNode, TypeNode) \
+ declare_c2_type(ClearArrayNode, Node) \
+ declare_c2_type(NeverBranchNode, MultiBranchNode) \
+ declare_c2_type(ConNode, TypeNode) \
+ declare_c2_type(ConINode, ConNode) \
+ declare_c2_type(ConPNode, ConNode) \
+ declare_c2_type(ConNNode, ConNode) \
+ declare_c2_type(ConLNode, ConNode) \
+ declare_c2_type(ConFNode, ConNode) \
+ declare_c2_type(ConDNode, ConNode) \
+ declare_c2_type(BinaryNode, Node) \
+ declare_c2_type(CMoveNode, TypeNode) \
+ declare_c2_type(CMoveDNode, CMoveNode) \
+ declare_c2_type(CMoveFNode, CMoveNode) \
+ declare_c2_type(CMoveINode, CMoveNode) \
+ declare_c2_type(CMoveLNode, CMoveNode) \
+ declare_c2_type(CMovePNode, CMoveNode) \
+ declare_c2_type(CMoveNNode, CMoveNode) \
+ declare_c2_type(EncodePNode, TypeNode) \
+ declare_c2_type(DecodeNNode, TypeNode) \
+ declare_c2_type(ConstraintCastNode, TypeNode) \
+ declare_c2_type(CastIINode, ConstraintCastNode) \
+ declare_c2_type(CastPPNode, ConstraintCastNode) \
+ declare_c2_type(CheckCastPPNode, TypeNode) \
+ declare_c2_type(Conv2BNode, Node) \
+ declare_c2_type(ConvD2FNode, Node) \
+ declare_c2_type(ConvD2INode, Node) \
+ declare_c2_type(ConvD2LNode, Node) \
+ declare_c2_type(ConvF2DNode, Node) \
+ declare_c2_type(ConvF2INode, Node) \
+ declare_c2_type(ConvF2LNode, Node) \
+ declare_c2_type(ConvI2DNode, Node) \
+ declare_c2_type(ConvI2FNode, Node) \
+ declare_c2_type(ConvI2LNode, TypeNode) \
+ declare_c2_type(ConvL2DNode, Node) \
+ declare_c2_type(ConvL2FNode, Node) \
+ declare_c2_type(ConvL2INode, Node) \
+ declare_c2_type(CastX2PNode, Node) \
+ declare_c2_type(CastP2XNode, Node) \
+ declare_c2_type(MemBarNode, MultiNode) \
+ declare_c2_type(MemBarAcquireNode, MemBarNode) \
+ declare_c2_type(MemBarReleaseNode, MemBarNode) \
+ declare_c2_type(MemBarVolatileNode, MemBarNode) \
+ declare_c2_type(MemBarCPUOrderNode, MemBarNode) \
+ declare_c2_type(InitializeNode, MemBarNode) \
+ declare_c2_type(ThreadLocalNode, Node) \
+ declare_c2_type(Opaque1Node, Node) \
+ declare_c2_type(Opaque2Node, Node) \
+ declare_c2_type(PartialSubtypeCheckNode, Node) \
+ declare_c2_type(MoveI2FNode, Node) \
+ declare_c2_type(MoveL2DNode, Node) \
+ declare_c2_type(MoveF2INode, Node) \
+ declare_c2_type(MoveD2LNode, Node) \
+ declare_c2_type(DivINode, Node) \
+ declare_c2_type(DivLNode, Node) \
+ declare_c2_type(DivFNode, Node) \
+ declare_c2_type(DivDNode, Node) \
+ declare_c2_type(ModINode, Node) \
+ declare_c2_type(ModLNode, Node) \
+ declare_c2_type(ModFNode, Node) \
+ declare_c2_type(ModDNode, Node) \
+ declare_c2_type(DivModNode, MultiNode) \
+ declare_c2_type(DivModINode, DivModNode) \
+ declare_c2_type(DivModLNode, DivModNode) \
+ declare_c2_type(BoxLockNode, Node) \
+ declare_c2_type(LoopNode, RegionNode) \
+ declare_c2_type(CountedLoopNode, LoopNode) \
+ declare_c2_type(CountedLoopEndNode, IfNode) \
+ declare_c2_type(MachNode, Node) \
+ declare_c2_type(MachIdealNode, MachNode) \
+ declare_c2_type(MachTypeNode, MachNode) \
+ declare_c2_type(MachBreakpointNode, MachIdealNode) \
+ declare_c2_type(MachUEPNode, MachIdealNode) \
+ declare_c2_type(MachPrologNode, MachIdealNode) \
+ declare_c2_type(MachEpilogNode, MachIdealNode) \
+ declare_c2_type(MachNopNode, MachIdealNode) \
+ declare_c2_type(MachSpillCopyNode, MachIdealNode) \
+ declare_c2_type(MachNullCheckNode, MachIdealNode) \
+ declare_c2_type(MachProjNode, ProjNode) \
+ declare_c2_type(MachIfNode, MachNode) \
+ declare_c2_type(MachFastLockNode, MachNode) \
+ declare_c2_type(MachReturnNode, MachNode) \
+ declare_c2_type(MachSafePointNode, MachReturnNode) \
+ declare_c2_type(MachCallNode, MachSafePointNode) \
+ declare_c2_type(MachCallJavaNode, MachCallNode) \
+ declare_c2_type(MachCallStaticJavaNode, MachCallJavaNode) \
+ declare_c2_type(MachCallDynamicJavaNode, MachCallJavaNode) \
+ declare_c2_type(MachCallRuntimeNode, MachCallNode) \
+ declare_c2_type(MachHaltNode, MachReturnNode) \
+ declare_c2_type(MachTempNode, MachNode) \
+ declare_c2_type(MemNode, Node) \
+ declare_c2_type(MergeMemNode, Node) \
+ declare_c2_type(LoadNode, MemNode) \
+ declare_c2_type(LoadBNode, LoadNode) \
+ declare_c2_type(LoadUSNode, LoadNode) \
+ declare_c2_type(LoadINode, LoadNode) \
+ declare_c2_type(LoadRangeNode, LoadINode) \
+ declare_c2_type(LoadLNode, LoadNode) \
+ declare_c2_type(LoadL_unalignedNode, LoadLNode) \
+ declare_c2_type(LoadFNode, LoadNode) \
+ declare_c2_type(LoadDNode, LoadNode) \
+ declare_c2_type(LoadD_unalignedNode, LoadDNode) \
+ declare_c2_type(LoadPNode, LoadNode) \
+ declare_c2_type(LoadNNode, LoadNode) \
+ declare_c2_type(LoadKlassNode, LoadPNode) \
+ declare_c2_type(LoadNKlassNode, LoadNNode) \
+ declare_c2_type(LoadSNode, LoadNode) \
+ declare_c2_type(StoreNode, MemNode) \
+ declare_c2_type(StoreBNode, StoreNode) \
+ declare_c2_type(StoreCNode, StoreNode) \
+ declare_c2_type(StoreINode, StoreNode) \
+ declare_c2_type(StoreLNode, StoreNode) \
+ declare_c2_type(StoreFNode, StoreNode) \
+ declare_c2_type(StoreDNode, StoreNode) \
+ declare_c2_type(StorePNode, StoreNode) \
+ declare_c2_type(StoreNNode, StoreNode) \
+ declare_c2_type(StoreCMNode, StoreNode) \
+ declare_c2_type(LoadPLockedNode, LoadPNode) \
+ declare_c2_type(LoadLLockedNode, LoadLNode) \
+ declare_c2_type(SCMemProjNode, ProjNode) \
+ declare_c2_type(LoadStoreNode, Node) \
+ declare_c2_type(StorePConditionalNode, LoadStoreNode) \
+ declare_c2_type(StoreLConditionalNode, LoadStoreNode) \
+ declare_c2_type(CompareAndSwapLNode, LoadStoreNode) \
+ declare_c2_type(CompareAndSwapINode, LoadStoreNode) \
+ declare_c2_type(CompareAndSwapPNode, LoadStoreNode) \
+ declare_c2_type(CompareAndSwapNNode, LoadStoreNode) \
+ declare_c2_type(PrefetchReadNode, Node) \
+ declare_c2_type(PrefetchWriteNode, Node) \
+ declare_c2_type(MulNode, Node) \
+ declare_c2_type(MulINode, MulNode) \
+ declare_c2_type(MulLNode, MulNode) \
+ declare_c2_type(MulFNode, MulNode) \
+ declare_c2_type(MulDNode, MulNode) \
+ declare_c2_type(MulHiLNode, Node) \
+ declare_c2_type(AndINode, MulINode) \
+ declare_c2_type(AndLNode, MulLNode) \
+ declare_c2_type(LShiftINode, Node) \
+ declare_c2_type(LShiftLNode, Node) \
+ declare_c2_type(RShiftINode, Node) \
+ declare_c2_type(RShiftLNode, Node) \
+ declare_c2_type(URShiftINode, Node) \
+ declare_c2_type(URShiftLNode, Node) \
+ declare_c2_type(MultiNode, Node) \
+ declare_c2_type(ProjNode, Node) \
+ declare_c2_type(TypeNode, Node) \
+ declare_c2_type(NodeHash, StackObj) \
+ declare_c2_type(RootNode, LoopNode) \
+ declare_c2_type(HaltNode, Node) \
+ declare_c2_type(SubNode, Node) \
+ declare_c2_type(SubINode, SubNode) \
+ declare_c2_type(SubLNode, SubNode) \
+ declare_c2_type(SubFPNode, SubNode) \
+ declare_c2_type(SubFNode, SubFPNode) \
+ declare_c2_type(SubDNode, SubFPNode) \
+ declare_c2_type(CmpNode, SubNode) \
+ declare_c2_type(CmpINode, CmpNode) \
+ declare_c2_type(CmpUNode, CmpNode) \
+ declare_c2_type(CmpPNode, CmpNode) \
+ declare_c2_type(CmpNNode, CmpNode) \
+ declare_c2_type(CmpLNode, CmpNode) \
+ declare_c2_type(CmpL3Node, CmpLNode) \
+ declare_c2_type(CmpFNode, CmpNode) \
+ declare_c2_type(CmpF3Node, CmpFNode) \
+ declare_c2_type(CmpDNode, CmpNode) \
+ declare_c2_type(CmpD3Node, CmpDNode) \
+ declare_c2_type(BoolNode, Node) \
+ declare_c2_type(AbsNode, Node) \
+ declare_c2_type(AbsINode, AbsNode) \
+ declare_c2_type(AbsFNode, AbsNode) \
+ declare_c2_type(AbsDNode, AbsNode) \
+ declare_c2_type(CmpLTMaskNode, Node) \
+ declare_c2_type(NegNode, Node) \
+ declare_c2_type(NegFNode, NegNode) \
+ declare_c2_type(NegDNode, NegNode) \
+ declare_c2_type(CosDNode, Node) \
+ declare_c2_type(SinDNode, Node) \
+ declare_c2_type(TanDNode, Node) \
+ declare_c2_type(AtanDNode, Node) \
+ declare_c2_type(SqrtDNode, Node) \
+ declare_c2_type(ExpDNode, Node) \
+ declare_c2_type(LogDNode, Node) \
+ declare_c2_type(Log10DNode, Node) \
+ declare_c2_type(PowDNode, Node) \
+ declare_c2_type(ReverseBytesINode, Node) \
+ declare_c2_type(ReverseBytesLNode, Node) \
+ declare_c2_type(VectorNode, Node) \
+ declare_c2_type(AddVBNode, VectorNode) \
+ declare_c2_type(AddVCNode, VectorNode) \
+ declare_c2_type(AddVSNode, VectorNode) \
+ declare_c2_type(AddVINode, VectorNode) \
+ declare_c2_type(AddVLNode, VectorNode) \
+ declare_c2_type(AddVFNode, VectorNode) \
+ declare_c2_type(AddVDNode, VectorNode) \
+ declare_c2_type(SubVBNode, VectorNode) \
+ declare_c2_type(SubVCNode, VectorNode) \
+ declare_c2_type(SubVSNode, VectorNode) \
+ declare_c2_type(SubVINode, VectorNode) \
+ declare_c2_type(SubVLNode, VectorNode) \
+ declare_c2_type(SubVFNode, VectorNode) \
+ declare_c2_type(SubVDNode, VectorNode) \
+ declare_c2_type(MulVFNode, VectorNode) \
+ declare_c2_type(MulVDNode, VectorNode) \
+ declare_c2_type(DivVFNode, VectorNode) \
+ declare_c2_type(DivVDNode, VectorNode) \
+ declare_c2_type(LShiftVBNode, VectorNode) \
+ declare_c2_type(LShiftVCNode, VectorNode) \
+ declare_c2_type(LShiftVSNode, VectorNode) \
+ declare_c2_type(LShiftVINode, VectorNode) \
+ declare_c2_type(URShiftVBNode, VectorNode) \
+ declare_c2_type(URShiftVCNode, VectorNode) \
+ declare_c2_type(URShiftVSNode, VectorNode) \
+ declare_c2_type(URShiftVINode, VectorNode) \
+ declare_c2_type(AndVNode, VectorNode) \
+ declare_c2_type(OrVNode, VectorNode) \
+ declare_c2_type(XorVNode, VectorNode) \
+ declare_c2_type(VectorLoadNode, LoadNode) \
+ declare_c2_type(Load16BNode, VectorLoadNode) \
+ declare_c2_type(Load8BNode, VectorLoadNode) \
+ declare_c2_type(Load4BNode, VectorLoadNode) \
+ declare_c2_type(Load8CNode, VectorLoadNode) \
+ declare_c2_type(Load4CNode, VectorLoadNode) \
+ declare_c2_type(Load2CNode, VectorLoadNode) \
+ declare_c2_type(Load8SNode, VectorLoadNode) \
+ declare_c2_type(Load4SNode, VectorLoadNode) \
+ declare_c2_type(Load2SNode, VectorLoadNode) \
+ declare_c2_type(Load4INode, VectorLoadNode) \
+ declare_c2_type(Load2INode, VectorLoadNode) \
+ declare_c2_type(Load2LNode, VectorLoadNode) \
+ declare_c2_type(Load4FNode, VectorLoadNode) \
+ declare_c2_type(Load2FNode, VectorLoadNode) \
+ declare_c2_type(Load2DNode, VectorLoadNode) \
+ declare_c2_type(VectorStoreNode, StoreNode) \
+ declare_c2_type(Store16BNode, VectorStoreNode) \
+ declare_c2_type(Store8BNode, VectorStoreNode) \
+ declare_c2_type(Store4BNode, VectorStoreNode) \
+ declare_c2_type(Store8CNode, VectorStoreNode) \
+ declare_c2_type(Store4CNode, VectorStoreNode) \
+ declare_c2_type(Store2CNode, VectorStoreNode) \
+ declare_c2_type(Store4INode, VectorStoreNode) \
+ declare_c2_type(Store2INode, VectorStoreNode) \
+ declare_c2_type(Store2LNode, VectorStoreNode) \
+ declare_c2_type(Store4FNode, VectorStoreNode) \
+ declare_c2_type(Store2FNode, VectorStoreNode) \
+ declare_c2_type(Store2DNode, VectorStoreNode) \
+ declare_c2_type(Replicate16BNode, VectorNode) \
+ declare_c2_type(Replicate8BNode, VectorNode) \
+ declare_c2_type(Replicate4BNode, VectorNode) \
+ declare_c2_type(Replicate8CNode, VectorNode) \
+ declare_c2_type(Replicate4CNode, VectorNode) \
+ declare_c2_type(Replicate2CNode, VectorNode) \
+ declare_c2_type(Replicate8SNode, VectorNode) \
+ declare_c2_type(Replicate4SNode, VectorNode) \
+ declare_c2_type(Replicate2SNode, VectorNode) \
+ declare_c2_type(Replicate4INode, VectorNode) \
+ declare_c2_type(Replicate2INode, VectorNode) \
+ declare_c2_type(Replicate2LNode, VectorNode) \
+ declare_c2_type(Replicate4FNode, VectorNode) \
+ declare_c2_type(Replicate2FNode, VectorNode) \
+ declare_c2_type(Replicate2DNode, VectorNode) \
+ declare_c2_type(PackNode, VectorNode) \
+ declare_c2_type(PackBNode, PackNode) \
+ declare_c2_type(PackCNode, PackNode) \
+ declare_c2_type(PackSNode, PackNode) \
+ declare_c2_type(PackINode, PackNode) \
+ declare_c2_type(PackLNode, PackNode) \
+ declare_c2_type(PackFNode, PackNode) \
+ declare_c2_type(PackDNode, PackNode) \
+ declare_c2_type(Pack2x1BNode, PackNode) \
+ declare_c2_type(Pack2x2BNode, PackNode) \
+ declare_c2_type(ExtractNode, Node) \
+ declare_c2_type(ExtractBNode, ExtractNode) \
+ declare_c2_type(ExtractCNode, ExtractNode) \
+ declare_c2_type(ExtractSNode, ExtractNode) \
+ declare_c2_type(ExtractINode, ExtractNode) \
+ declare_c2_type(ExtractLNode, ExtractNode) \
+ declare_c2_type(ExtractFNode, ExtractNode) \
+ declare_c2_type(ExtractDNode, ExtractNode) \
\
/*********************/ \
/* Adapter Blob Entries */ \
@@ -1385,6 +2043,32 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(AdapterHandlerEntry) \
declare_toplevel_type(AdapterHandlerEntry*) \
\
+ /*********************/ \
+ /* CI */ \
+ /*********************/ \
+ declare_toplevel_type(ciEnv) \
+ declare_toplevel_type(ciObjectFactory) \
+ declare_toplevel_type(ciConstant) \
+ declare_toplevel_type(ciField) \
+ declare_toplevel_type(void*) \
+ declare_toplevel_type(ciObject) \
+ declare_type(ciMethod, ciObject) \
+ declare_type(ciMethodData, ciObject) \
+ declare_type(ciType, ciObject) \
+ declare_type(ciInstance, ciObject) \
+ declare_toplevel_type(ciSymbol) \
+ declare_type(ciKlass, ciType) \
+ declare_type(ciInstanceKlass, ciKlass) \
+ declare_type(ciArrayKlass, ciKlass) \
+ declare_type(ciTypeArrayKlass, ciArrayKlass) \
+ declare_type(ciObjArrayKlass, ciArrayKlass) \
+ declare_type(ciMethodKlass, ciKlass) \
+ declare_type(ciKlassKlass, ciKlass) \
+ declare_type(ciInstanceKlassKlass, ciKlassKlass) \
+ declare_type(ciArrayKlassKlass, ciKlassKlass) \
+ declare_type(ciTypeArrayKlassKlass, ciArrayKlassKlass) \
+ declare_type(ciObjArrayKlassKlass, ciArrayKlassKlass) \
+ \
/********************/ \
/* -XX flags */ \
/********************/ \
@@ -1393,6 +2077,12 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(Flag*) \
\
/********************/ \
+ /* JVMTI */ \
+ /********************/ \
+ \
+ declare_toplevel_type(JvmtiExport) \
+ \
+ /********************/ \
/* JDK/VM version */ \
/********************/ \
\
@@ -1418,19 +2108,24 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_integer_type(Location::Type) \
declare_integer_type(Location::Where) \
declare_integer_type(PermGen::Name) \
+ declare_integer_type(FlagValueOrigin) \
+ COMPILER2_PRESENT(declare_integer_type(OptoReg::Name)) \
\
declare_integer_type(AccessFlags) /* FIXME: wrong type (not integer) */\
declare_toplevel_type(address) /* FIXME: should this be an integer type? */\
+ declare_integer_type(BasicType) /* FIXME: wrong type (not integer) */\
declare_toplevel_type(BreakpointInfo) \
declare_toplevel_type(BreakpointInfo*) \
declare_toplevel_type(CodeBlob*) \
declare_toplevel_type(CompressedWriteStream*) \
declare_toplevel_type(ConstantPoolCacheEntry) \
declare_toplevel_type(elapsedTimer) \
+ declare_toplevel_type(frame) \
declare_toplevel_type(intptr_t*) \
declare_unsigned_integer_type(InvocationCounter) /* FIXME: wrong type (not integer) */ \
declare_toplevel_type(JavaThread*) \
declare_toplevel_type(java_lang_Class) \
+ declare_integer_type(JavaThread::AsyncRequests) \
declare_toplevel_type(jbyte*) \
declare_toplevel_type(jbyte**) \
declare_toplevel_type(jint*) \
@@ -1443,6 +2138,7 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_toplevel_type(jmethodID*) \
declare_toplevel_type(Mutex*) \
declare_toplevel_type(nmethod*) \
+ COMPILER2_PRESENT(declare_unsigned_integer_type(node_idx_t)) \
declare_toplevel_type(ObjectMonitor*) \
declare_toplevel_type(oop*) \
declare_toplevel_type(OopMap**) \
@@ -1453,7 +2149,10 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_integer_type(ReferenceType) \
declare_toplevel_type(StubQueue*) \
declare_toplevel_type(Thread*) \
- declare_toplevel_type(Universe)
+ declare_toplevel_type(Universe) \
+ declare_toplevel_type(vframeArray) \
+ declare_toplevel_type(vframeArrayElement)
+
/* NOTE that we do not use the last_entry() macro here; it is used */
/* in vmStructs_<os>_<cpu>.hpp's VM_TYPES_OS_CPU macro (and must be */
@@ -1646,19 +2345,24 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_constant(constMethodOopDesc::_has_localvariable_table) \
\
/*************************************/ \
- /* instanceKlass FieldOffset enum */ \
+ /* instanceKlass enum */ \
/*************************************/ \
\
- declare_constant(instanceKlass::access_flags_offset) \
- declare_constant(instanceKlass::name_index_offset) \
- declare_constant(instanceKlass::signature_index_offset) \
- declare_constant(instanceKlass::initval_index_offset) \
- declare_constant(instanceKlass::low_offset) \
- declare_constant(instanceKlass::high_offset) \
- declare_constant(instanceKlass::generic_signature_offset) \
- declare_constant(instanceKlass::next_offset) \
declare_constant(instanceKlass::implementors_limit) \
\
+ /*************************************/ \
+ /* FieldInfo FieldOffset enum */ \
+ /*************************************/ \
+ \
+ declare_constant(FieldInfo::access_flags_offset) \
+ declare_constant(FieldInfo::name_index_offset) \
+ declare_constant(FieldInfo::signature_index_offset) \
+ declare_constant(FieldInfo::initval_index_offset) \
+ declare_constant(FieldInfo::low_offset) \
+ declare_constant(FieldInfo::high_offset) \
+ declare_constant(FieldInfo::generic_signature_offset) \
+ declare_constant(FieldInfo::field_slots) \
+ \
/************************************************/ \
/* instanceKlass InnerClassAttributeOffset enum */ \
/************************************************/ \
@@ -1753,6 +2457,27 @@ static inline uint64_t cast_uint64_t(size_t x)
declare_constant(Location::on_stack) \
declare_constant(Location::in_register) \
\
+ declare_constant(Deoptimization::Reason_many) \
+ declare_constant(Deoptimization::Reason_none) \
+ declare_constant(Deoptimization::Reason_null_check) \
+ declare_constant(Deoptimization::Reason_null_assert) \
+ declare_constant(Deoptimization::Reason_range_check) \
+ declare_constant(Deoptimization::Reason_class_check) \
+ declare_constant(Deoptimization::Reason_array_check) \
+ declare_constant(Deoptimization::Reason_intrinsic) \
+ declare_constant(Deoptimization::Reason_bimorphic) \
+ declare_constant(Deoptimization::Reason_unloaded) \
+ declare_constant(Deoptimization::Reason_uninitialized) \
+ declare_constant(Deoptimization::Reason_unreached) \
+ declare_constant(Deoptimization::Reason_unhandled) \
+ declare_constant(Deoptimization::Reason_constraint) \
+ declare_constant(Deoptimization::Reason_div0_check) \
+ declare_constant(Deoptimization::Reason_age) \
+ declare_constant(Deoptimization::Reason_predicate) \
+ declare_constant(Deoptimization::Reason_loop_limit_check) \
+ declare_constant(Deoptimization::Reason_LIMIT) \
+ declare_constant(Deoptimization::Reason_RECORDED_LIMIT) \
+ \
/*********************/ \
/* Matcher (C2 only) */ \
/*********************/ \
@@ -1797,6 +2522,28 @@ static inline uint64_t cast_uint64_t(size_t x)
\
declare_constant(ObjectSynchronizer::_BLOCKSIZE) \
\
+ /**********************/ \
+ /* PcDesc */ \
+ /**********************/ \
+ \
+ declare_constant(PcDesc::PCDESC_reexecute) \
+ declare_constant(PcDesc::PCDESC_is_method_handle_invoke) \
+ declare_constant(PcDesc::PCDESC_return_oop) \
+ \
+ /**********************/ \
+ /* frame */ \
+ /**********************/ \
+ \
+ X86_ONLY(declare_constant(frame::entry_frame_call_wrapper_offset)) \
+ declare_constant(frame::pc_return_offset) \
+ \
+ /*************/ \
+ /* vmSymbols */ \
+ /*************/ \
+ \
+ declare_constant(vmSymbols::FIRST_SID) \
+ declare_constant(vmSymbols::SID_LIMIT) \
+ \
/********************************/ \
/* Calling convention constants */ \
/********************************/ \
@@ -2441,12 +3188,14 @@ static int recursiveFindType(VMTypeEntry* origtypes, const char* typeName, bool
{
VMTypeEntry* types = origtypes;
while (types->typeName != NULL) {
- if (!strcmp(typeName, types->typeName)) {
+ if (strcmp(typeName, types->typeName) == 0) {
+ // Found it
return 1;
}
++types;
}
}
+ // Search for the base type by peeling off const and *
size_t len = strlen(typeName);
if (typeName[len-1] == '*') {
char * s = new char[len];
@@ -2491,7 +3240,7 @@ static int recursiveFindType(VMTypeEntry* origtypes, const char* typeName, bool
if (!isRecurse) {
tty->print_cr("type \"%s\" not found", typeName);
}
- return 2;
+ return 0;
}
diff --git a/hotspot/src/share/vm/runtime/vmThread.cpp b/hotspot/src/share/vm/runtime/vmThread.cpp
index c50e0a1..0013444 100644
--- a/hotspot/src/share/vm/runtime/vmThread.cpp
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp
@@ -46,6 +46,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
diff --git a/hotspot/src/share/vm/runtime/vmThread.hpp b/hotspot/src/share/vm/runtime/vmThread.hpp
index 6698b12..f784496 100644
--- a/hotspot/src/share/vm/runtime/vmThread.hpp
+++ b/hotspot/src/share/vm/runtime/vmThread.hpp
@@ -36,6 +36,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
//
// Prioritized queue of VM operations.
diff --git a/hotspot/src/share/vm/runtime/vm_operations.cpp b/hotspot/src/share/vm/runtime/vm_operations.cpp
index cb5d138..b010b9a 100644
--- a/hotspot/src/share/vm/runtime/vm_operations.cpp
+++ b/hotspot/src/share/vm/runtime/vm_operations.cpp
@@ -45,6 +45,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#define VM_OP_NAME_INITIALIZE(name) #name,
diff --git a/hotspot/src/share/vm/runtime/vm_version.cpp b/hotspot/src/share/vm/runtime/vm_version.cpp
index cd44c03..2a7e914 100644
--- a/hotspot/src/share/vm/runtime/vm_version.cpp
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp
@@ -46,6 +46,7 @@ const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release
const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string();
bool Abstract_VM_Version::_supports_cx8 = false;
unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U;
+int Abstract_VM_Version::_reserve_for_allocation_prefetch = 0;
#ifndef HOTSPOT_RELEASE_VERSION
#error HOTSPOT_RELEASE_VERSION must be defined
@@ -166,7 +167,8 @@ const char* Abstract_VM_Version::vm_release() {
#define OS LINUX_ONLY("linux") \
WINDOWS_ONLY("windows") \
- SOLARIS_ONLY("solaris")
+ SOLARIS_ONLY("solaris") \
+ BSD_ONLY("bsd")
#ifdef ZERO
#define CPU ZERO_LIBARCH
diff --git a/hotspot/src/share/vm/runtime/vm_version.hpp b/hotspot/src/share/vm/runtime/vm_version.hpp
index 6fcbb6a..60e7142 100644
--- a/hotspot/src/share/vm/runtime/vm_version.hpp
+++ b/hotspot/src/share/vm/runtime/vm_version.hpp
@@ -44,6 +44,7 @@ class Abstract_VM_Version: AllStatic {
static bool _initialized;
static int _parallel_worker_threads;
static bool _parallel_worker_threads_initialized;
+ static int _reserve_for_allocation_prefetch;
static unsigned int nof_parallel_worker_threads(unsigned int num,
unsigned int dem,
@@ -77,6 +78,12 @@ class Abstract_VM_Version: AllStatic {
return _logical_processors_per_package;
}
+ // Need a space at the end of TLAB for prefetch instructions
+ // which may fault when accessing memory outside of heap.
+ static int reserve_for_allocation_prefetch() {
+ return _reserve_for_allocation_prefetch;
+ }
+
// ARCH specific policy for the BiasedLocking
static bool use_biased_locking() { return true; }
diff --git a/hotspot/src/share/vm/services/gcNotifier.cpp b/hotspot/src/share/vm/services/gcNotifier.cpp
index 3f07668..f746920 100644
--- a/hotspot/src/share/vm/services/gcNotifier.cpp
+++ b/hotspot/src/share/vm/services/gcNotifier.cpp
@@ -92,7 +92,6 @@ static Handle getGcInfoBuilder(GCMemoryManager *gcManager,TRAPS) {
&args,
CHECK_NH);
return Handle(THREAD,(oop)result.get_jobject());
-
}
static Handle createGcInfo(GCMemoryManager *gcManager, GCStatInfo *gcStatInfo,TRAPS) {
@@ -100,9 +99,16 @@ static Handle createGcInfo(GCMemoryManager *gcManager, GCStatInfo *gcStatInfo,TR
// Fill the arrays of MemoryUsage objects with before and after GC
// per pool memory usage
- klassOop muKlass = Management::java_lang_management_MemoryUsage_klass(CHECK_NH); objArrayOop bu = oopFactory::new_objArray( muKlass,MemoryService::num_memory_pools(), CHECK_NH);
+ klassOop mu_klass = Management::java_lang_management_MemoryUsage_klass(CHECK_NH);
+ instanceKlassHandle mu_kh(THREAD, mu_klass);
+
+ // The array allocations below should use a handle containing mu_klass
+ // as the first allocation could trigger a GC, causing the actual
+ // klass oop to move, and leaving mu_klass pointing to the old
+ // location.
+ objArrayOop bu = oopFactory::new_objArray(mu_kh(), MemoryService::num_memory_pools(), CHECK_NH);
objArrayHandle usage_before_gc_ah(THREAD, bu);
- objArrayOop au = oopFactory::new_objArray(muKlass,MemoryService::num_memory_pools(), CHECK_NH);
+ objArrayOop au = oopFactory::new_objArray(mu_kh(), MemoryService::num_memory_pools(), CHECK_NH);
objArrayHandle usage_after_gc_ah(THREAD, au);
for (int i = 0; i < MemoryService::num_memory_pools(); i++) {
@@ -126,7 +132,7 @@ static Handle createGcInfo(GCMemoryManager *gcManager, GCStatInfo *gcStatInfo,TR
// The type is 'I'
objArrayOop extra_args_array = oopFactory::new_objArray(SystemDictionary::Integer_klass(), 1, CHECK_NH);
objArrayHandle extra_array (THREAD, extra_args_array);
- klassOop itKlass= SystemDictionary::Integer_klass();
+ klassOop itKlass = SystemDictionary::Integer_klass();
instanceKlassHandle intK(THREAD, itKlass);
instanceHandle extra_arg_val = intK->allocate_instance_handle(CHECK_NH);
@@ -147,7 +153,7 @@ static Handle createGcInfo(GCMemoryManager *gcManager, GCStatInfo *gcStatInfo,TR
extra_array->obj_at_put(0,extra_arg_val());
klassOop gcInfoklass = Management::com_sun_management_GcInfo_klass(CHECK_NH);
- instanceKlassHandle ik (THREAD,gcInfoklass);
+ instanceKlassHandle ik(THREAD, gcInfoklass);
Handle gcInfo_instance = ik->allocate_instance_handle(CHECK_NH);
diff --git a/hotspot/src/share/vm/shark/sharkContext.hpp b/hotspot/src/share/vm/shark/sharkContext.hpp
index 5667b2b..2ca901e 100644
--- a/hotspot/src/share/vm/shark/sharkContext.hpp
+++ b/hotspot/src/share/vm/shark/sharkContext.hpp
@@ -171,7 +171,7 @@ class SharkContext : public llvm::LLVMContext {
BasicType type) const {
assert(type >= 0 && type < T_CONFLICT, "unhandled type");
const llvm::Type* result = table[type];
- assert(type != NULL, "unhandled type");
+ assert(result != NULL, "unhandled type");
return result;
}
diff --git a/hotspot/src/share/vm/utilities/accessFlags.cpp b/hotspot/src/share/vm/utilities/accessFlags.cpp
index f244d0f..0c6ea1b 100644
--- a/hotspot/src/share/vm/utilities/accessFlags.cpp
+++ b/hotspot/src/share/vm/utilities/accessFlags.cpp
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
void AccessFlags::atomic_set_bits(jint bits) {
diff --git a/hotspot/src/share/vm/utilities/accessFlags.hpp b/hotspot/src/share/vm/utilities/accessFlags.hpp
index 663cec3..484ce4f 100644
--- a/hotspot/src/share/vm/utilities/accessFlags.hpp
+++ b/hotspot/src/share/vm/utilities/accessFlags.hpp
@@ -79,9 +79,14 @@ enum {
// Note that the class-related ACC_ANNOTATION bit conflicts with these flags.
JVM_ACC_FIELD_ACCESS_WATCHED = 0x00002000, // field access is watched by JVMTI
JVM_ACC_FIELD_MODIFICATION_WATCHED = 0x00008000, // field modification is watched by JVMTI
+ JVM_ACC_FIELD_INTERNAL = 0x00000400, // internal field, same as JVM_ACC_ABSTRACT
+
+ JVM_ACC_FIELD_INTERNAL_FLAGS = JVM_ACC_FIELD_ACCESS_WATCHED |
+ JVM_ACC_FIELD_MODIFICATION_WATCHED |
+ JVM_ACC_FIELD_INTERNAL,
// flags accepted by set_field_flags()
- JVM_ACC_FIELD_FLAGS = 0x00008000 | JVM_ACC_WRITTEN_FLAGS
+ JVM_ACC_FIELD_FLAGS = JVM_RECOGNIZED_FIELD_MODIFIERS | JVM_ACC_FIELD_INTERNAL_FLAGS
};
@@ -150,13 +155,17 @@ class AccessFlags VALUE_OBJ_CLASS_SPEC {
bool is_field_access_watched() const { return (_flags & JVM_ACC_FIELD_ACCESS_WATCHED) != 0; }
bool is_field_modification_watched() const
{ return (_flags & JVM_ACC_FIELD_MODIFICATION_WATCHED) != 0; }
+ bool is_internal() const { return (_flags & JVM_ACC_FIELD_INTERNAL) != 0; }
// get .class file flags
jint get_flags () const { return (_flags & JVM_ACC_WRITTEN_FLAGS); }
// Initialization
void add_promoted_flags(jint flags) { _flags |= (flags & JVM_ACC_PROMOTED_FLAGS); }
- void set_field_flags(jint flags) { _flags = (flags & JVM_ACC_FIELD_FLAGS); }
+ void set_field_flags(jint flags) {
+ assert((flags & JVM_ACC_FIELD_FLAGS) == flags, "only recognized flags");
+ _flags = (flags & JVM_ACC_FIELD_FLAGS);
+ }
void set_flags(jint flags) { _flags = (flags & JVM_ACC_WRITTEN_FLAGS); }
void set_queued_for_compilation() { atomic_set_bits(JVM_ACC_QUEUED); }
@@ -218,8 +227,8 @@ class AccessFlags VALUE_OBJ_CLASS_SPEC {
}
// Conversion
- jshort as_short() { return (jshort)_flags; }
- jint as_int() { return _flags; }
+ jshort as_short() const { return (jshort)_flags; }
+ jint as_int() const { return _flags; }
inline friend AccessFlags accessFlags_from(jint flags);
diff --git a/hotspot/src/share/vm/utilities/array.cpp b/hotspot/src/share/vm/utilities/array.cpp
index ffea394..44782ea 100644
--- a/hotspot/src/share/vm/utilities/array.cpp
+++ b/hotspot/src/share/vm/utilities/array.cpp
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef ASSERT
diff --git a/hotspot/src/share/vm/utilities/bitMap.cpp b/hotspot/src/share/vm/utilities/bitMap.cpp
index b7c82ee..17231d3 100644
--- a/hotspot/src/share/vm/utilities/bitMap.cpp
+++ b/hotspot/src/share/vm/utilities/bitMap.cpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
diff --git a/hotspot/src/share/vm/utilities/debug.cpp b/hotspot/src/share/vm/utilities/debug.cpp
index 27eaea8..5a68691 100644
--- a/hotspot/src/share/vm/utilities/debug.cpp
+++ b/hotspot/src/share/vm/utilities/debug.cpp
@@ -62,6 +62,10 @@
# include "os_windows.inline.hpp"
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef ASSERT
# ifdef _DEBUG
diff --git a/hotspot/src/share/vm/utilities/decoder.cpp b/hotspot/src/share/vm/utilities/decoder.cpp
index 032a8c2..ed156de 100644
--- a/hotspot/src/share/vm/utilities/decoder.cpp
+++ b/hotspot/src/share/vm/utilities/decoder.cpp
@@ -29,7 +29,7 @@
Decoder::decoder_status Decoder::_decoder_status = Decoder::no_error;
bool Decoder::_initialized = false;
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
// Implementation of common functionalities among Solaris and Linux
#include "utilities/elfFile.hpp"
@@ -101,4 +101,3 @@ ElfFile* Decoder::get_elf_file(const char* filepath) {
}
#endif
-
diff --git a/hotspot/src/share/vm/utilities/decoder.hpp b/hotspot/src/share/vm/utilities/decoder.hpp
index ade0fc2..70ffe21 100644
--- a/hotspot/src/share/vm/utilities/decoder.hpp
+++ b/hotspot/src/share/vm/utilities/decoder.hpp
@@ -38,6 +38,8 @@ typedef BOOL (WINAPI *pfn_SymInitialize)(HANDLE, PCTSTR, BOOL);
typedef BOOL (WINAPI *pfn_SymGetSymFromAddr64)(HANDLE, DWORD64, PDWORD64, PIMAGEHLP_SYMBOL64);
typedef DWORD (WINAPI *pfn_UndecorateSymbolName)(const char*, char*, DWORD, DWORD);
+#elif defined(__APPLE__)
+
#else
class ElfFile;
@@ -79,7 +81,7 @@ class Decoder: public StackObj {
static decoder_status get_status() { return _decoder_status; };
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
private:
static ElfFile* get_elf_file(const char* filepath);
#endif // _WINDOWS
@@ -94,6 +96,7 @@ class Decoder: public StackObj {
static bool _can_decode_in_vm;
static pfn_SymGetSymFromAddr64 _pfnSymGetSymFromAddr64;
static pfn_UndecorateSymbolName _pfnUndecorateSymbolName;
+#elif __APPLE__
#else
static ElfFile* _opened_elf_files;
#endif // _WINDOWS
diff --git a/hotspot/src/share/vm/utilities/elfFile.cpp b/hotspot/src/share/vm/utilities/elfFile.cpp
index 4614b94..2db1f71 100644
--- a/hotspot/src/share/vm/utilities/elfFile.cpp
+++ b/hotspot/src/share/vm/utilities/elfFile.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
#include <string.h>
#include <stdio.h>
diff --git a/hotspot/src/share/vm/utilities/elfFile.hpp b/hotspot/src/share/vm/utilities/elfFile.hpp
index 0a1f965..b40b90a 100644
--- a/hotspot/src/share/vm/utilities/elfFile.hpp
+++ b/hotspot/src/share/vm/utilities/elfFile.hpp
@@ -25,9 +25,13 @@
#ifndef __ELF_FILE_HPP
#define __ELF_FILE_HPP
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
+#if defined(__OpenBSD__)
+#include <sys/exec_elf.h>
+#else
#include <elf.h>
+#endif
#include <stdio.h>
#ifdef _LP64
@@ -41,7 +45,9 @@ typedef Elf64_Ehdr Elf_Ehdr;
typedef Elf64_Shdr Elf_Shdr;
typedef Elf64_Sym Elf_Sym;
+#if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
#define ELF_ST_TYPE ELF64_ST_TYPE
+#endif
#else
@@ -55,8 +61,10 @@ typedef Elf32_Ehdr Elf_Ehdr;
typedef Elf32_Shdr Elf_Shdr;
typedef Elf32_Sym Elf_Sym;
+#if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
#define ELF_ST_TYPE ELF32_ST_TYPE
#endif
+#endif
#include "globalDefinitions.hpp"
#include "memory/allocation.hpp"
@@ -137,4 +145,3 @@ class ElfFile: public CHeapObj {
#endif // _WINDOWS
#endif // __ELF_FILE_HPP
-
diff --git a/hotspot/src/share/vm/utilities/elfStringTable.cpp b/hotspot/src/share/vm/utilities/elfStringTable.cpp
index 994b80a..905f82b 100644
--- a/hotspot/src/share/vm/utilities/elfStringTable.cpp
+++ b/hotspot/src/share/vm/utilities/elfStringTable.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
#include "memory/allocation.inline.hpp"
#include "runtime/os.hpp"
@@ -87,4 +87,3 @@ const char* ElfStringTable::string_at(int pos) {
}
#endif // _WINDOWS
-
diff --git a/hotspot/src/share/vm/utilities/elfStringTable.hpp b/hotspot/src/share/vm/utilities/elfStringTable.hpp
index bfafa1a..a984e3a 100644
--- a/hotspot/src/share/vm/utilities/elfStringTable.hpp
+++ b/hotspot/src/share/vm/utilities/elfStringTable.hpp
@@ -25,7 +25,7 @@
#ifndef __ELF_STRING_TABLE_HPP
#define __ELF_STRING_TABLE_HPP
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
#include "memory/allocation.hpp"
#include "utilities/decoder.hpp"
@@ -79,4 +79,3 @@ class ElfStringTable: CHeapObj {
#endif // _WINDOWS
#endif // __ELF_STRING_TABLE_HPP
-
diff --git a/hotspot/src/share/vm/utilities/elfSymbolTable.cpp b/hotspot/src/share/vm/utilities/elfSymbolTable.cpp
index 0fa039c..d160601 100644
--- a/hotspot/src/share/vm/utilities/elfSymbolTable.cpp
+++ b/hotspot/src/share/vm/utilities/elfSymbolTable.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
#include "memory/allocation.inline.hpp"
#include "utilities/elfSymbolTable.hpp"
diff --git a/hotspot/src/share/vm/utilities/elfSymbolTable.hpp b/hotspot/src/share/vm/utilities/elfSymbolTable.hpp
index 5ac1c4a..c8a11fc 100644
--- a/hotspot/src/share/vm/utilities/elfSymbolTable.hpp
+++ b/hotspot/src/share/vm/utilities/elfSymbolTable.hpp
@@ -25,7 +25,7 @@
#ifndef __ELF_SYMBOL_TABLE_HPP
#define __ELF_SYMBOL_TABLE_HPP
-#ifndef _WINDOWS
+#if !defined(_WINDOWS) && !defined(__APPLE__)
#include "memory/allocation.hpp"
@@ -68,6 +68,3 @@ class ElfSymbolTable: public CHeapObj {
#endif // _WINDOWS
#endif // __ELF_SYMBOL_TABLE_HPP
-
-
-
diff --git a/hotspot/src/share/vm/utilities/events.cpp b/hotspot/src/share/vm/utilities/events.cpp
index 24e4eb4..6234119 100644
--- a/hotspot/src/share/vm/utilities/events.cpp
+++ b/hotspot/src/share/vm/utilities/events.cpp
@@ -38,6 +38,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifndef PRODUCT
diff --git a/hotspot/src/share/vm/utilities/exceptions.cpp b/hotspot/src/share/vm/utilities/exceptions.cpp
index 3d2f3cf..9196027 100644
--- a/hotspot/src/share/vm/utilities/exceptions.cpp
+++ b/hotspot/src/share/vm/utilities/exceptions.cpp
@@ -42,6 +42,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Implementation of ThreadShadow
diff --git a/hotspot/src/share/vm/utilities/exceptions.hpp b/hotspot/src/share/vm/utilities/exceptions.hpp
index 52540f3..f4ad5dd 100644
--- a/hotspot/src/share/vm/utilities/exceptions.hpp
+++ b/hotspot/src/share/vm/utilities/exceptions.hpp
@@ -58,6 +58,8 @@ class JavaCallArguments;
// include hierachy reasons).
class ThreadShadow: public CHeapObj {
+ friend class VMStructs;
+
protected:
oop _pending_exception; // Thread has gc actions.
const char* _exception_file; // file information for exception (debugging only)
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions.hpp b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
index 8607a3e..5bacab9 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp
@@ -25,6 +25,8 @@
#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+#define __STDC_FORMAT_MACROS
+
#ifdef TARGET_COMPILER_gcc
# include "utilities/globalDefinitions_gcc.hpp"
#endif
@@ -1178,67 +1180,47 @@ inline int build_int_from_shorts( jushort low, jushort high ) {
}
// Printf-style formatters for fixed- and variable-width types as pointers and
-// integers.
-//
-// Each compiler-specific definitions file (e.g., globalDefinitions_gcc.hpp)
-// must define the macro FORMAT64_MODIFIER, which is the modifier for '%x' or
-// '%d' formats to indicate a 64-bit quantity; commonly "l" (in LP64) or "ll"
-// (in ILP32).
+// integers. These are derived from the definitions in inttypes.h. If the platform
+// doesn't provide appropriate definitions, they should be provided in
+// the compiler-specific definitions file (e.g., globalDefinitions_gcc.hpp)
#define BOOL_TO_STR(_b_) ((_b_) ? "true" : "false")
// Format 32-bit quantities.
-#define INT32_FORMAT "%d"
-#define UINT32_FORMAT "%u"
-#define INT32_FORMAT_W(width) "%" #width "d"
-#define UINT32_FORMAT_W(width) "%" #width "u"
+#define INT32_FORMAT "%" PRId32
+#define UINT32_FORMAT "%" PRIu32
+#define INT32_FORMAT_W(width) "%" #width PRId32
+#define UINT32_FORMAT_W(width) "%" #width PRIu32
-#define PTR32_FORMAT "0x%08x"
+#define PTR32_FORMAT "0x%08" PRIx32
// Format 64-bit quantities.
-#define INT64_FORMAT "%" FORMAT64_MODIFIER "d"
-#define UINT64_FORMAT "%" FORMAT64_MODIFIER "u"
-#define PTR64_FORMAT "0x%016" FORMAT64_MODIFIER "x"
+#define INT64_FORMAT "%" PRId64
+#define UINT64_FORMAT "%" PRIu64
+#define INT64_FORMAT_W(width) "%" #width PRId64
+#define UINT64_FORMAT_W(width) "%" #width PRIu64
-#define INT64_FORMAT_W(width) "%" #width FORMAT64_MODIFIER "d"
-#define UINT64_FORMAT_W(width) "%" #width FORMAT64_MODIFIER "u"
+#define PTR64_FORMAT "0x%016" PRIx64
-// Format macros that allow the field width to be specified. The width must be
-// a string literal (e.g., "8") or a macro that evaluates to one.
-#ifdef _LP64
-#define UINTX_FORMAT_W(width) UINT64_FORMAT_W(width)
-#define SSIZE_FORMAT_W(width) INT64_FORMAT_W(width)
-#define SIZE_FORMAT_W(width) UINT64_FORMAT_W(width)
-#else
-#define UINTX_FORMAT_W(width) UINT32_FORMAT_W(width)
-#define SSIZE_FORMAT_W(width) INT32_FORMAT_W(width)
-#define SIZE_FORMAT_W(width) UINT32_FORMAT_W(width)
-#endif // _LP64
-
-// Format pointers and size_t (or size_t-like integer types) which change size
-// between 32- and 64-bit. The pointer format theoretically should be "%p",
-// however, it has different output on different platforms. On Windows, the data
-// will be padded with zeros automatically. On Solaris, we can use "%016p" &
-// "%08p" on 64 bit & 32 bit platforms to make the data padded with extra zeros.
-// On Linux, "%016p" or "%08p" is not be allowed, at least on the latest GCC
-// 4.3.2. So we have to use "%016x" or "%08x" to simulate the printing format.
-// GCC 4.3.2, however requires the data to be converted to "intptr_t" when
-// using "%x".
+// Format pointers which change size between 32- and 64-bit.
#ifdef _LP64
-#define PTR_FORMAT PTR64_FORMAT
-#define UINTX_FORMAT UINT64_FORMAT
-#define INTX_FORMAT INT64_FORMAT
-#define SIZE_FORMAT UINT64_FORMAT
-#define SSIZE_FORMAT INT64_FORMAT
+#define INTPTR_FORMAT "0x%016" PRIxPTR
+#define PTR_FORMAT "0x%016" PRIxPTR
#else // !_LP64
-#define PTR_FORMAT PTR32_FORMAT
-#define UINTX_FORMAT UINT32_FORMAT
-#define INTX_FORMAT INT32_FORMAT
-#define SIZE_FORMAT UINT32_FORMAT
-#define SSIZE_FORMAT INT32_FORMAT
+#define INTPTR_FORMAT "0x%08" PRIxPTR
+#define PTR_FORMAT "0x%08" PRIxPTR
#endif // _LP64
-#define INTPTR_FORMAT PTR_FORMAT
+#define SSIZE_FORMAT "%" PRIdPTR
+#define SIZE_FORMAT "%" PRIuPTR
+#define SSIZE_FORMAT_W(width) "%" #width PRIdPTR
+#define SIZE_FORMAT_W(width) "%" #width PRIuPTR
+
+#define INTX_FORMAT "%" PRIdPTR
+#define UINTX_FORMAT "%" PRIuPTR
+#define INTX_FORMAT_W(width) "%" #width PRIdPTR
+#define UINTX_FORMAT_W(width) "%" #width PRIuPTR
+
// Enable zap-a-lot if in debug version.
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
index ac7fdf8..45b5e8f 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
@@ -76,15 +76,28 @@
# include <sys/procfs.h>
# endif
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif // __STDC_LIMIT_MACROS
#include <inttypes.h>
#include <signal.h>
+#ifndef __OpenBSD__
#include <ucontext.h>
+#endif
+#ifdef __APPLE__
+ #include <AvailabilityMacros.h>
+ #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4)
+ // Mac OS X 10.4 defines EFL_AC and EFL_ID,
+ // which conflict with hotspot variable names.
+ //
+ // This has been fixed in Mac OS X 10.5.
+ #undef EFL_AC
+ #undef EFL_ID
+ #endif
+#endif
#include <sys/time.h>
-#endif // LINUX
+#endif // LINUX || _ALLBSD_SOURCE
// 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
// When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
@@ -120,7 +133,7 @@
// pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
// sizeof(void*), so here we want something which is integer type, but has the
// same size as a pointer.
-#ifdef LINUX
+#ifdef __GNUC__
#ifdef _LP64
#define NULL_WORD 0L
#else
@@ -132,7 +145,7 @@
#define NULL_WORD NULL
#endif
-#ifndef LINUX
+#if !defined(LINUX) && !defined(_ALLBSD_SOURCE)
// Compiler-specific primitive types
typedef unsigned short uint16_t;
#ifndef _UINT32_T
@@ -152,7 +165,7 @@ typedef unsigned int uintptr_t;
// prior definition of intptr_t, and add "&& !defined(XXX)" above.
#endif // _SYS_INT_TYPES_H
-#endif // !LINUX
+#endif // !LINUX && !_ALLBSD_SOURCE
// Additional Java basic types
@@ -244,7 +257,9 @@ inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(float f) { return isnand(f); }
#endif
inline int g_isnan(double f) { return isnand(f); }
-#elif LINUX
+#elif defined(__APPLE__)
+inline int g_isnan(double f) { return isnan(f); }
+#elif defined(LINUX) || defined(_ALLBSD_SOURCE)
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
index fca43e0..e91e607 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_sparcWorks.hpp
@@ -74,8 +74,25 @@
# ifdef SOLARIS_MUTATOR_LIBTHREAD
# include <sys/procfs.h>
# endif
+
+#include <inttypes.h>
+
+// Solaris 8 doesn't provide definitions of these
+#ifdef SOLARIS
+#ifndef PRIdPTR
+#if defined(_LP64)
+#define PRIdPTR "ld"
+#define PRIuPTR "lu"
+#define PRIxPTR "lx"
+#else
+#define PRIdPTR "d"
+#define PRIuPTR "u"
+#define PRIxPTR "x"
+#endif
+#endif
+#endif
+
#ifdef LINUX
-# include <inttypes.h>
# include <signal.h>
# include <ucontext.h>
# include <sys/time.h>
diff --git a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
index 3654999..ba54d22 100644
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp
@@ -207,6 +207,20 @@ inline int vsnprintf(char* buf, size_t count, const char* fmt, va_list argptr) {
// Formatting.
#define FORMAT64_MODIFIER "I64"
+// Visual Studio doesn't provide inttypes.h so provide appropriate definitions here.
+// The 32 bits ones might need I32 but seem to work ok without it.
+#define PRId32 "d"
+#define PRIu32 "u"
+#define PRIx32 "x"
+
+#define PRId64 "I64d"
+#define PRIu64 "I64u"
+#define PRIx64 "I64x"
+
+#define PRIdPTR "d"
+#define PRIuPTR "u"
+#define PRIxPTR "x"
+
#define offset_of(klass,field) offsetof(klass,field)
#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_VISCPP_HPP
diff --git a/hotspot/src/share/vm/utilities/growableArray.cpp b/hotspot/src/share/vm/utilities/growableArray.cpp
index 00378af..a6ad8f3 100644
--- a/hotspot/src/share/vm/utilities/growableArray.cpp
+++ b/hotspot/src/share/vm/utilities/growableArray.cpp
@@ -34,6 +34,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef ASSERT
void GenericGrowableArray::set_nesting() {
if (on_stack()) {
diff --git a/hotspot/src/share/vm/utilities/growableArray.hpp b/hotspot/src/share/vm/utilities/growableArray.hpp
index 9ee9639..34972be 100644
--- a/hotspot/src/share/vm/utilities/growableArray.hpp
+++ b/hotspot/src/share/vm/utilities/growableArray.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 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
@@ -77,6 +77,8 @@ extern "C" {
}
class GenericGrowableArray : public ResourceObj {
+ friend class VMStructs;
+
protected:
int _len; // current length
int _max; // maximum length
@@ -136,6 +138,8 @@ class GenericGrowableArray : public ResourceObj {
};
template<class E> class GrowableArray : public GenericGrowableArray {
+ friend class VMStructs;
+
private:
E* _data; // data array
diff --git a/hotspot/src/share/vm/utilities/histogram.hpp b/hotspot/src/share/vm/utilities/histogram.hpp
index 9627a07..4eaa3d4 100644
--- a/hotspot/src/share/vm/utilities/histogram.hpp
+++ b/hotspot/src/share/vm/utilities/histogram.hpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
// This class provides a framework for collecting various statistics.
// The current implementation is oriented towards counting invocations
diff --git a/hotspot/src/share/vm/utilities/macros.hpp b/hotspot/src/share/vm/utilities/macros.hpp
index 8c8b0f3..27e2a70 100644
--- a/hotspot/src/share/vm/utilities/macros.hpp
+++ b/hotspot/src/share/vm/utilities/macros.hpp
@@ -161,6 +161,14 @@
#define NOT_WINDOWS(code) code
#endif
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
+#define BSD_ONLY(code) code
+#define NOT_BSD(code)
+#else
+#define BSD_ONLY(code)
+#define NOT_BSD(code) code
+#endif
+
#ifdef _WIN64
#define WIN64_ONLY(code) code
#define NOT_WIN64(code)
diff --git a/hotspot/src/share/vm/utilities/ostream.cpp b/hotspot/src/share/vm/utilities/ostream.cpp
index 1e54ba2..6066000 100644
--- a/hotspot/src/share/vm/utilities/ostream.cpp
+++ b/hotspot/src/share/vm/utilities/ostream.cpp
@@ -39,6 +39,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "os_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "os_bsd.inline.hpp"
+#endif
extern "C" void jio_print(const char* s); // Declarationtion of jvm method
@@ -992,7 +995,7 @@ bufferedStream::~bufferedStream() {
#ifndef PRODUCT
-#if defined(SOLARIS) || defined(LINUX)
+#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
diff --git a/hotspot/src/share/vm/utilities/preserveException.hpp b/hotspot/src/share/vm/utilities/preserveException.hpp
index d0e25ae..7737a37 100644
--- a/hotspot/src/share/vm/utilities/preserveException.hpp
+++ b/hotspot/src/share/vm/utilities/preserveException.hpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// This file provides more support for exception handling; see also exceptions.hpp
class PreserveExceptionMark {
diff --git a/hotspot/src/share/vm/utilities/quickSort.cpp b/hotspot/src/share/vm/utilities/quickSort.cpp
index cc41329..b377d9a 100644
--- a/hotspot/src/share/vm/utilities/quickSort.cpp
+++ b/hotspot/src/share/vm/utilities/quickSort.cpp
@@ -92,6 +92,7 @@ bool QuickSort::sort_and_compare(int* arrayToSort, int* expectedResult, int leng
}
bool QuickSort::test_quick_sort() {
+#if 0
tty->print_cr("test_quick_sort\n");
{
int* test_array = NULL;
@@ -212,6 +213,7 @@ bool QuickSort::test_quick_sort() {
delete[] test_array;
delete[] expected_array;
}
+#endif
return true;
}
diff --git a/hotspot/src/share/vm/utilities/taskqueue.cpp b/hotspot/src/share/vm/utilities/taskqueue.cpp
index 5f93dc0..df61a55 100644
--- a/hotspot/src/share/vm/utilities/taskqueue.cpp
+++ b/hotspot/src/share/vm/utilities/taskqueue.cpp
@@ -37,6 +37,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
#ifdef TRACESPINNING
uint ParallelTaskTerminator::_total_yields = 0;
@@ -274,4 +277,3 @@ void ParallelTaskTerminator::reset_for_reuse(int n_threads) {
reset_for_reuse();
_n_threads = n_threads;
}
-
diff --git a/hotspot/src/share/vm/utilities/taskqueue.hpp b/hotspot/src/share/vm/utilities/taskqueue.hpp
index 5527e2f..545c6db 100644
--- a/hotspot/src/share/vm/utilities/taskqueue.hpp
+++ b/hotspot/src/share/vm/utilities/taskqueue.hpp
@@ -53,6 +53,12 @@
#ifdef TARGET_OS_ARCH_linux_ppc
# include "orderAccess_linux_ppc.inline.hpp"
#endif
+#ifdef TARGET_OS_ARCH_bsd_x86
+# include "orderAccess_bsd_x86.inline.hpp"
+#endif
+#ifdef TARGET_OS_ARCH_bsd_zero
+# include "orderAccess_bsd_zero.inline.hpp"
+#endif
// Simple TaskQueue stats that are collected by default in debug builds.
diff --git a/hotspot/src/share/vm/utilities/vmError.cpp b/hotspot/src/share/vm/utilities/vmError.cpp
index fa8b820..bb34fcd 100644
--- a/hotspot/src/share/vm/utilities/vmError.cpp
+++ b/hotspot/src/share/vm/utilities/vmError.cpp
@@ -45,13 +45,18 @@ const char *env_list[] = {
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
- // Env variables that are defined on Solaris/Linux
+ // Env variables that are defined on Solaris/Linux/BSD
"LD_LIBRARY_PATH", "LD_PRELOAD", "SHELL", "DISPLAY",
"HOSTTYPE", "OSTYPE", "ARCH", "MACHTYPE",
// defined on Linux
"LD_ASSUME_KERNEL", "_JAVA_SR_SIGNUM",
+ // defined on Darwin
+ "DYLD_LIBRARY_PATH", "DYLD_FALLBACK_LIBRARY_PATH",
+ "DYLD_FRAMEWORK_PATH", "DYLD_FALLBACK_FRAMEWORK_PATH",
+ "DYLD_INSERT_LIBRARIES",
+
// defined on Windows
"OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
@@ -958,7 +963,7 @@ void VMError::report_and_die() {
const char* ptr = OnError;
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
out.print_raw ("# Executing ");
-#if defined(LINUX)
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
diff --git a/hotspot/src/share/vm/utilities/workgroup.hpp b/hotspot/src/share/vm/utilities/workgroup.hpp
index 2bd6e9c..8e9effe 100644
--- a/hotspot/src/share/vm/utilities/workgroup.hpp
+++ b/hotspot/src/share/vm/utilities/workgroup.hpp
@@ -35,6 +35,9 @@
#ifdef TARGET_OS_FAMILY_windows
# include "thread_windows.inline.hpp"
#endif
+#ifdef TARGET_OS_FAMILY_bsd
+# include "thread_bsd.inline.hpp"
+#endif
// Task class hierarchy:
// AbstractGangTask
diff --git a/hotspot/test/Makefile b/hotspot/test/Makefile
index 9c66ade..50818dd 100644
--- a/hotspot/test/Makefile
+++ b/hotspot/test/Makefile
@@ -44,6 +44,22 @@ ifeq ($(OSNAME), Linux)
ARCH = i586
endif
endif
+ifeq ($(OSNAME), Darwin)
+ PLATFORM = bsd
+ SLASH_JAVA = /java
+ ARCH = $(shell uname -m)
+ ifeq ($(ARCH), i386)
+ ARCH = i586
+ endif
+endif
+ifeq ($(findstring BSD,$(OSNAME)), BSD)
+ PLATFORM = bsd
+ SLASH_JAVA = /java
+ ARCH = $(shell uname -m)
+ ifeq ($(ARCH), i386)
+ ARCH = i586
+ endif
+endif
ifeq ($(OSNAME), Windows_NT)
PLATFORM = windows
SLASH_JAVA = J:
diff --git a/hotspot/test/compiler/5091921/Test7005594.sh b/hotspot/test/compiler/5091921/Test7005594.sh
index a75c1b9..858e38a 100644
--- a/hotspot/test/compiler/5091921/Test7005594.sh
+++ b/hotspot/test/compiler/5091921/Test7005594.sh
@@ -43,6 +43,45 @@ fi
echo "TESTCLASSES=${TESTCLASSES}"
echo "CLASSPATH=${CLASSPATH}"
+# Amount of physical memory in megabytes
+MEM=0
+if [ -f "/proc/meminfo" ]; then
+ # Linux, Windows/Cygwin
+ MEM=`cat /proc/meminfo |grep ^MemTotal: | awk '{print $2}'`
+ MEM="$(($MEM / 1024))"
+elif [ -x "/usr/sbin/prtconf" ]; then
+ # Solaris
+ MEM=`/usr/sbin/prtconf | grep "^Memory size" | awk '{print $3}'`
+elif [ -x "/usr/sbin/system_profiler" ]; then
+ # MacOS
+ MEMo=`/usr/sbin/system_profiler SPHardwareDataType | grep Memory:`
+ MEM=`echo "$MEMo" | awk '{print $2}'`
+ MEMu=`echo "$MEMo" | awk '{print $3}'`
+ case $MEMu in
+ GB)
+ MEM="$(($MEM * 1024))"
+ ;;
+ MB)
+ ;;
+ *)
+ echo "Unknown memory unit in system_profile output: $MEMu"
+ ;;
+ esac
+elif [ -n "$ROOTDIR" -a -x "$ROOTDIR/mksnt/sysinf" ]; then
+ # Windows/MKS
+ MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'`
+ MEM="$(($machine_memory / 1024))"
+else
+ echo "Unable to determine amount of physical memory on the machine"
+fi
+
+if [ $MEM -lt 2000 ]; then
+ echo "Test skipped due to low (or unknown) memory on the system: $MEM Mb"
+ exit 0
+fi
+
+echo "MEMORY=$MEM Mb"
+
set -x
cp ${TESTSRC}/Test7005594.java .
@@ -50,7 +89,7 @@ cp ${TESTSRC}/Test7005594.sh .
${TESTJAVA}/bin/javac -d . Test7005594.java
-${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
+${TESTJAVA}/bin/java ${TESTVMOPTS} -Xms1600m -XX:+IgnoreUnrecognizedVMOptions -XX:-ZapUnusedHeapArea -Xcomp -XX:CompileOnly=Test7005594.test Test7005594 > test.out 2>&1
result=$?
diff --git a/hotspot/test/compiler/7068051/Test7068051.java b/hotspot/test/compiler/7068051/Test7068051.java
new file mode 100644
index 0000000..e2b1927
--- /dev/null
+++ b/hotspot/test/compiler/7068051/Test7068051.java
@@ -0,0 +1,82 @@
+/*
+ * 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 7068051
+ * @summary SIGSEGV in PhaseIdealLoop::build_loop_late_post on T5440
+ *
+ * @run shell/timeout=300 Test7068051.sh
+ */
+
+import java.io.*;
+import java.nio.*;
+import java.util.*;
+import java.util.zip.*;
+
+public class Test7068051 {
+
+ public static void main (String[] args) throws Throwable {
+
+ ZipFile zf = new ZipFile(args[0]);
+
+ Enumeration<? extends ZipEntry> entries = zf.entries();
+ ArrayList<String> names = new ArrayList<String>();
+ while (entries.hasMoreElements()) {
+ names.add(entries.nextElement().getName());
+ }
+
+ byte[] bytes = new byte[16];
+ for (String name : names) {
+ ZipEntry e = zf.getEntry(name);
+
+ if (e.isDirectory())
+ continue;
+
+ final InputStream is = zf.getInputStream(e);
+
+ try {
+ while (is.read(bytes) >= 0) {
+ }
+ is.close();
+
+ } catch (IOException x) {
+ System.out.println("..................................");
+ System.out.println(" --> is :" + is);
+ System.out.println(" is.hash :" + is.hashCode());
+ System.out.println();
+ System.out.println(" e.name :" + e.getName());
+ System.out.println(" e.hash :" + e.hashCode());
+ System.out.println(" e.method :" + e.getMethod());
+ System.out.println(" e.size :" + e.getSize());
+ System.out.println(" e.csize :" + e.getCompressedSize());
+
+ x.printStackTrace();
+ System.out.println("..................................");
+ System.exit(97);
+ }
+ }
+ zf.close();
+ }
+}
diff --git a/hotspot/test/compiler/7068051/Test7068051.sh b/hotspot/test/compiler/7068051/Test7068051.sh
new file mode 100644
index 0000000..ddf3bb9
--- /dev/null
+++ b/hotspot/test/compiler/7068051/Test7068051.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# 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.
+#
+#
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTSRC=${TESTSRC}"
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTJAVA=${TESTJAVA}"
+
+set -x
+
+${TESTJAVA}/bin/jar xf ${TESTJAVA}/jre/lib/javaws.jar
+${TESTJAVA}/bin/jar cf foo.jar *
+cp ${TESTSRC}/Test7068051.java ./
+${TESTJAVA}/bin/jar -uf0 foo.jar Test7068051.java
+
+${TESTJAVA}/bin/javac -d . Test7068051.java
+
+${TESTJAVA}/bin/java -showversion -Xbatch ${TESTVMOPTS} Test7068051 foo.jar
+
diff --git a/hotspot/test/compiler/7070134/Stemmer.java b/hotspot/test/compiler/7070134/Stemmer.java
new file mode 100644
index 0000000..c7edb75
--- /dev/null
+++ b/hotspot/test/compiler/7070134/Stemmer.java
@@ -0,0 +1,433 @@
+/**
+ * @test
+ * @bug 7070134
+ * @summary Hotspot crashes with sigsegv from PorterStemmer
+ *
+ * @run shell Test7070134.sh
+ */
+
+/*
+
+ Porter stemmer in Java. The original paper is in
+
+ Porter, 1980, An algorithm for suffix stripping, Program, Vol. 14,
+ no. 3, pp 130-137,
+
+ See also http://www.tartarus.org/~martin/PorterStemmer
+
+ History:
+
+ Release 1
+
+ Bug 1 (reported by Gonzalo Parra 16/10/99) fixed as marked below.
+ The words 'aed', 'eed', 'oed' leave k at 'a' for step 3, and b[k-1]
+ is then out outside the bounds of b.
+
+ Release 2
+
+ Similarly,
+
+ Bug 2 (reported by Steve Dyrdahl 22/2/00) fixed as marked below.
+ 'ion' by itself leaves j = -1 in the test for 'ion' in step 5, and
+ b[j] is then outside the bounds of b.
+
+ Release 3
+
+ Considerably revised 4/9/00 in the light of many helpful suggestions
+ from Brian Goetz of Quiotix Corporation (brian at quiotix.com).
+
+ Release 4
+
+*/
+
+import java.io.*;
+
+/**
+ * Stemmer, implementing the Porter Stemming Algorithm
+ *
+ * The Stemmer class transforms a word into its root form. The input
+ * word can be provided a character at time (by calling add()), or at once
+ * by calling one of the various stem(something) methods.
+ */
+
+class Stemmer
+{ private char[] b;
+ private int i, /* offset into b */
+ i_end, /* offset to end of stemmed word */
+ j, k;
+ private static final int INC = 50;
+ /* unit of size whereby b is increased */
+ public Stemmer()
+ { b = new char[INC];
+ i = 0;
+ i_end = 0;
+ }
+
+ /**
+ * Add a character to the word being stemmed. When you are finished
+ * adding characters, you can call stem(void) to stem the word.
+ */
+
+ public void add(char ch)
+ { if (i == b.length)
+ { char[] new_b = new char[i+INC];
+ for (int c = 0; c < i; c++) new_b[c] = b[c];
+ b = new_b;
+ }
+ b[i++] = ch;
+ }
+
+
+ /** Adds wLen characters to the word being stemmed contained in a portion
+ * of a char[] array. This is like repeated calls of add(char ch), but
+ * faster.
+ */
+
+ public void add(char[] w, int wLen)
+ { if (i+wLen >= b.length)
+ { char[] new_b = new char[i+wLen+INC];
+ for (int c = 0; c < i; c++) new_b[c] = b[c];
+ b = new_b;
+ }
+ for (int c = 0; c < wLen; c++) b[i++] = w[c];
+ }
+
+ /**
+ * After a word has been stemmed, it can be retrieved by toString(),
+ * or a reference to the internal buffer can be retrieved by getResultBuffer
+ * and getResultLength (which is generally more efficient.)
+ */
+ public String toString() { return new String(b,0,i_end); }
+
+ /**
+ * Returns the length of the word resulting from the stemming process.
+ */
+ public int getResultLength() { return i_end; }
+
+ /**
+ * Returns a reference to a character buffer containing the results of
+ * the stemming process. You also need to consult getResultLength()
+ * to determine the length of the result.
+ */
+ public char[] getResultBuffer() { return b; }
+
+ /* cons(i) is true <=> b[i] is a consonant. */
+
+ private final boolean cons(int i)
+ { switch (b[i])
+ { case 'a': case 'e': case 'i': case 'o': case 'u': return false;
+ case 'y': return (i==0) ? true : !cons(i-1);
+ default: return true;
+ }
+ }
+
+ /* m() measures the number of consonant sequences between 0 and j. if c is
+ a consonant sequence and v a vowel sequence, and <..> indicates arbitrary
+ presence,
+
+ <c><v> gives 0
+ <c>vc<v> gives 1
+ <c>vcvc<v> gives 2
+ <c>vcvcvc<v> gives 3
+ ....
+ */
+
+ private final int m()
+ { int n = 0;
+ int i = 0;
+ while(true)
+ { if (i > j) return n;
+ if (! cons(i)) break; i++;
+ }
+ i++;
+ while(true)
+ { while(true)
+ { if (i > j) return n;
+ if (cons(i)) break;
+ i++;
+ }
+ i++;
+ n++;
+ while(true)
+ { if (i > j) return n;
+ if (! cons(i)) break;
+ i++;
+ }
+ i++;
+ }
+ }
+
+ /* vowelinstem() is true <=> 0,...j contains a vowel */
+
+ private final boolean vowelinstem()
+ { int i; for (i = 0; i <= j; i++) if (! cons(i)) return true;
+ return false;
+ }
+
+ /* doublec(j) is true <=> j,(j-1) contain a double consonant. */
+
+ private final boolean doublec(int j)
+ { if (j < 1) return false;
+ if (b[j] != b[j-1]) return false;
+ return cons(j);
+ }
+
+ /* cvc(i) is true <=> i-2,i-1,i has the form consonant - vowel - consonant
+ and also if the second c is not w,x or y. this is used when trying to
+ restore an e at the end of a short word. e.g.
+
+ cav(e), lov(e), hop(e), crim(e), but
+ snow, box, tray.
+
+ */
+
+ private final boolean cvc(int i)
+ { if (i < 2 || !cons(i) || cons(i-1) || !cons(i-2)) return false;
+ { int ch = b[i];
+ if (ch == 'w' || ch == 'x' || ch == 'y') return false;
+ }
+ return true;
+ }
+
+ private final boolean ends(String s)
+ { int l = s.length();
+ int o = k-l+1;
+ if (o < 0) return false;
+ for (int i = 0; i < l; i++) if (b[o+i] != s.charAt(i)) return false;
+ j = k-l;
+ return true;
+ }
+
+ /* setto(s) sets (j+1),...k to the characters in the string s, readjusting
+ k. */
+
+ private final void setto(String s)
+ { int l = s.length();
+ int o = j+1;
+ for (int i = 0; i < l; i++) b[o+i] = s.charAt(i);
+ k = j+l;
+ }
+
+ /* r(s) is used further down. */
+
+ private final void r(String s) { if (m() > 0) setto(s); }
+
+ /* step1() gets rid of plurals and -ed or -ing. e.g.
+
+ caresses -> caress
+ ponies -> poni
+ ties -> ti
+ caress -> caress
+ cats -> cat
+
+ feed -> feed
+ agreed -> agree
+ disabled -> disable
+
+ matting -> mat
+ mating -> mate
+ meeting -> meet
+ milling -> mill
+ messing -> mess
+
+ meetings -> meet
+
+ */
+
+ private final void step1()
+ { if (b[k] == 's')
+ { if (ends("sses")) k -= 2; else
+ if (ends("ies")) setto("i"); else
+ if (b[k-1] != 's') k--;
+ }
+ if (ends("eed")) { if (m() > 0) k--; } else
+ if ((ends("ed") || ends("ing")) && vowelinstem())
+ { k = j;
+ if (ends("at")) setto("ate"); else
+ if (ends("bl")) setto("ble"); else
+ if (ends("iz")) setto("ize"); else
+ if (doublec(k))
+ { k--;
+ { int ch = b[k];
+ if (ch == 'l' || ch == 's' || ch == 'z') k++;
+ }
+ }
+ else if (m() == 1 && cvc(k)) setto("e");
+ }
+ }
+
+ /* step2() turns terminal y to i when there is another vowel in the stem. */
+
+ private final void step2() { if (ends("y") && vowelinstem()) b[k] = 'i'; }
+
+ /* step3() maps double suffices to single ones. so -ization ( = -ize plus
+ -ation) maps to -ize etc. note that the string before the suffix must give
+ m() > 0. */
+
+ private final void step3() { if (k == 0) return; /* For Bug 1 */ switch (b[k-1])
+ {
+ case 'a': if (ends("ational")) { r("ate"); break; }
+ if (ends("tional")) { r("tion"); break; }
+ break;
+ case 'c': if (ends("enci")) { r("ence"); break; }
+ if (ends("anci")) { r("ance"); break; }
+ break;
+ case 'e': if (ends("izer")) { r("ize"); break; }
+ break;
+ case 'l': if (ends("bli")) { r("ble"); break; }
+ if (ends("alli")) { r("al"); break; }
+ if (ends("entli")) { r("ent"); break; }
+ if (ends("eli")) { r("e"); break; }
+ if (ends("ousli")) { r("ous"); break; }
+ break;
+ case 'o': if (ends("ization")) { r("ize"); break; }
+ if (ends("ation")) { r("ate"); break; }
+ if (ends("ator")) { r("ate"); break; }
+ break;
+ case 's': if (ends("alism")) { r("al"); break; }
+ if (ends("iveness")) { r("ive"); break; }
+ if (ends("fulness")) { r("ful"); break; }
+ if (ends("ousness")) { r("ous"); break; }
+ break;
+ case 't': if (ends("aliti")) { r("al"); break; }
+ if (ends("iviti")) { r("ive"); break; }
+ if (ends("biliti")) { r("ble"); break; }
+ break;
+ case 'g': if (ends("logi")) { r("log"); break; }
+ } }
+
+ /* step4() deals with -ic-, -full, -ness etc. similar strategy to step3. */
+
+ private final void step4() { switch (b[k])
+ {
+ case 'e': if (ends("icate")) { r("ic"); break; }
+ if (ends("ative")) { r(""); break; }
+ if (ends("alize")) { r("al"); break; }
+ break;
+ case 'i': if (ends("iciti")) { r("ic"); break; }
+ break;
+ case 'l': if (ends("ical")) { r("ic"); break; }
+ if (ends("ful")) { r(""); break; }
+ break;
+ case 's': if (ends("ness")) { r(""); break; }
+ break;
+ } }
+
+ /* step5() takes off -ant, -ence etc., in context <c>vcvc<v>. */
+
+ private final void step5()
+ { if (k == 0) return; /* for Bug 1 */ switch (b[k-1])
+ { case 'a': if (ends("al")) break; return;
+ case 'c': if (ends("ance")) break;
+ if (ends("ence")) break; return;
+ case 'e': if (ends("er")) break; return;
+ case 'i': if (ends("ic")) break; return;
+ case 'l': if (ends("able")) break;
+ if (ends("ible")) break; return;
+ case 'n': if (ends("ant")) break;
+ if (ends("ement")) break;
+ if (ends("ment")) break;
+ /* element etc. not stripped before the m */
+ if (ends("ent")) break; return;
+ case 'o': if (ends("ion") && j >= 0 && (b[j] == 's' || b[j] == 't')) break;
+ /* j >= 0 fixes Bug 2 */
+ if (ends("ou")) break; return;
+ /* takes care of -ous */
+ case 's': if (ends("ism")) break; return;
+ case 't': if (ends("ate")) break;
+ if (ends("iti")) break; return;
+ case 'u': if (ends("ous")) break; return;
+ case 'v': if (ends("ive")) break; return;
+ case 'z': if (ends("ize")) break; return;
+ default: return;
+ }
+ if (m() > 1) k = j;
+ }
+
+ /* step6() removes a final -e if m() > 1. */
+
+ private final void step6()
+ { j = k;
+ if (b[k] == 'e')
+ { int a = m();
+ if (a > 1 || a == 1 && !cvc(k-1)) k--;
+ }
+ if (b[k] == 'l' && doublec(k) && m() > 1) k--;
+ }
+
+ /** Stem the word placed into the Stemmer buffer through calls to add().
+ * Returns true if the stemming process resulted in a word different
+ * from the input. You can retrieve the result with
+ * getResultLength()/getResultBuffer() or toString().
+ */
+ public void stem()
+ { k = i - 1;
+ if (k > 1) { step1(); step2(); step3(); step4(); step5(); step6(); }
+ i_end = k+1; i = 0;
+ }
+
+ /** Test program for demonstrating the Stemmer. It reads text from a
+ * a list of files, stems each word, and writes the result to standard
+ * output. Note that the word stemmed is expected to be in lower case:
+ * forcing lower case must be done outside the Stemmer class.
+ * Usage: Stemmer file-name file-name ...
+ */
+ public static void main(String[] args)
+ {
+ char[] w = new char[501];
+ Stemmer s = new Stemmer();
+ for (int i = 0; i < args.length; i++)
+ try
+ {
+ FileInputStream in = new FileInputStream(args[i]);
+
+ try
+ { while(true)
+
+ { int ch = in.read();
+ if (Character.isLetter((char) ch))
+ {
+ int j = 0;
+ while(true)
+ { ch = Character.toLowerCase((char) ch);
+ w[j] = (char) ch;
+ if (j < 500) j++;
+ ch = in.read();
+ if (!Character.isLetter((char) ch))
+ {
+ /* to test add(char ch) */
+ for (int c = 0; c < j; c++) s.add(w[c]);
+
+ /* or, to test add(char[] w, int j) */
+ /* s.add(w, j); */
+
+ s.stem();
+ { String u;
+
+ /* and now, to test toString() : */
+ u = s.toString();
+
+ /* to test getResultBuffer(), getResultLength() : */
+ /* u = new String(s.getResultBuffer(), 0, s.getResultLength()); */
+
+ System.out.print(u);
+ }
+ break;
+ }
+ }
+ }
+ if (ch < 0) break;
+ System.out.print((char)ch);
+ }
+ }
+ catch (IOException e)
+ { System.out.println("error reading " + args[i]);
+ break;
+ }
+ }
+ catch (FileNotFoundException e)
+ { System.out.println("file " + args[i] + " not found");
+ break;
+ }
+ }
+}
diff --git a/hotspot/test/compiler/7070134/Test7070134.sh b/hotspot/test/compiler/7070134/Test7070134.sh
new file mode 100644
index 0000000..cbebfba
--- /dev/null
+++ b/hotspot/test/compiler/7070134/Test7070134.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+#
+# 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.
+#
+#
+
+if [ "${TESTSRC}" = "" ]
+then
+ echo "TESTSRC not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTSRC=${TESTSRC}"
+if [ "${TESTJAVA}" = "" ]
+then
+ echo "TESTJAVA not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTJAVA=${TESTJAVA}"
+if [ "${TESTCLASSES}" = "" ]
+then
+ echo "TESTCLASSES not set. Test cannot execute. Failed."
+ exit 1
+fi
+echo "TESTCLASSES=${TESTCLASSES}"
+echo "CLASSPATH=${CLASSPATH}"
+
+set -x
+
+cp ${TESTSRC}/Stemmer.java .
+cp ${TESTSRC}/words .
+
+${TESTJAVA}/bin/javac -d . Stemmer.java
+
+${TESTJAVA}/bin/java ${TESTVMOPTS} -Xbatch Stemmer words > test.out 2>&1
+
+exit $?
+
diff --git a/hotspot/test/compiler/7070134/words b/hotspot/test/compiler/7070134/words
new file mode 100644
index 0000000..10776d2
--- /dev/null
+++ b/hotspot/test/compiler/7070134/words
@@ -0,0 +1,97161 @@
+1080
+10-point
+10th
+11-point
+12-point
+16-point
+18-point
+1st
+2
+20-point
+2,4,5-t
+2,4-d
+2D
+2nd
+30-30
+3-D
+3-d
+3D
+3M
+3rd
+48-point
+4-D
+4GL
+4H
+4th
+5-point
+5-T
+5th
+6-point
+6th
+7-point
+7th
+8-point
+8th
+9-point
+9th
+-a
+A
+A.
+a
+a'
+a-
+a.
+A-1
+A1
+a1
+A4
+A5
+AA
+aa
+A.A.A.
+AAA
+aaa
+AAAA
+AAAAAA
+AAAL
+AAAS
+Aaberg
+Aachen
+AAE
+AAEE
+AAF
+AAG
+aah
+aahed
+aahing
+aahs
+AAII
+aal
+Aalborg
+Aalesund
+aalii
+aaliis
+aals
+Aalst
+Aalto
+AAM
+aam
+AAMSI
+Aandahl
+A-and-R
+Aani
+AAO
+AAP
+AAPSS
+Aaqbiye
+Aar
+Aara
+Aarau
+AARC
+aardvark
+aardvarks
+aardwolf
+aardwolves
+Aaren
+Aargau
+aargh
+Aarhus
+Aarika
+Aaron
+aaron
+Aaronic
+aaronic
+Aaronical
+Aaronite
+Aaronitic
+Aaron's-beard
+Aaronsburg
+Aaronson
+AARP
+aarrgh
+aarrghh
+Aaru
+AAS
+aas
+A'asia
+aasvogel
+aasvogels
+AAU
+AAUP
+AAUW
+AAVSO
+AAX
+A-axes
+A-axis
+A.B.
+AB
+Ab
+ab
+ab-
+A.B.A.
+ABA
+Aba
+aba
+Ababa
+Ababdeh
+Ababua
+abac
+abaca
+abacas
+abacate
+abacaxi
+abacay
+abaci
+abacinate
+abacination
+abacisci
+abaciscus
+abacist
+aback
+abacli
+Abaco
+abacot
+abacterial
+abactinal
+abactinally
+abaction
+abactor
+abaculi
+abaculus
+abacus
+abacuses
+Abad
+abada
+Abadan
+Abaddon
+abaddon
+abadejo
+abadengo
+abadia
+Abadite
+abaff
+abaft
+Abagael
+Abagail
+Abagtha
+Abailard
+abaisance
+abaised
+abaiser
+abaisse
+abaissed
+abaka
+Abakan
+abakas
+Abakumov
+abalation
+abalienate
+abalienated
+abalienating
+abalienation
+abalone
+abalones
+Abama
+abamp
+abampere
+abamperes
+abamps
+Abana
+aband
+abandon
+abandonable
+abandoned
+abandonedly
+abandonee
+abandoner
+abandoners
+abandoning
+abandonment
+abandonments
+abandons
+abandum
+abanet
+abanga
+Abanic
+abannition
+Abantes
+abapical
+abaptiston
+abaptistum
+Abarambo
+Abarbarea
+Abaris
+abarthrosis
+abarticular
+abarticulation
+Abas
+abas
+abase
+abased
+abasedly
+abasedness
+abasement
+abasements
+abaser
+abasers
+abases
+Abasgi
+abash
+abashed
+abashedly
+abashedness
+abashes
+abashing
+abashless
+abashlessly
+abashment
+abashments
+abasia
+abasias
+abasic
+abasing
+abasio
+abask
+abassi
+Abassieh
+Abassin
+abastard
+abastardize
+abastral
+abatable
+abatage
+Abate
+abate
+abated
+abatement
+abatements
+abater
+abaters
+abates
+abatic
+abating
+abatis
+abatised
+abatises
+abatjour
+abatjours
+abaton
+abator
+abators
+ABATS
+abattage
+abattis
+abattised
+abattises
+abattoir
+abattoirs
+abattu
+abattue
+Abatua
+abature
+abaue
+abave
+abaxial
+abaxile
+abay
+abayah
+abaze
+abb
+Abba
+abba
+abbacies
+abbacomes
+abbacy
+Abbadide
+Abbai
+abbandono
+abbas
+abbasi
+Abbasid
+abbasid
+abbassi
+Abbassid
+Abbasside
+Abbate
+abbate
+abbatial
+abbatical
+abbatie
+abbaye
+Abbe
+abbe
+abbes
+abbess
+abbesses
+abbest
+Abbevilean
+Abbeville
+Abbevillian
+abbevillian
+Abbey
+abbey
+abbeys
+abbeystead
+abbeystede
+Abbi
+Abbie
+abboccato
+abbogada
+Abbot
+abbot
+abbotcies
+abbotcy
+abbotnullius
+abbotric
+abbots
+Abbotsen
+Abbotsford
+abbotship
+abbotships
+Abbotson
+Abbotsun
+Abbott
+abbott
+Abbottson
+Abbottstown
+Abboud
+abbozzo
+ABBR
+abbr
+abbrev
+abbreviatable
+abbreviate
+abbreviated
+abbreviately
+abbreviates
+abbreviating
+abbreviation
+abbreviations
+abbreviator
+abbreviators
+abbreviatory
+abbreviature
+abbroachment
+Abby
+abby
+Abbye
+Abbyville
+ABC
+abc
+abcess
+abcissa
+abcoulomb
+ABCs
+abd
+abdal
+abdali
+abdaria
+abdat
+Abdel
+Abd-el-Kadir
+Abd-el-Krim
+Abdella
+Abderhalden
+Abderian
+Abderite
+Abderus
+abdest
+Abdias
+abdicable
+abdicant
+abdicate
+abdicated
+abdicates
+abdicating
+abdication
+abdications
+abdicative
+abdicator
+Abdiel
+abditive
+abditory
+abdom
+abdomen
+abdomens
+abdomina
+abdominal
+Abdominales
+abdominales
+abdominalia
+abdominalian
+abdominally
+abdominals
+abdominoanterior
+abdominocardiac
+abdominocentesis
+abdominocystic
+abdominogenital
+abdominohysterectomy
+abdominohysterotomy
+abdominoposterior
+abdominoscope
+abdominoscopy
+abdominothoracic
+abdominous
+abdomino-uterotomy
+abdominovaginal
+abdominovesical
+Abdon
+Abdu
+abduce
+abduced
+abducens
+abducent
+abducentes
+abduces
+abducing
+abduct
+abducted
+abducting
+abduction
+abductions
+abductor
+abductores
+abductors
+abducts
+Abdul
+Abdul-Aziz
+Abdul-baha
+Abdulla
+Abe
+a-be
+abeam
+abear
+abearance
+Abebi
+abecedaire
+abecedaria
+abecedarian
+abecedarians
+abecedaries
+abecedarium
+abecedarius
+abecedary
+abed
+abede
+abedge
+Abednego
+abegge
+abeigh
+ABEL
+Abel
+abel
+Abelard
+abele
+abeles
+Abelia
+Abelian
+abelian
+Abelicea
+Abelite
+abelite
+Abell
+Abelmoschus
+abelmosk
+abelmosks
+abelmusk
+Abelonian
+Abelson
+abeltree
+Abencerrages
+abend
+abends
+Abenezra
+abenteric
+Abeokuta
+abepithymia
+ABEPP
+Abercrombie
+Abercromby
+Aberdare
+aberdavine
+Aberdeen
+aberdeen
+Aberdeenshire
+aberdevine
+Aberdonian
+aberduvine
+Aberfan
+Aberglaube
+Aberia
+Abernant
+Abernathy
+abernethy
+Abernon
+aberr
+aberrance
+aberrancies
+aberrancy
+aberrant
+aberrantly
+aberrants
+aberrate
+aberrated
+aberrating
+aberration
+aberrational
+aberrations
+aberrative
+aberrator
+aberrometer
+aberroscope
+Abert
+aberuncate
+aberuncator
+Aberystwyth
+abesse
+abessive
+abet
+abetment
+abetments
+abets
+abettal
+abettals
+abetted
+abetter
+abetters
+abetting
+abettor
+abettors
+Abeu
+abevacuation
+Abey
+abey
+abeyance
+abeyances
+abeyancies
+abeyancy
+abeyant
+abfarad
+abfarads
+ABFM
+Abgatha
+ABHC
+abhenries
+abhenry
+abhenrys
+abhinaya
+abhiseka
+abhominable
+abhor
+abhorred
+abhorrence
+abhorrences
+abhorrency
+abhorrent
+abhorrently
+abhorrer
+abhorrers
+abhorrible
+abhorring
+abhors
+Abhorson
+ABI
+Abia
+Abiathar
+Abib
+abib
+abichite
+abidal
+abidance
+abidances
+abidden
+abide
+abided
+abider
+abiders
+abides
+abidi
+abiding
+abidingly
+abidingness
+Abidjan
+Abie
+abied
+abiegh
+abience
+abient
+Abies
+abies
+abietate
+abietene
+abietic
+abietin
+Abietineae
+abietineous
+abietinic
+abietite
+Abiezer
+Abigael
+Abigail
+abigail
+abigails
+abigailship
+Abigale
+abigeat
+abigei
+abigeus
+Abihu
+Abijah
+abilao
+Abilene
+abilene
+abiliment
+abilitable
+abilities
+-ability
+ability
+abilla
+abilo
+Abilyne
+abime
+Abimelech
+Abineri
+Abingdon
+Abinger
+Abington
+Abinoam
+Abinoem
+abintestate
+abiogeneses
+abiogenesis
+abiogenesist
+abiogenetic
+abiogenetical
+abiogenetically
+abiogenist
+abiogenous
+abiogeny
+abiological
+abiologically
+abiology
+abioses
+abiosis
+abiotic
+abiotical
+abiotically
+abiotrophic
+abiotrophy
+Abipon
+Abiquiu
+abir
+abirritant
+abirritate
+abirritated
+abirritating
+abirritation
+abirritative
+Abisag
+Abisha
+Abishag
+Abisia
+abiston
+abit
+Abitibi
+Abiu
+abiuret
+Abixah
+abject
+abjectedness
+abjection
+abjections
+abjective
+abjectly
+abjectness
+abjectnesses
+abjoint
+abjudge
+abjudged
+abjudging
+abjudicate
+abjudicated
+abjudicating
+abjudication
+abjudicator
+abjugate
+abjunct
+abjunction
+abjunctive
+abjuration
+abjurations
+abjuratory
+abjure
+abjured
+abjurement
+abjurer
+abjurers
+abjures
+abjuring
+abkar
+abkari
+abkary
+Abkhas
+Abkhasia
+Abkhasian
+Abkhaz
+Abkhazia
+Abkhazian
+abl
+abl.
+ablach
+ablactate
+ablactated
+ablactating
+ablactation
+ablaqueate
+ablare
+A-blast
+ablastemic
+ablastin
+ablastous
+ablate
+ablated
+ablates
+ablating
+ablation
+ablations
+ablatitious
+ablatival
+ablative
+ablatively
+ablatives
+ablator
+ablaut
+ablauts
+ablaze
+-able
+able
+able-bodied
+able-bodiedness
+ableeze
+ablegate
+ablegates
+ablegation
+able-minded
+able-mindedness
+ablend
+ableness
+ablepharia
+ablepharon
+ablepharous
+Ablepharus
+ablepsia
+ablepsy
+ableptical
+ableptically
+abler
+ables
+ablesse
+ablest
+ablet
+ablewhackets
+ablings
+ablins
+ablock
+abloom
+ablow
+ABLS
+ablude
+abluent
+abluents
+ablush
+ablute
+abluted
+ablution
+ablutionary
+ablutions
+abluvion
+-ably
+ably
+ABM
+abmho
+abmhos
+abmodalities
+abmodality
+abn
+Abnaki
+Abnakis
+abnegate
+abnegated
+abnegates
+abnegating
+abnegation
+abnegations
+abnegative
+abnegator
+abnegators
+Abner
+abner
+abnerval
+abnet
+abneural
+abnormal
+abnormalcies
+abnormalcy
+abnormalise
+abnormalised
+abnormalising
+abnormalism
+abnormalist
+abnormalities
+abnormality
+abnormalize
+abnormalized
+abnormalizing
+abnormally
+abnormalness
+abnormals
+abnormities
+abnormity
+abnormous
+abnumerable
+Abo
+abo
+aboard
+aboardage
+Abobra
+abococket
+abodah
+abode
+aboded
+abodement
+abodes
+aboding
+abody
+abogado
+abogados
+abohm
+abohms
+aboideau
+aboideaus
+aboideaux
+aboil
+aboiteau
+aboiteaus
+aboiteaux
+abolete
+abolish
+abolishable
+abolished
+abolisher
+abolishers
+abolishes
+abolishing
+abolishment
+abolishments
+abolition
+abolitionary
+abolitionise
+abolitionised
+abolitionising
+abolitionism
+abolitionist
+abolitionists
+abolitionize
+abolitionized
+abolitionizing
+abolitions
+abolla
+abollae
+aboma
+abomas
+abomasa
+abomasal
+abomasi
+abomasum
+abomasus
+abomasusi
+A-bomb
+a-bomb
+abominability
+abominable
+abominableness
+abominably
+abominate
+abominated
+abominates
+abominating
+abomination
+abominations
+abominator
+abominators
+abomine
+abondance
+Abongo
+abonne
+abonnement
+aboon
+aborad
+aboral
+aborally
+abord
+Aboriginal
+aboriginal
+aboriginality
+aboriginally
+aboriginals
+aboriginary
+Aborigine
+aborigine
+aborigines
+Abor-miri
+Aborn
+a-borning
+aborning
+aborsement
+aborsive
+abort
+aborted
+aborter
+aborters
+aborticide
+abortient
+abortifacient
+abortin
+aborting
+abortion
+abortional
+abortionist
+abortionists
+abortions
+abortive
+abortively
+abortiveness
+abortogenic
+aborts
+abortus
+abortuses
+abos
+abote
+Abott
+abouchement
+aboudikro
+abought
+Aboukir
+aboulia
+aboulias
+aboulic
+abound
+abounded
+abounder
+abounding
+aboundingly
+abounds
+Abourezk
+about
+about-face
+about-faced
+about-facing
+abouts
+about-ship
+about-shipped
+about-shipping
+about-sledge
+about-turn
+above
+above-board
+aboveboard
+above-cited
+abovedeck
+above-found
+above-given
+aboveground
+above-mentioned
+abovementioned
+above-named
+aboveproof
+above-quoted
+above-reported
+aboves
+above-said
+abovesaid
+abovestairs
+above-water
+above-written
+abow
+abox
+Abp
+abp
+ABPC
+Abqaiq
+abr
+abr.
+Abra
+abracadabra
+abrachia
+abrachias
+abradable
+abradant
+abradants
+abrade
+abraded
+abrader
+abraders
+abrades
+abrading
+Abraham
+abraham
+Abrahamic
+Abrahamidae
+Abrahamite
+Abrahamitic
+Abraham-man
+abraham-man
+Abrahams
+Abrahamsen
+Abrahan
+abraid
+Abram
+Abramis
+Abramo
+Abrams
+Abramson
+Abran
+abranchial
+abranchialism
+abranchian
+Abranchiata
+abranchiate
+abranchious
+abrasax
+abrase
+abrased
+abraser
+abrash
+abrasing
+abrasiometer
+abrasion
+abrasions
+abrasive
+abrasively
+abrasiveness
+abrasivenesses
+abrasives
+abrastol
+abraum
+abraxas
+abray
+abrazite
+abrazitic
+abrazo
+abrazos
+abreact
+abreacted
+abreacting
+abreaction
+abreactions
+abreacts
+abreast
+abreed
+abrege
+abreid
+abrenounce
+abrenunciate
+abrenunciation
+abreption
+abret
+abreuvoir
+abri
+abrico
+abricock
+abricot
+abridgable
+abridge
+abridgeable
+abridged
+abridgedly
+abridgement
+abridgements
+abridger
+abridgers
+abridges
+abridging
+abridgment
+abridgments
+abrim
+abrin
+abrine
+abris
+abristle
+abroach
+abroad
+Abrocoma
+abrocome
+abrogable
+abrogate
+abrogated
+abrogates
+abrogating
+abrogation
+abrogations
+abrogative
+abrogator
+abrogators
+Abroma
+Abroms
+Abronia
+abronia
+abrood
+abrook
+abrosia
+abrosias
+abrotanum
+abrotin
+abrotine
+abrupt
+abruptedly
+abrupter
+abruptest
+abruptio
+abruption
+abruptiones
+abruptly
+abruptness
+Abrus
+Abruzzi
+ABS
+abs
+abs-
+Absa
+Absalom
+absampere
+Absaraka
+Absaroka
+Absarokee
+absarokite
+ABSBH
+abscam
+abscess
+abscessed
+abscesses
+abscessing
+abscession
+abscessroot
+abscind
+abscise
+abscised
+abscises
+abscisin
+abscising
+abscisins
+abscision
+absciss
+abscissa
+abscissae
+abscissas
+abscisse
+abscissin
+abscission
+abscissions
+absconce
+abscond
+absconded
+abscondedly
+abscondence
+absconder
+absconders
+absconding
+absconds
+absconsa
+abscoulomb
+abscound
+Absecon
+absee
+abseil
+abseiled
+abseiling
+abseils
+absence
+absences
+absent
+absentation
+absented
+absentee
+absenteeism
+absentees
+absenteeship
+absenter
+absenters
+absentia
+absenting
+absently
+absentment
+absent-minded
+absentminded
+absent-mindedly
+absentmindedly
+absent-mindedness
+absentmindedness
+absentmindednesses
+absentness
+absents
+absey
+absfarad
+abshenry
+Abshier
+Absi
+absinth
+absinthe
+absinthes
+absinthial
+absinthian
+absinthiate
+absinthiated
+absinthiating
+absinthic
+absinthiin
+absinthin
+absinthine
+absinthism
+absinthismic
+absinthium
+absinthol
+absinthole
+absinths
+absis
+absist
+absistos
+absit
+absmho
+absohm
+absoil
+absolent
+Absolute
+absolute
+absolutely
+absoluteness
+absoluter
+absolutes
+absolutest
+absolution
+absolutions
+absolutism
+absolutist
+absolutista
+absolutistic
+absolutistically
+absolutists
+absolutive
+absolutization
+absolutize
+absolutory
+absolvable
+absolvatory
+absolve
+absolved
+absolvent
+absolver
+absolvers
+absolves
+absolving
+absolvitor
+absolvitory
+absonant
+absonous
+absorb
+absorbability
+absorbable
+absorbance
+absorbancy
+absorbant
+absorbed
+absorbedly
+absorbedness
+absorbefacient
+absorbencies
+absorbency
+absorbent
+absorbents
+absorber
+absorbers
+absorbing
+absorbingly
+absorbition
+absorbs
+absorbtion
+absorpt
+absorptance
+absorptiometer
+absorptiometric
+absorption
+absorptional
+absorptions
+absorptive
+absorptively
+absorptiveness
+absorptivity
+absquatulate
+absquatulation
+abstain
+abstained
+abstainer
+abstainers
+abstaining
+abstainment
+abstains
+abstemious
+abstemiously
+abstemiousness
+abstention
+abstentionism
+abstentionist
+abstentions
+abstentious
+absterge
+absterged
+abstergent
+absterges
+absterging
+absterse
+abstersion
+abstersive
+abstersiveness
+abstertion
+abstinence
+abstinences
+abstinency
+abstinent
+abstinential
+abstinently
+abstort
+abstr
+abstract
+abstractable
+abstracted
+abstractedly
+abstractedness
+abstracter
+abstracters
+abstractest
+abstracting
+abstraction
+abstractional
+abstractionism
+abstractionist
+abstractionists
+abstractions
+abstractitious
+abstractive
+abstractively
+abstractiveness
+abstractly
+abstractness
+abstractnesses
+abstractor
+abstractors
+abstracts
+abstrahent
+abstrict
+abstricted
+abstricting
+abstriction
+abstricts
+abstrude
+abstruse
+abstrusely
+abstruseness
+abstrusenesses
+abstruser
+abstrusest
+abstrusion
+abstrusities
+abstrusity
+absume
+absumption
+absurd
+absurder
+absurdest
+absurdism
+absurdist
+absurdities
+absurdity
+absurdly
+absurdness
+absurds
+absurdum
+absvolt
+Absyrtus
+abt
+abterminal
+abthain
+abthainrie
+abthainry
+abthanage
+abtruse
+Abu
+abu
+abubble
+Abu-Bekr
+Abucay
+abucco
+abuilding
+Abukir
+abuleia
+Abulfeda
+abulia
+abulias
+abulic
+abulomania
+abulyeit
+abumbral
+abumbrellar
+Abuna
+abuna
+abundance
+abundances
+abundancy
+abundant
+Abundantia
+abundantly
+abune
+abura
+aburabozu
+aburagiri
+aburban
+aburst
+aburton
+Abury
+abusable
+abusage
+abuse
+abused
+abusedly
+abusee
+abuseful
+abusefully
+abusefulness
+abuser
+abusers
+abuses
+abush
+abusing
+abusion
+abusious
+abusive
+abusively
+abusiveness
+abusivenesses
+abut
+Abuta
+Abutilon
+abutilon
+abutilons
+abutment
+abutments
+abuts
+abuttal
+abuttals
+abutted
+abutter
+abutters
+abutting
+abuzz
+abv
+abvolt
+abvolts
+abwab
+abwatt
+abwatts
+aby
+Abydos
+abye
+abyed
+abyes
+abying
+Abyla
+abys
+abysm
+abysmal
+abysmally
+abysms
+Abyss
+abyss
+abyssa
+abyssal
+abysses
+Abyssinia
+abyssinia
+Abyssinian
+abyssinian
+abyssinians
+abyssobenthonic
+abyssolith
+abyssopelagic
+abyssus
+-ac
+A.C.
+A/C
+AC
+Ac
+a-c
+a.c.
+a/c
+ac
+ac-
+ACAA
+Acacallis
+acacatechin
+acacatechol
+Acacea
+Acaceae
+acacetin
+Acacia
+acacia
+Acacian
+acacias
+acaciin
+acacin
+acacine
+acad
+academe
+academes
+academia
+academial
+academian
+academias
+Academic
+academic
+academical
+academically
+academicals
+academician
+academicians
+academicianship
+academicism
+academics
+academie
+academies
+academise
+academised
+academising
+academism
+academist
+academite
+academization
+academize
+academized
+academizing
+Academus
+Academy
+academy
+Acadia
+acadia
+acadialite
+Acadian
+acadian
+Acadie
+Acaena
+acaena
+acajou
+acajous
+-acal
+acalculia
+acale
+acaleph
+Acalepha
+acalepha
+Acalephae
+acalephae
+acalephan
+acalephe
+acalephes
+acalephoid
+acalephs
+Acalia
+acalycal
+acalycine
+acalycinous
+acalyculate
+Acalypha
+Acalypterae
+Acalyptrata
+Acalyptratae
+acalyptrate
+Acamar
+Acamas
+Acampo
+acampsia
+acana
+acanaceous
+acanonical
+acanth
+acanth-
+acantha
+Acanthaceae
+acanthaceous
+acanthad
+Acantharia
+acanthi
+Acanthia
+acanthial
+acanthin
+acanthine
+acanthion
+acanthite
+acantho-
+acanthocarpous
+Acanthocephala
+acanthocephalan
+Acanthocephali
+acanthocephalous
+Acanthocereus
+acanthocladous
+Acanthodea
+acanthodean
+Acanthodei
+Acanthodes
+acanthodian
+Acanthodidae
+Acanthodii
+Acanthodini
+acanthoid
+Acantholimon
+acanthological
+acanthology
+acantholysis
+acanthoma
+acanthomas
+Acanthomeridae
+acanthon
+Acanthopanax
+Acanthophis
+acanthophorous
+acanthopod
+acanthopodous
+acanthopomatous
+acanthopore
+acanthopteran
+Acanthopteri
+acanthopterous
+acanthopterygian
+Acanthopterygii
+acanthoses
+acanthosis
+acanthotic
+acanthous
+Acanthuridae
+Acanthurus
+acanthus
+acanthuses
+acanthuthi
+acapnia
+acapnial
+acapnias
+acappella
+acapsular
+acapu
+Acapulco
+acapulco
+acara
+Acarapis
+acarari
+acardia
+acardiac
+acardite
+acari
+acarian
+acariasis
+acariatre
+acaricidal
+acaricide
+acarid
+Acarida
+acaridae
+acaridan
+acaridans
+Acaridea
+acaridean
+acaridomatia
+acaridomatium
+acarids
+acariform
+Acarina
+acarine
+acarines
+acarinosis
+Acarnan
+acarocecidia
+acarocecidium
+acarodermatitis
+acaroid
+acarol
+acarologist
+acarology
+acarophilous
+acarophobia
+acarotoxic
+acarpellous
+acarpelous
+acarpous
+Acarus
+acarus
+ACAS
+acast
+Acastus
+acatalectic
+acatalepsia
+acatalepsy
+acataleptic
+acatallactic
+acatamathesia
+acataphasia
+acataposis
+acatastasia
+acatastatic
+acate
+acategorical
+acater
+acatery
+acates
+acatharsia
+acatharsy
+acatholic
+acaudal
+acaudate
+acaudelescent
+acaulescence
+acaulescent
+acauline
+acaulose
+acaulous
+ACAWS
+ACB
+ACBL
+ACC
+acc
+acc.
+acca
+accable
+Accad
+accademia
+Accadian
+accadian
+Accalia
+acce
+accede
+acceded
+accedence
+acceder
+acceders
+accedes
+acceding
+accel
+accel.
+accelerable
+accelerando
+accelerant
+accelerate
+accelerated
+acceleratedly
+accelerates
+accelerating
+acceleratingly
+acceleration
+accelerations
+accelerative
+accelerator
+acceleratorh
+accelerators
+acceleratory
+accelerograph
+accelerometer
+accelerometers
+accend
+accendibility
+accendible
+accensed
+accension
+accensor
+accent
+accented
+accenting
+accentless
+accentor
+accentors
+accents
+accentuable
+accentual
+accentuality
+accentually
+accentuate
+accentuated
+accentuates
+accentuating
+accentuation
+accentuations
+accentuator
+accentus
+accept
+acceptabilities
+acceptability
+acceptable
+acceptableness
+acceptably
+acceptance
+acceptances
+acceptancies
+acceptancy
+acceptant
+acceptation
+acceptavit
+accepted
+acceptedly
+acceptee
+acceptees
+accepter
+accepters
+acceptilate
+acceptilated
+acceptilating
+acceptilation
+accepting
+acceptingly
+acceptingness
+acception
+acceptive
+acceptor
+acceptors
+acceptress
+accepts
+accerse
+accersition
+accersitor
+access
+accessability
+accessable
+accessaries
+accessarily
+accessariness
+accessary
+accessaryship
+accessed
+accesses
+accessibilities
+accessibility
+accessible
+accessibleness
+accessibly
+accessing
+accession
+accessional
+accessioned
+accessioner
+accessioning
+accessions
+accessit
+accessive
+accessively
+accessless
+accessor
+accessorial
+accessories
+accessorii
+accessorily
+accessoriness
+accessorius
+accessoriusorii
+accessorize
+accessorized
+accessorizing
+accessors
+accessory
+acciaccatura
+acciaccaturas
+acciaccature
+accidence
+accidencies
+accidency
+accident
+accidental
+accidentalism
+accidentalist
+accidentality
+accidentally
+accidentalness
+accidentals
+accidentarily
+accidentary
+accidented
+accidential
+accidentiality
+accidently
+accident-prone
+accidents
+accidia
+accidias
+accidie
+accidies
+accinge
+accinged
+accinging
+accipenser
+accipient
+Accipiter
+accipiter
+accipitral
+accipitrary
+Accipitres
+accipitrine
+accipter
+accise
+accismus
+accite
+Accius
+acclaim
+acclaimable
+acclaimed
+acclaimer
+acclaimers
+acclaiming
+acclaims
+acclamation
+acclamations
+acclamator
+acclamatory
+acclimatable
+acclimatation
+acclimate
+acclimated
+acclimatement
+acclimates
+acclimating
+acclimation
+acclimations
+acclimatisable
+acclimatisation
+acclimatise
+acclimatised
+acclimatiser
+acclimatising
+acclimatizable
+acclimatization
+acclimatizations
+acclimatize
+acclimatized
+acclimatizer
+acclimatizes
+acclimatizing
+acclimature
+acclinal
+acclinate
+acclivities
+acclivitous
+acclivity
+acclivous
+accloy
+accoast
+accoil
+Accokeek
+accolade
+accoladed
+accolades
+accolated
+accolent
+accoll
+accolle
+accolled
+accollee
+Accomac
+accombination
+accommodable
+accommodableness
+accommodate
+accommodated
+accommodately
+accommodateness
+accommodates
+accommodating
+accommodatingly
+accommodatingness
+accommodation
+accommodational
+accommodationist
+accommodations
+accommodative
+accommodatively
+accommodativeness
+accommodator
+accommodators
+accomodate
+accompanable
+accompanied
+accompanier
+accompanies
+accompaniment
+accompanimental
+accompaniments
+accompanist
+accompanists
+accompany
+accompanying
+accompanyist
+accomplement
+accompletive
+accompli
+accomplice
+accomplices
+accompliceship
+accomplicity
+accomplis
+accomplish
+accomplishable
+accomplished
+accomplisher
+accomplishers
+accomplishes
+accomplishing
+accomplishment
+accomplishments
+accomplisht
+accompt
+accord
+accordable
+accordance
+accordances
+accordancy
+accordant
+accordantly
+accordatura
+accordaturas
+accordature
+accorded
+accorder
+accorders
+according
+accordingly
+accordion
+accordionist
+accordionists
+accordions
+accords
+accorporate
+accorporation
+accost
+accostable
+accosted
+accosting
+accosts
+accouche
+accouchement
+accouchements
+accoucheur
+accoucheurs
+accoucheuse
+accoucheuses
+accounsel
+account
+accountabilities
+accountability
+accountable
+accountableness
+accountably
+accountancies
+accountancy
+accountant
+accountants
+accountantship
+accounted
+accounter
+accounters
+accounting
+accountings
+accountment
+accountrement
+accounts
+accouple
+accouplement
+accourage
+accourt
+accouter
+accoutered
+accoutering
+accouterment
+accouterments
+accouters
+accoutre
+accoutred
+accoutrement
+accoutrements
+accoutres
+accoutring
+Accoville
+accoy
+accoyed
+accoying
+ACCRA
+Accra
+accra
+accrease
+accredit
+accreditable
+accreditate
+accreditation
+accreditations
+accredited
+accreditee
+accrediting
+accreditment
+accredits
+accrementitial
+accrementition
+accresce
+accrescence
+accrescendi
+accrescendo
+accrescent
+accretal
+accrete
+accreted
+accretes
+accreting
+accretion
+accretionary
+accretions
+accretive
+accriminate
+Accrington
+accroach
+accroached
+accroaching
+accroachment
+accroides
+accruable
+accrual
+accruals
+accrue
+accrued
+accruement
+accruer
+accrues
+accruing
+ACCS
+ACCT
+acct
+acct.
+accts
+accubation
+accubita
+accubitum
+accubitus
+accueil
+accultural
+acculturate
+acculturated
+acculturates
+acculturating
+acculturation
+acculturational
+acculturationist
+acculturative
+acculturize
+acculturized
+acculturizing
+accum
+accumb
+accumbency
+accumbent
+accumber
+accumulable
+accumulate
+accumulated
+accumulates
+accumulating
+accumulation
+accumulations
+accumulativ
+accumulative
+accumulatively
+accumulativeness
+accumulator
+accumulators
+accupy
+accur
+accuracies
+accuracy
+accurate
+accurately
+accurateness
+accuratenesses
+accurre
+accurse
+accursed
+accursedly
+accursedness
+accursing
+accurst
+accurtation
+accus
+accusable
+accusably
+accusal
+accusals
+accusant
+accusants
+accusation
+accusations
+accusatival
+accusative
+accusative-dative
+accusatively
+accusativeness
+accusatives
+accusator
+accusatorial
+accusatorially
+accusatory
+accusatrix
+accusatrixes
+accuse
+accused
+accuser
+accusers
+accuses
+accusing
+accusingly
+accusive
+accusor
+accustom
+accustomation
+accustomed
+accustomedly
+accustomedness
+accustoming
+accustomize
+accustomized
+accustomizing
+accustoms
+Accutron
+ACD
+ACDA
+AC-DC
+AC/DC
+ACE
+Ace
+ace
+-acea
+aceacenaphthene
+-aceae
+-acean
+aceanthrene
+aceanthrenequinone
+acecaffin
+acecaffine
+aceconitic
+aced
+acedia
+acediamin
+acediamine
+acedias
+acediast
+acedy
+ace-high
+aceite
+aceituna
+Aceldama
+aceldama
+aceldamas
+acellular
+Acemetae
+Acemetic
+acemila
+acenaphthene
+acenaphthenyl
+acenaphthylene
+acenesthesia
+acensuada
+acensuador
+acentric
+acentrous
+aceologic
+aceology
+-aceous
+acephal
+Acephala
+acephala
+acephalan
+Acephali
+acephali
+acephalia
+Acephalina
+acephaline
+acephalism
+acephalist
+Acephalite
+acephalocyst
+acephalous
+acephalus
+acepots
+acequia
+acequiador
+acequias
+Acer
+Aceraceae
+aceraceous
+Acerae
+Acerata
+acerate
+acerated
+Acerates
+acerathere
+Aceratherium
+aceratosis
+acerb
+Acerbas
+acerbate
+acerbated
+acerbates
+acerbating
+acerber
+acerbest
+acerbic
+acerbically
+acerbities
+acerbitude
+acerbity
+acerbityacerose
+acerbly
+acerbophobia
+acerdol
+aceric
+acerin
+acerli
+acerola
+acerolas
+acerose
+acerous
+acerra
+acers
+acertannin
+acerval
+acervate
+acervately
+acervatim
+acervation
+acervative
+acervose
+acervuli
+acervuline
+acervulus
+aces
+acescence
+acescency
+acescent
+acescents
+aceship
+Acesius
+acesodyne
+acesodynous
+Acessamenus
+Acestes
+acestoma
+acet-
+aceta
+acetable
+acetabula
+acetabular
+Acetabularia
+acetabularia
+acetabuliferous
+acetabuliform
+acetabulous
+acetabulum
+acetabulums
+acetacetic
+acetal
+acetaldehydase
+acetaldehyde
+acetaldehydrase
+acetaldol
+acetalization
+acetalize
+acetals
+acetamid
+acetamide
+acetamidin
+acetamidine
+acetamido
+acetamids
+acetaminol
+Acetaminophen
+acetaminophen
+acetanilid
+acetanilide
+acetanion
+acetaniside
+acetanisidide
+acetanisidine
+acetannin
+acetarious
+acetars
+acetarsone
+acetary
+acetate
+acetated
+acetates
+acetation
+acetazolamide
+acetbromamide
+acetenyl
+Acetes
+acethydrazide
+acetiam
+acetic
+acetification
+acetified
+acetifier
+acetifies
+acetify
+acetifying
+acetimeter
+acetimetric
+acetimetry
+acetin
+acetine
+acetins
+acetite
+acetize
+acetla
+acetmethylanilide
+acetnaphthalide
+aceto-
+acetoacetanilide
+acetoacetate
+acetoacetic
+acetoamidophenol
+acetoarsenite
+Acetobacter
+acetobacter
+acetobenzoic
+acetobromanilide
+acetochloral
+acetocinnamene
+acetoin
+acetol
+acetolysis
+acetolytic
+acetometer
+acetometric
+acetometrical
+acetometrically
+acetometry
+acetomorphin
+acetomorphine
+acetonaemia
+acetonaemic
+acetonaphthone
+acetonate
+acetonation
+acetone
+acetonemia
+acetonemic
+acetones
+acetonic
+acetonitrile
+acetonization
+acetonize
+acetonuria
+acetonurometer
+acetonyl
+acetonylacetone
+acetonylidene
+acetophenetide
+acetophenetidin
+acetophenetidine
+acetophenin
+acetophenine
+acetophenone
+acetopiperone
+acetopyrin
+acetopyrine
+acetosalicylic
+acetose
+acetosity
+acetosoluble
+acetostearin
+acetothienone
+acetotoluid
+acetotoluide
+acetotoluidine
+acetous
+acetoveratrone
+acetoxim
+acetoxime
+acetoxyl
+acetoxyls
+acetoxyphthalide
+acetphenetid
+acetphenetidin
+acetract
+acettoluide
+acetum
+aceturic
+acetyl
+acetylacetonates
+acetylacetone
+acetylamine
+acetylaminobenzene
+acetylaniline
+acetylasalicylic
+acetylate
+acetylated
+acetylating
+acetylation
+acetylative
+acetylator
+acetylbenzene
+acetylbenzoate
+acetylbenzoic
+acetylbiuret
+acetylcarbazole
+acetylcellulose
+acetylcholine
+acetylcholinesterase
+acetylcholinic
+acetylcyanide
+acetylenation
+acetylene
+acetylenediurein
+acetylenes
+acetylenic
+acetylenogen
+acetylenyl
+acetylfluoride
+acetylglycin
+acetylglycine
+acetylhydrazine
+acetylic
+acetylid
+acetylide
+acetyliodide
+acetylizable
+acetylization
+acetylize
+acetylized
+acetylizer
+acetylizing
+acetylmethylcarbinol
+acetylperoxide
+acetylphenol
+acetylphenylhydrazine
+acetylrosaniline
+acetyls
+acetylsalicylate
+acetylsalicylic
+acetylsalol
+acetyltannin
+acetylthymol
+acetyltropeine
+acetylurea
+Acey
+acey-deucy
+ACF
+ACGI
+ac-globulin
+ACH
+ach
+Achab
+Achad
+Achaea
+Achaean
+Achaemenes
+Achaemenian
+Achaemenid
+Achaemenidae
+Achaemenides
+Achaemenidian
+Achaemenids
+achaenocarp
+Achaenodon
+Achaeta
+achaetous
+Achaeus
+achafe
+achage
+Achagua
+Achaia
+Achaian
+Achakzai
+achalasia
+Achamoth
+Achan
+Achango
+achape
+achaque
+achar
+Achariaceae
+Achariaceous
+acharne
+acharnement
+Acharnians
+acharya
+achate
+Achates
+achates
+Achatina
+Achatinella
+Achatinidae
+achatour
+Achaz
+ache
+acheat
+achech
+acheck
+ached
+acheer
+ACHEFT
+acheilary
+acheilia
+acheilous
+acheiria
+acheirous
+acheirus
+Achelous
+Achen
+achene
+achenes
+achenia
+achenial
+achenium
+achenocarp
+achenodia
+achenodium
+acher
+Acherman
+Achernar
+Acheron
+acheron
+Acheronian
+acheronian
+Acherontic
+acherontic
+Acherontical
+aches
+Acheson
+achesoun
+achete
+Achetidae
+Acheulean
+acheulean
+Acheulian
+acheweed
+achier
+achiest
+achievability
+achievable
+achieve
+achieved
+achievement
+achievements
+achiever
+achievers
+achieves
+achieving
+achigan
+achilary
+Achill
+achill
+Achille
+Achillea
+achillea
+Achillean
+achillean
+achilleas
+Achilleid
+achillein
+achilleine
+Achilles
+achilles
+Achillize
+achillize
+achillobursitis
+achillodynia
+achilous
+Achimaas
+achime
+Achimelech
+Achimenes
+achimenes
+Achinese
+achiness
+achinesses
+aching
+achingly
+achiote
+achiotes
+achira
+achirite
+Achish
+Achitophel
+achkan
+achlamydate
+Achlamydeae
+achlamydeous
+achlorhydria
+achlorhydric
+achlorophyllous
+achloropsia
+achluophobia
+Achmed
+Achmetha
+achoke
+acholia
+acholias
+acholic
+Acholoe
+acholous
+acholuria
+acholuric
+Achomawi
+achondrite
+achondritic
+achondroplasia
+achondroplastic
+achoo
+achor
+achordal
+Achordata
+achordate
+Achorion
+Achorn
+Achras
+achras
+achree
+achroacyte
+Achroanthes
+achrodextrin
+achrodextrinase
+achroglobin
+achroiocythaemia
+achroiocythemia
+achroite
+achroma
+achromacyte
+achromasia
+achromat
+achromat-
+achromate
+Achromatiaceae
+achromatic
+achromatically
+achromaticity
+achromatin
+achromatinic
+achromatisation
+achromatise
+achromatised
+achromatising
+achromatism
+Achromatium
+achromatizable
+achromatization
+achromatize
+achromatized
+achromatizing
+achromatocyte
+achromatolysis
+achromatope
+achromatophil
+achromatophile
+achromatophilia
+achromatophilic
+achromatopia
+achromatopsia
+achromatopsy
+achromatosis
+achromatous
+achromats
+achromaturia
+achromia
+achromic
+Achromobacter
+achromobacter
+Achromobacterieae
+achromoderma
+achromophilous
+achromotrichia
+achromous
+Achromycin
+achronical
+achronism
+achronychous
+achroo-
+achroodextrin
+achroodextrinase
+achroous
+achropsia
+Achsah
+achtehalber
+achtel
+achtelthaler
+achter
+achterveld
+Achuas
+achuete
+achy
+ach-y-fi
+achylia
+achylous
+achymia
+achymous
+Achyranthes
+Achyrodes
+acichlorid
+acichloride
+acicula
+aciculae
+acicular
+acicularity
+acicularly
+aciculas
+aciculate
+aciculated
+aciculum
+aciculums
+acid
+acidaemia
+Acidalium
+Acidanthera
+acidanthera
+Acidaspis
+acid-binding
+acidemia
+acidemias
+acider
+acid-fast
+acid-fastness
+acid-forming
+acid-head
+acidhead
+acidheads
+acidic
+acidiferous
+acidifiable
+acidifiant
+acidific
+acidification
+acidified
+acidifier
+acidifiers
+acidifies
+acidify
+acidifying
+acidimeter
+acidimetric
+acidimetrical
+acidimetrically
+acidimetry
+acidite
+acidities
+acidity
+acidize
+acidized
+acidizing
+acidly
+acidness
+acidnesses
+acidogenic
+acidoid
+acidology
+acidolysis
+acidometer
+acidometry
+acidophil
+acidophile
+acidophilic
+acidophilous
+acidophilus
+acidoproteolytic
+acidoses
+acidosis
+acidosteophyte
+acidotic
+acidproof
+acids
+acid-treat
+acidulant
+acidulate
+acidulated
+acidulates
+acidulating
+acidulation
+acidulent
+acidulous
+acidulously
+acidulousness
+aciduria
+acidurias
+aciduric
+acidy
+acidyl
+Acie
+acier
+acierage
+Acieral
+acierate
+acierated
+acierates
+acierating
+acieration
+acies
+aciform
+aciliate
+aciliated
+Acilius
+Acima
+acinaceous
+acinaces
+acinacifoliate
+acinacifolious
+acinaciform
+acinacious
+acinacity
+acinar
+acinarious
+acinary
+Acineta
+Acinetae
+acinetae
+acinetan
+Acinetaria
+acinetarian
+acinetic
+acinetiform
+Acinetina
+acinetinan
+acing
+acini
+acinic
+aciniform
+acinose
+acinotubular
+acinous
+acinuni
+acinus
+-acious
+Acipenser
+acipenser
+Acipenseres
+acipenserid
+Acipenseridae
+acipenserine
+acipenseroid
+Acipenseroidei
+Acis
+-acitate
+-acity
+aciurgy
+ACK
+ack
+ack-ack
+ackee
+ackees
+Acker
+acker
+Ackerley
+Ackerly
+Ackerman
+Ackermanville
+ackey
+ackeys
+Ackler
+Ackley
+ackman
+ackmen
+acknew
+acknow
+acknowing
+acknowledge
+acknowledgeable
+acknowledged
+acknowledgedly
+acknowledgement
+acknowledgements
+acknowledger
+acknowledgers
+acknowledges
+acknowledging
+acknowledgment
+acknowledgments
+acknown
+ack-pirate
+ackton
+Ackworth
+ACL
+aclastic
+acle
+acleidian
+acleistocardia
+acleistous
+Aclemon
+aclidian
+aclinal
+aclinic
+a-clock
+acloud
+ACLS
+ACLU
+aclu
+aclydes
+aclys
+ACM
+Acmaea
+Acmaeidae
+acmaesthesia
+acmatic
+acme
+acmes
+acmesthesia
+acmic
+Acmispon
+acmite
+Acmon
+acne
+acned
+acneform
+acneiform
+acnemia
+acnes
+Acnida
+acnodal
+acnode
+acnodes
+ACO
+acoasm
+acoasma
+a-coast
+Acocanthera
+acocantherin
+acock
+a-cock-bill
+acockbill
+a-cock-horse
+acocotl
+Acoela
+Acoelomata
+acoelomate
+acoelomatous
+Acoelomi
+acoelomous
+acoelous
+Acoemetae
+Acoemeti
+Acoemetic
+acoenaesthesia
+ACOF
+acoin
+acoine
+Acol
+Acolapissa
+acold
+Acolhua
+Acolhuan
+acologic
+acology
+acolous
+acoluthic
+acolyctine
+acolyte
+acolytes
+acolyth
+acolythate
+acolytus
+Acoma
+acoma
+acomia
+acomous
+a-compass
+aconative
+Aconcagua
+acondylose
+acondylous
+acone
+aconelline
+aconic
+aconin
+aconine
+aconital
+aconite
+aconites
+aconitia
+aconitic
+aconitin
+aconitine
+Aconitum
+aconitum
+aconitums
+acontia
+Acontias
+acontium
+Acontius
+aconuresis
+acool
+acop
+acopic
+acopon
+acopyrin
+acopyrine
+acor
+acorea
+acoria
+acorn
+acorned
+acorns
+acorn-shell
+Acorus
+acorus
+acosmic
+acosmism
+acosmist
+acosmistic
+acost
+Acosta
+acotyledon
+acotyledonous
+acouasm
+acouchi
+acouchy
+acoumeter
+acoumetry
+acounter
+acouometer
+acouophonia
+acoup
+acoupa
+acoupe
+acousma
+acousmas
+acousmata
+acousmatic
+acoustic
+acoustical
+acoustically
+acoustician
+acoustico-
+acousticolateral
+Acousticon
+acousticophobia
+acoustics
+acoustoelectric
+ACP
+acpt
+acpt.
+Acquah
+acquaint
+acquaintance
+acquaintances
+acquaintanceship
+acquaintanceships
+acquaintancy
+acquaintant
+acquainted
+acquaintedness
+acquainting
+acquaints
+Acquaviva
+acquent
+acquereur
+acquest
+acquests
+acquiesce
+acquiesced
+acquiescement
+acquiescence
+acquiescences
+acquiescency
+acquiescent
+acquiescently
+acquiescer
+acquiesces
+acquiescing
+acquiescingly
+acquiesence
+acquiet
+acquirability
+acquirable
+acquire
+acquired
+acquirement
+acquirements
+acquirenda
+acquirer
+acquirers
+acquires
+acquiring
+acquisible
+acquisita
+acquisite
+acquisited
+acquisition
+acquisitional
+acquisitions
+acquisitive
+acquisitively
+acquisitiveness
+acquisitor
+acquisitum
+acquist
+acquit
+acquital
+acquitment
+acquits
+acquittal
+acquittals
+acquittance
+acquitted
+acquitter
+acquitting
+acquophonia
+acr-
+Acra
+Acrab
+acracy
+Acraea
+acraein
+Acraeinae
+acraldehyde
+Acrania
+acrania
+acranial
+acraniate
+acrasia
+Acrasiaceae
+Acrasiales
+acrasias
+Acrasida
+Acrasieae
+acrasin
+acrasins
+Acraspeda
+acraspedote
+acrasy
+acratia
+acraturesis
+acrawl
+acraze
+Acre
+acre
+acreable
+acreage
+acreages
+acreak
+acream
+acred
+acre-dale
+Acredula
+acre-foot
+acre-inch
+acreman
+acremen
+Acres
+acres
+acrestaff
+acrid
+acridan
+acridane
+acrider
+acridest
+acridian
+acridic
+acridid
+Acrididae
+Acridiidae
+acridin
+acridine
+acridines
+acridinic
+acridinium
+acridities
+acridity
+Acridium
+acridly
+acridness
+acridnesses
+acridone
+acridonium
+acridophagus
+acridyl
+acriflavin
+acriflavine
+Acrilan
+acrimonies
+acrimonious
+acrimoniously
+acrimoniousness
+acrimony
+acrindolin
+acrindoline
+acrinyl
+acrisia
+Acrisius
+acrisy
+Acrita
+acrita
+acritan
+acrite
+acritical
+acritochromacy
+acritol
+acritude
+acrity
+ACRNEMA
+acro-
+Acroa
+acroaesthesia
+acroama
+acroamata
+acroamatic
+acroamatical
+acroamatics
+acroanesthesia
+acroarthritis
+acroasis
+acroasphyxia
+acroataxia
+acroatic
+acrobacies
+acrobacy
+acrobat
+Acrobates
+acrobatholithic
+acrobatic
+acrobatical
+acrobatically
+acrobatics
+acrobatism
+acrobats
+acroblast
+acrobryous
+acrobystitis
+Acrocarpi
+acrocarpous
+acrocentric
+acrocephalia
+acrocephalic
+acrocephalous
+acrocephaly
+Acrocera
+Acroceratidae
+Acroceraunian
+Acroceridae
+Acrochordidae
+Acrochordinae
+acrochordon
+acrock
+Acroclinium
+Acrocomia
+acroconidium
+acrocontracture
+acrocoracoid
+Acrocorinth
+acrocyanosis
+acrocyst
+acrodactyla
+acrodactylum
+acrodermatitis
+acrodont
+acrodontism
+acrodonts
+acrodrome
+acrodromous
+Acrodus
+acrodynia
+acroesthesia
+acrogamous
+acrogamy
+acrogen
+acrogenic
+acrogenous
+acrogenously
+acrogens
+acrography
+Acrogynae
+acrogynae
+acrogynous
+acrolein
+acroleins
+acrolith
+acrolithan
+acrolithic
+acroliths
+acrologic
+acrologically
+acrologies
+acrologism
+acrologue
+acrology
+acromania
+acromastitis
+acromegalia
+acromegalic
+acromegalies
+acromegaly
+acromelalgia
+acrometer
+acromia
+acromial
+acromicria
+acromimia
+acromioclavicular
+acromiocoracoid
+acromiodeltoid
+acromiohumeral
+acromiohyoid
+acromion
+acromioscapular
+acromiosternal
+acromiothoracic
+acromonogrammatic
+acromphalus
+Acromyodi
+acromyodian
+acromyodic
+acromyodous
+acromyotonia
+acromyotonus
+acron
+acronal
+acronarcotic
+acroneurosis
+acronic
+acronical
+acronically
+acronichal
+acronichally
+acronomy
+acronyc
+acronycal
+acronycally
+acronych
+acronychal
+acronychally
+acronychous
+Acronycta
+acronyctous
+acronym
+acronymic
+acronymically
+acronymize
+acronymized
+acronymizing
+acronymous
+acronyms
+acronyx
+acrook
+acroparalysis
+acroparesthesia
+acropathology
+acropathy
+acropetal
+acropetally
+acrophobia
+acrophonetic
+acrophonic
+acrophonically
+acrophonies
+acrophony
+acropodia
+acropodium
+acropoleis
+Acropolis
+acropolis
+acropolises
+acropolitan
+Acropora
+acropore
+acrorhagus
+acrorrheuma
+acrosarc
+acrosarca
+acrosarcum
+acroscleriasis
+acroscleroderma
+acroscopic
+acrose
+acrosome
+acrosomes
+acrosphacelus
+acrospire
+acrospired
+acrospiring
+acrospore
+acrosporous
+across
+across-the-board
+acrostic
+acrostical
+acrostically
+acrostichal
+Acrosticheae
+acrostichic
+acrostichoid
+Acrostichum
+acrosticism
+acrostics
+acrostolia
+acrostolion
+acrostolium
+acrotarsial
+acrotarsium
+acroteleutic
+acroter
+acroteral
+acroteria
+acroterial
+acroteric
+acroterion
+acroterium
+acroterteria
+Acrothoracica
+acrotic
+acrotism
+acrotisms
+acrotomous
+Acrotreta
+Acrotretidae
+acrotrophic
+acrotrophoneurosis
+Acrux
+ACRV
+a-cry
+Acrydium
+acryl
+acrylaldehyde
+acrylate
+acrylates
+acrylic
+acrylics
+acrylonitrile
+acrylyl
+ACS
+ACSE
+ACSNET
+ACSU
+ACT
+act
+Acta
+acta
+actability
+actable
+Actaea
+Actaeaceae
+Actaeon
+actaeon
+Actaeonidae
+acted
+actg
+actg.
+ACTH
+Actiad
+Actian
+actification
+actifier
+actify
+actin
+actin-
+actinal
+actinally
+actinautographic
+actinautography
+actine
+actinenchyma
+acting
+acting-out
+actings
+Actinia
+actinia
+actiniae
+actinian
+actinians
+Actiniaria
+actiniarian
+actinias
+actinic
+actinical
+actinically
+actinide
+actinides
+Actinidia
+Actinidiaceae
+actiniferous
+actiniform
+actinine
+actiniochrome
+actiniohematin
+Actiniomorpha
+actinism
+actinisms
+Actinistia
+actinium
+actiniums
+actino-
+actinobaccilli
+actinobacilli
+actinobacillosis
+actinobacillotic
+Actinobacillus
+actinobacillus
+actinoblast
+actinobranch
+actinobranchia
+actinocarp
+actinocarpic
+actinocarpous
+actinochemical
+actinochemistry
+actinocrinid
+Actinocrinidae
+actinocrinite
+Actinocrinus
+actinocutitis
+actinodermatitis
+actinodielectric
+actinodrome
+actinodromous
+actinoelectric
+actinoelectrically
+actinoelectricity
+actinogonidiate
+actinogram
+actinograph
+actinographic
+actinography
+actinoid
+Actinoida
+Actinoidea
+actinoids
+actinolite
+actinolitic
+actinologous
+actinologue
+actinology
+actinomere
+actinomeric
+actinometer
+actinometers
+actinometric
+actinometrical
+actinometricy
+actinometry
+actinomorphic
+actinomorphous
+actinomorphy
+Actinomyces
+actinomyces
+actinomycese
+actinomycesous
+actinomycestal
+Actinomycetaceae
+actinomycetal
+Actinomycetales
+actinomycete
+actinomycetous
+actinomycin
+actinomycoma
+actinomycosis
+actinomycosistic
+actinomycotic
+Actinomyxidia
+Actinomyxidiida
+actinon
+Actinonema
+actinoneuritis
+actinons
+actinophone
+actinophonic
+actinophore
+actinophorous
+actinophryan
+Actinophrys
+actinopod
+Actinopoda
+actinopraxis
+actinopteran
+Actinopteri
+actinopterous
+actinopterygian
+Actinopterygii
+actinopterygious
+actinoscopy
+actinosoma
+actinosome
+Actinosphaerium
+actinost
+actinostereoscopy
+actinostomal
+actinostome
+actinotherapeutic
+actinotherapeutics
+actinotherapy
+actinotoxemia
+actinotrichium
+actinotrocha
+actinouranium
+Actinozoa
+actinozoal
+actinozoan
+actinozoon
+actins
+actinula
+actinulae
+action
+actionability
+actionable
+actionably
+actional
+actionary
+actioner
+actiones
+actionist
+actionize
+actionized
+actionizing
+actionless
+actions
+action-taking
+actious
+Actipylea
+Actis
+Actium
+activable
+activate
+activated
+activates
+activating
+activation
+activations
+activator
+activators
+active
+active-bodied
+active-limbed
+actively
+active-minded
+activeness
+actives
+activin
+activism
+activisms
+activist
+activistic
+activists
+activital
+activities
+activity
+activize
+activized
+activizing
+actless
+actomyosin
+Acton
+acton
+Actor
+actor
+Actoridae
+actorish
+actor-manager
+actor-proof
+actors
+actorship
+actory
+actos
+ACTPU
+actress
+actresses
+actressy
+ACTS
+Acts
+acts
+ACTU
+actu
+actual
+actualisation
+actualise
+actualised
+actualising
+actualism
+actualist
+actualistic
+actualities
+actuality
+actualization
+actualizations
+actualize
+actualized
+actualizes
+actualizing
+actually
+actualness
+actuals
+actuarial
+actuarially
+actuarian
+actuaries
+actuary
+actuaryship
+actuate
+actuated
+actuates
+actuating
+actuation
+actuator
+actuators
+actuose
+ACTUP
+acture
+acturience
+actus
+actutate
+act-wait
+ACU
+acuaesthesia
+Acuan
+acuate
+acuating
+acuation
+Acubens
+acuchi
+acuclosure
+acuductor
+acuerdo
+acuerdos
+acuesthesia
+acuities
+acuity
+aculea
+aculeae
+Aculeata
+aculeate
+aculeated
+aculei
+aculeiform
+aculeolate
+aculeolus
+aculeus
+acumble
+acumen
+acumens
+acuminate
+acuminated
+acuminating
+acumination
+acuminose
+acuminous
+acuminulate
+acupress
+acupressure
+acupunctuate
+acupunctuation
+acupuncturation
+acupuncturator
+acupuncture
+acupunctured
+acupunctures
+acupuncturing
+acupuncturist
+acupuncturists
+acurative
+Acus
+acus
+acusection
+acusector
+acushla
+Acushnet
+acustom
+acutance
+acutances
+acutangular
+acutate
+acute
+acute-angled
+acutely
+acutenaculum
+acuteness
+acutenesses
+acuter
+acutes
+acutest
+acuti-
+acutiator
+acutifoliate
+Acutilinguae
+acutilingual
+acutilobate
+acutiplantar
+acutish
+acuto-
+acutograve
+acutonodose
+acutorsion
+ACV
+ACW
+ACWA
+Acworth
+ACWP
+acxoyatl
+-acy
+acy
+acyanoblepsia
+acyanopsia
+acyclic
+acyclically
+acyesis
+acyetic
+acyl
+acylal
+acylamido
+acylamidobenzene
+acylamino
+acylase
+acylate
+acylated
+acylates
+acylating
+acylation
+acylogen
+acyloin
+acyloins
+acyloxy
+acyloxymethane
+acyls
+acyrological
+acyrology
+acystia
+-ad
+A.D.
+AD
+Ad
+ad
+ad-
+ADA
+Ada
+Adabel
+Adabelle
+Adachi
+adactyl
+adactylia
+adactylism
+adactylous
+Adad
+adad
+adage
+adages
+adagial
+adagietto
+adagiettos
+adagio
+adagios
+adagissimo
+adagy
+Adah
+Adaha
+Adai
+Adaiha
+Adair
+Adairsville
+Adairville
+Adaize
+Adal
+Adala
+Adalai
+Adalard
+adalat
+Adalbert
+Adalheid
+Adali
+Adalia
+Adaliah
+adalid
+Adalie
+Adaline
+Adall
+Adallard
+Adam
+adam
+Adama
+adamance
+adamances
+adamancies
+adamancy
+Adam-and-Eve
+Adam-and-eve
+adam-and-eve
+adamant
+adamantean
+adamantine
+adamantinoma
+adamantlies
+adamantly
+adamantness
+adamantoblast
+adamantoblastoma
+adamantoid
+adamantoma
+adamants
+Adamas
+adamas
+Adamastor
+Adamawa
+Adamawa-Eastern
+adambulacral
+Adamec
+Adamek
+adamellite
+Adamello
+Adamhood
+Adamic
+Adamical
+Adamically
+Adamik
+Adamina
+Adaminah
+adamine
+Adamis
+Adamite
+adamite
+Adamitic
+Adamitical
+Adamitism
+Adamo
+Adamok
+Adams
+adams
+Adamsbasin
+Adamsburg
+Adamsen
+Adamsia
+adamsite
+adamsites
+Adamski
+Adam's-needle
+Adamson
+Adamstown
+Adamsun
+Adamsville
+Adan
+Adana
+a-dance
+adance
+a-dangle
+adangle
+Adansonia
+adansonia
+Adao
+Adapa
+adapid
+Adapis
+adapt
+adaptabilities
+adaptability
+adaptable
+adaptableness
+adaptably
+adaptation
+adaptational
+adaptationally
+adaptations
+adaptative
+adapted
+adaptedness
+adapter
+adapters
+adapting
+adaption
+adaptional
+adaptionism
+adaptions
+adaptitude
+adaptive
+adaptively
+adaptiveness
+adaptivity
+adaptometer
+adaptor
+adaptorial
+adaptors
+adapts
+Adar
+adar
+Adara
+adarbitrium
+adarme
+adarticulation
+adat
+adati
+adatis
+adatom
+adaty
+adaunt
+Adaurd
+adaw
+adawe
+adawlut
+adawn
+adaxial
+A-day
+Aday
+aday
+adays
+adazzle
+ADB
+A.D.C.
+ADC
+adc
+ADCCP
+ADCI
+adcon
+adcons
+adcraft
+ADD
+add
+add.
+Adda
+adda
+addability
+addable
+add-add
+Addam
+Addams
+addax
+addaxes
+ADDCP
+addda
+addebted
+added
+addedly
+addeem
+addend
+addenda
+addends
+addendum
+addendums
+adder
+adderbolt
+adderfish
+adders
+adder's-grass
+adder's-meat
+adder's-mouth
+adder's-mouths
+adderspit
+adder's-tongue
+adders-tongue
+adderwort
+Addi
+Addia
+addibility
+addible
+addice
+addicent
+addict
+addicted
+addictedness
+addicting
+addiction
+addictions
+addictive
+addictively
+addictiveness
+addictives
+addicts
+Addie
+Addiego
+Addiel
+Addieville
+addiment
+adding
+Addington
+addio
+Addis
+addis
+Addison
+addison
+Addisonian
+Addisoniana
+addita
+additament
+additamentary
+additiment
+addition
+additional
+additionally
+additionary
+additionist
+additions
+addititious
+additive
+additively
+additives
+additivity
+additory
+additum
+additur
+addle
+addlebrain
+addlebrained
+addled
+addlehead
+addleheaded
+addleheadedly
+addleheadedness
+addlement
+addleness
+addlepate
+addlepated
+addlepatedness
+addleplot
+addles
+addling
+addlings
+addlins
+addn
+addnl
+addoom
+addorsed
+addossed
+addr
+address
+addressability
+addressable
+addressed
+addressee
+addressees
+addresser
+addressers
+addresses
+addressful
+addressing
+Addressograph
+addressor
+addrest
+adds
+Addu
+adduce
+adduceable
+adduced
+adducent
+adducer
+adducers
+adduces
+adducible
+adducing
+adduct
+adducted
+adducting
+adduction
+adductive
+adductor
+adductors
+adducts
+addulce
+Addy
+Addyston
+-ade
+Ade
+ade
+a-dead
+adead
+Adebayo
+Adee
+adeem
+adeemed
+adeeming
+adeems
+a-deep
+adeep
+Adel
+Adela
+Adelaida
+Adelaide
+Adelaja
+adelantado
+adelantados
+adelante
+Adelanto
+Adelarthra
+Adelarthrosomata
+adelarthrosomatous
+adelaster
+Adelbert
+Adele
+Adelea
+Adeleidae
+Adelges
+Adelheid
+Adelia
+Adelice
+Adelina
+Adelind
+Adeline
+adeling
+adelite
+Adeliza
+Adell
+Adella
+Adelle
+adelocerous
+Adelochorda
+adelocodonic
+adelomorphic
+adelomorphous
+adelopod
+Adelops
+Adelphe
+Adelphi
+-adelphia
+Adelphia
+Adelphian
+adelphic
+Adelpho
+adelphogamy
+Adelphoi
+adelpholite
+adelphophagy
+-adelphous
+adelphous
+Adelric
+ademonist
+adempt
+adempted
+ademption
+Aden
+aden
+aden-
+Adena
+adenalgia
+adenalgy
+Adenanthera
+adenase
+adenasthenia
+Adenauer
+adendric
+adendritic
+adenectomies
+adenectomy
+adenectopia
+adenectopic
+adenemphractic
+adenemphraxis
+adenia
+adeniform
+adenin
+adenine
+adenines
+adenitis
+adenitises
+adenization
+adeno-
+adenoacanthoma
+adenoblast
+adenocancroid
+adenocarcinoma
+adenocarcinomas
+adenocarcinomata
+adenocarcinomatous
+adenocele
+adenocellulitis
+adenochondroma
+adenochondrosarcoma
+adenochrome
+adenocyst
+adenocystoma
+adenocystomatous
+adenodermia
+adenodiastasis
+adenodynia
+adenofibroma
+adenofibrosis
+adenogenesis
+adenogenous
+adenographer
+adenographic
+adenographical
+adenography
+adenohypersthenia
+adenohypophyseal
+adenohypophysial
+adenohypophysis
+adenoid
+adenoidal
+adenoidectomies
+adenoidectomy
+adenoidism
+adenoiditis
+adenoids
+adenoliomyofibroma
+adenolipoma
+adenolipomatosis
+adenologaditis
+adenological
+adenology
+adenolymphocele
+adenolymphoma
+adenoma
+adenomalacia
+adenomas
+adenomata
+adenomatome
+adenomatous
+adenomeningeal
+adenometritis
+adenomycosis
+adenomyofibroma
+adenomyoma
+adenomyxoma
+adenomyxosarcoma
+adenoncus
+adenoneural
+adenoneure
+adenopathy
+adenopharyngeal
+adenopharyngitis
+adenophlegmon
+Adenophora
+adenophore
+adenophoreus
+adenophorous
+adenophthalmia
+adenophyllous
+adenophyma
+adenopodous
+adenosarcoma
+adenosarcomas
+adenosarcomata
+adenosclerosis
+adenose
+adenoses
+adenosine
+adenosis
+adenostemonous
+Adenostoma
+adenotome
+adenotomic
+adenotomy
+adenotyphoid
+adenotyphus
+adenous
+adenoviral
+adenovirus
+adenoviruses
+adenyl
+adenylic
+adenylpyrophosphate
+adenyls
+Adeodatus
+Adeona
+Adephaga
+adephaga
+adephagan
+adephagia
+adephagous
+adeps
+adept
+adepter
+adeptest
+adeption
+adeptly
+adeptness
+adeptnesses
+adepts
+adeptship
+adequacies
+adequacy
+adequate
+adequately
+adequateness
+adequation
+adequative
+Ader
+adermia
+adermin
+adermine
+adesmy
+adespota
+adespoton
+Adessenarian
+adessenarian
+adessive
+Adest
+adeste
+adet
+adeuism
+adevism
+ADEW
+Adey
+ADF
+adfected
+adffroze
+adffrozen
+adfiliate
+adfix
+adfluxion
+adfreeze
+adfreezing
+ADFRF
+adfroze
+adfrozen
+Adger
+adglutinate
+Adhafera
+adhaka
+Adham
+adhamant
+Adhamh
+Adhara
+adharma
+adherant
+adhere
+adhered
+adherence
+adherences
+adherency
+adherend
+adherends
+adherent
+adherently
+adherents
+adherer
+adherers
+adheres
+adherescence
+adherescent
+adhering
+Adhern
+adhesion
+adhesional
+adhesions
+adhesive
+adhesively
+adhesivemeter
+adhesiveness
+adhesives
+adhibit
+adhibited
+adhibiting
+adhibition
+adhibits
+adhocracy
+adhort
+ADI
+Adi
+adiabat
+adiabatic
+adiabatically
+adiabolist
+adiactinic
+adiadochokinesia
+adiadochokinesis
+adiadokokinesi
+adiadokokinesia
+adiagnostic
+adiamorphic
+adiamorphism
+Adiana
+adiantiform
+Adiantum
+adiantum
+adiaphanous
+adiaphanousness
+adiaphon
+adiaphonon
+adiaphora
+adiaphoral
+adiaphoresis
+adiaphoretic
+adiaphorism
+adiaphorist
+adiaphoristic
+adiaphorite
+adiaphoron
+adiaphorous
+adiaphory
+adiapneustia
+adiate
+adiated
+adiathermal
+adiathermancy
+adiathermanous
+adiathermic
+adiathetic
+adiating
+adiation
+Adib
+adibasi
+Adi-buddha
+Adicea
+adicity
+Adie
+Adiel
+Adiell
+adience
+adient
+adieu
+adieus
+adieux
+Adige
+Adigei
+Adighe
+adighe
+adight
+Adigranth
+adigranth
+Adigun
+Adila
+Adim
+Adin
+Adina
+Adine
+Adinida
+adinidan
+adinole
+adinvention
+adion
+adios
+adipate
+adipescent
+adiphenine
+adipic
+adipinic
+adipocele
+adipocellulose
+adipocere
+adipoceriform
+adipocerite
+adipocerous
+adipocyte
+adipofibroma
+adipogenic
+adipogenous
+adipoid
+adipolysis
+adipolytic
+adipoma
+adipomata
+adipomatous
+adipometer
+adiponitrile
+adipopectic
+adipopexia
+adipopexic
+adipopexis
+adipose
+adiposeness
+adiposes
+adiposis
+adiposities
+adiposity
+adiposogenital
+adiposuria
+adipous
+adipsia
+adipsic
+adipsous
+adipsy
+adipyl
+Adirondack
+Adirondacks
+Adis
+adit
+adital
+aditio
+adits
+aditus
+Aditya
+Adivasi
+ADIZ
+adj
+adj.
+adjacence
+adjacencies
+adjacency
+adjacent
+adjacently
+adjag
+adject
+adjection
+adjectional
+adjectitious
+adjectival
+adjectivally
+adjective
+adjectively
+adjectives
+adjectivism
+adjectivitis
+adjiga
+adjiger
+adjoin
+adjoinant
+adjoined
+adjoinedly
+adjoiner
+adjoining
+adjoiningness
+adjoins
+adjoint
+adjoints
+adjourn
+adjournal
+adjourned
+adjourning
+adjournment
+adjournments
+adjourns
+adjoust
+adjt
+adjt.
+adjudge
+adjudgeable
+adjudged
+adjudger
+adjudges
+adjudging
+adjudgment
+adjudicata
+adjudicate
+adjudicated
+adjudicates
+adjudicating
+adjudication
+adjudications
+adjudicative
+adjudicator
+adjudicators
+adjudicatory
+adjudicature
+adjugate
+adjument
+adjunct
+adjunction
+adjunctive
+adjunctively
+adjunctly
+adjuncts
+Adjuntas
+adjuration
+adjurations
+adjuratory
+adjure
+adjured
+adjurer
+adjurers
+adjures
+adjuring
+adjuror
+adjurors
+adjust
+adjustability
+adjustable
+adjustable-pitch
+adjustably
+adjustage
+adjustation
+adjusted
+adjuster
+adjusters
+adjusting
+adjustive
+adjustment
+adjustmental
+adjustments
+adjustor
+adjustores
+adjustoring
+adjustors
+adjusts
+adjutage
+adjutancies
+adjutancy
+adjutant
+adjutant-general
+adjutants
+adjutantship
+adjutator
+adjute
+adjutor
+adjutorious
+adjutory
+adjutrice
+adjutrix
+adjuvant
+adjuvants
+adjuvate
+Adkins
+Adlai
+Adlar
+Adlare
+Adlay
+adlay
+Adlee
+adlegation
+adlegiare
+Adlei
+Adler
+Adlerian
+adlerian
+adless
+adlet
+Adley
+ad-lib
+ad-libbed
+ad-libber
+ad-libbing
+Adlumia
+adlumidin
+adlumidine
+adlumin
+adlumine
+ADM
+Adm
+Adm.
+adm
+Admah
+adman
+admarginate
+admass
+admaxillary
+ADMD
+admeasure
+admeasured
+admeasurement
+admeasurer
+admeasuring
+admedial
+admedian
+admen
+admensuration
+admerveylle
+Admete
+Admetus
+admetus
+admi
+admin
+adminicle
+adminicula
+adminicular
+adminiculary
+adminiculate
+adminiculation
+adminiculum
+administer
+administerd
+administered
+administerial
+administering
+administerings
+administers
+administrable
+administrant
+administrants
+administrate
+administrated
+administrates
+administrating
+administration
+administrational
+administrationist
+administrations
+administrative
+administratively
+administrator
+administrators
+administratorship
+administratress
+administratrices
+administratrix
+adminstration
+adminstrations
+admirability
+admirable
+admirableness
+admirably
+Admiral
+admiral
+admirals
+admiralship
+admiralships
+Admiralties
+admiralties
+admiralty
+admirance
+admiration
+admirations
+admirative
+admiratively
+admirator
+admire
+admired
+admiredly
+admirer
+admirers
+admires
+admiring
+admiringly
+admissability
+admissable
+admissibilities
+admissibility
+admissible
+admissibleness
+admissibly
+admission
+admissions
+admissive
+admissively
+admissory
+admit
+admits
+admittable
+admittance
+admittances
+admittatur
+admitted
+admittedly
+admittee
+admitter
+admitters
+admittible
+admitting
+admitty
+admix
+admixed
+admixes
+admixing
+admixt
+admixtion
+admixture
+admixtures
+admonish
+admonished
+admonisher
+admonishes
+admonishing
+admonishingly
+admonishment
+admonishments
+admonition
+admonitioner
+admonitionist
+admonitions
+admonitive
+admonitively
+admonitor
+admonitorial
+admonitorily
+admonitory
+admonitrix
+admortization
+admov
+admove
+admrx
+ADN
+Adna
+Adnah
+Adnan
+adnascence
+adnascent
+adnate
+adnation
+adnations
+Adne
+adnephrine
+adnerval
+adnescent
+adneural
+adnex
+adnexa
+adnexal
+adnexed
+adnexitis
+adnexopexy
+adnominal
+adnominally
+adnomination
+Adnopoz
+adnoun
+adnouns
+adnumber
+-ado
+Ado
+ado
+adobe
+adobes
+adobo
+adobos
+adod
+adolesce
+adolesced
+adolescence
+adolescences
+adolescency
+adolescent
+adolescently
+adolescents
+adolescing
+Adolf
+adolf
+Adolfo
+Adolph
+adolph
+Adolphe
+Adolpho
+Adolphus
+Adon
+adon
+Adona
+Adonai
+adonai
+Adonais
+Adonean
+Adonia
+Adoniad
+Adonian
+Adonias
+Adonic
+adonic
+Adonica
+adonidin
+Adonijah
+adonin
+Adoniram
+Adonis
+adonis
+adonises
+adonist
+adonite
+adonitol
+adonize
+adonized
+adonizing
+Adonoy
+a-doors
+adoors
+adoperate
+adoperation
+adopt
+adoptabilities
+adoptability
+adoptable
+adoptant
+adoptative
+adopted
+adoptedly
+adoptee
+adoptees
+adopter
+adopters
+adoptian
+adoptianism
+adoptianist
+adopting
+adoption
+adoptional
+adoptionism
+adoptionist
+adoptions
+adoptious
+adoptive
+adoptively
+adopts
+ador
+Adora
+adorability
+adorable
+adorableness
+adorably
+adoral
+adorally
+adorant
+Adorantes
+adoration
+adorations
+adoratory
+Adore
+adore
+adored
+Adoree
+adorer
+adorers
+adores
+Adoretus
+adoring
+adoringly
+Adorl
+adorn
+adornation
+Adorne
+adorned
+adorner
+adorners
+adorning
+adorningly
+adornment
+adornments
+adorno
+adornos
+adorns
+adorsed
+ados
+adosculation
+adossed
+adossee
+Adoula
+adoulie
+Adowa
+adown
+Adoxa
+Adoxaceae
+adoxaceous
+adoxies
+adoxography
+adoxy
+adoze
+ADP
+adp
+adp-
+adpao
+ADPCM
+adposition
+adpress
+adpromission
+adpromissor
+adq-
+adrad
+adradial
+adradially
+adradius
+Adramelech
+Adrammelech
+Adrastea
+Adrastos
+Adrastus
+Adrea
+adread
+adream
+adreamed
+adreamt
+adrectal
+Adrell
+adren-
+adrenal
+adrenalcortical
+adrenalectomies
+adrenalectomize
+adrenalectomized
+adrenalectomizing
+adrenalectomy
+Adrenalin
+adrenalin
+adrenaline
+adrenalize
+adrenally
+adrenalone
+adrenals
+adrench
+adrenergic
+adrenin
+adrenine
+adrenitis
+adreno
+adrenochrome
+adrenocortical
+adrenocorticosteroid
+adrenocorticotrophic
+adrenocorticotrophin
+adrenocorticotropic
+adrenolysis
+adrenolytic
+adrenomedullary
+adrenosterone
+adrenotrophin
+adrenotropic
+adrent
+Adrestus
+adret
+Adria
+Adriaen
+Adriaens
+Adrial
+adriamycin
+Adrian
+Adriana
+Adriane
+Adrianna
+Adrianne
+Adriano
+Adrianople
+Adrianopolis
+Adriatic
+adriatic
+Adriel
+Adriell
+Adrien
+Adriena
+Adriene
+Adrienne
+adrift
+adrip
+adrogate
+adroit
+adroiter
+adroitest
+adroitly
+adroitness
+adroitnesses
+Adron
+adroop
+adrop
+adrostal
+adrostral
+adrowse
+adrue
+adry
+ADS
+ads
+adsbud
+adscendent
+adscititious
+adscititiously
+adscript
+adscripted
+adscription
+adscriptitious
+adscriptitius
+adscriptive
+adscripts
+adsessor
+adsheart
+adsignification
+adsignify
+adsmith
+adsmithing
+adsorb
+adsorbability
+adsorbable
+adsorbate
+adsorbates
+adsorbed
+adsorbent
+adsorbents
+adsorbing
+adsorbs
+adsorption
+adsorptive
+adsorptively
+adsorptiveness
+ADSP
+adspiration
+ADSR
+adstipulate
+adstipulated
+adstipulating
+adstipulation
+adstipulator
+adstrict
+adstringe
+adsum
+ADT
+adterminal
+adtevac
+aduana
+adular
+adularescence
+adularescent
+adularia
+adularias
+adulate
+adulated
+adulates
+adulating
+adulation
+adulator
+adulators
+adulatory
+adulatress
+adulce
+Adullam
+Adullamite
+adullamite
+adult
+adulter
+adulterant
+adulterants
+adulterate
+adulterated
+adulterately
+adulterateness
+adulterates
+adulterating
+adulteration
+adulterations
+adulterator
+adulterators
+adulterer
+adulterers
+adulteress
+adulteresses
+adulteries
+adulterine
+adulterize
+adulterous
+adulterously
+adulterousness
+adultery
+adulthood
+adulthoods
+adulticidal
+adulticide
+adultlike
+adultly
+adultness
+adultoid
+adultress
+adults
+adumbral
+adumbrant
+adumbrate
+adumbrated
+adumbrates
+adumbrating
+adumbration
+adumbrations
+adumbrative
+adumbratively
+adumbrellar
+adunation
+adunc
+aduncate
+aduncated
+aduncity
+aduncous
+Adur
+adure
+adurent
+Adurol
+adusk
+adust
+adustion
+adustiosis
+adustive
+Aduwa
+adv
+adv.
+Advaita
+advance
+advanceable
+advanced
+advancedness
+advancement
+advancements
+advancer
+advancers
+advances
+advancing
+advancingly
+advancive
+advantage
+advantaged
+advantageous
+advantageously
+advantageousness
+advantages
+advantaging
+advect
+advected
+advecting
+advection
+advectitious
+advective
+advects
+advehent
+advena
+advenae
+advene
+advenience
+advenient
+Advent
+advent
+advential
+Adventism
+adventism
+Adventist
+adventist
+adventists
+adventitia
+adventitial
+adventitious
+adventitiously
+adventitiousness
+adventitiousnesses
+adventive
+adventively
+adventry
+advents
+adventual
+adventure
+adventured
+adventureful
+adventurement
+adventurer
+adventurers
+adventures
+adventureship
+adventuresome
+adventuresomely
+adventuresomeness
+adventuresomes
+adventuress
+adventuresses
+adventuring
+adventurish
+adventurism
+adventurist
+adventuristic
+adventurous
+adventurously
+adventurousness
+adverb
+adverbial
+adverbiality
+adverbialize
+adverbially
+adverbiation
+adverbless
+adverbs
+adversa
+adversant
+adversaria
+adversarial
+adversaries
+adversariness
+adversarious
+adversary
+adversative
+adversatively
+adverse
+adversed
+adversely
+adverseness
+adversifoliate
+adversifolious
+adversing
+adversion
+adversities
+adversity
+adversive
+adversus
+advert
+adverted
+advertence
+advertency
+advertent
+advertently
+adverting
+advertisable
+advertise
+advertised
+advertisee
+advertisement
+advertisements
+advertiser
+advertisers
+advertises
+advertising
+advertisings
+advertizable
+advertize
+advertized
+advertizement
+advertizer
+advertizes
+advertizing
+adverts
+advice
+adviceful
+advices
+advisabilities
+advisability
+advisable
+advisableness
+advisably
+advisal
+advisatory
+advise
+advised
+advisedly
+advisedness
+advisee
+advisees
+advisement
+advisements
+adviser
+advisers
+advisership
+advises
+advising
+advisive
+advisiveness
+adviso
+advisor
+advisories
+advisorily
+advisors
+advisory
+advisy
+advitant
+advocaat
+advocacies
+advocacy
+advocate
+advocated
+advocates
+advocateship
+advocatess
+advocating
+advocation
+advocative
+advocator
+advocatory
+advocatress
+advocatrice
+advocatrix
+advoke
+advolution
+advoteresse
+advowee
+advowry
+advowsance
+advowson
+advowsons
+advoyer
+advt
+advt.
+adward
+adwesch
+ady
+Adyge
+Adygei
+Adyghe
+adynamia
+adynamias
+adynamic
+adynamy
+adyta
+adyton
+adytta
+adytum
+adz
+adze
+adzer
+adzes
+Adzharia
+Adzharistan
+adzooks
+-ae
+AE
+ae
+ae-
+ae.
+AEA
+Aeacidae
+Aeacides
+Aeacus
+Aeaea
+Aeaean
+AEC
+Aechmagoras
+Aechmophorus
+aecia
+aecial
+aecidia
+Aecidiaceae
+aecidial
+aecidioform
+Aecidiomycetes
+aecidiospore
+aecidiostage
+aecidium
+aeciospore
+aeciostage
+aeciotelia
+aecioteliospore
+aeciotelium
+aecium
+aedeagal
+aedeagi
+aedeagus
+aedegi
+Aedes
+aedes
+aedicula
+aediculae
+aedicule
+Aedilberct
+aedile
+aediles
+aedileship
+aedilian
+aedilic
+aedilitian
+aedilities
+aedility
+aedine
+aedoeagi
+aedoeagus
+aedoeology
+Aedon
+Aeetes
+AEF
+aefald
+aefaldness
+aefaldy
+aefauld
+Aegaeon
+aegagri
+aegagropila
+aegagropilae
+aegagropile
+aegagropiles
+aegagrus
+Aegates
+Aegean
+aegean
+aegemony
+aeger
+Aegeria
+aegerian
+aegeriid
+Aegeriidae
+Aegesta
+Aegeus
+Aegia
+Aegiale
+Aegialeus
+Aegialia
+Aegialitis
+Aegicores
+aegicrania
+aegilops
+Aegimius
+Aegina
+Aeginaea
+Aeginetan
+Aeginetic
+Aegiochus
+Aegipan
+Aegir
+aegir
+aegirine
+aegirinolite
+aegirite
+AEGIS
+aegis
+aegises
+Aegisthus
+aegisthus
+Aegithalos
+Aegithognathae
+aegithognathism
+aegithognathous
+Aegium
+Aegle
+aegophony
+Aegopodium
+Aegospotami
+aegritude
+aegrotant
+aegrotat
+aegyptilla
+Aegyptus
+aegyrite
+aeipathy
+Aekerly
+Aelber
+Aelbert
+Aella
+Aello
+aelodicon
+aeluroid
+Aeluroidea
+aelurophobe
+aelurophobia
+aeluropodous
+-aemia
+aenach
+Aenea
+aenean
+Aeneas
+aeneas
+Aeneid
+aeneid
+Aeneolithic
+aeneolithic
+aeneous
+Aeneus
+aeneus
+Aeniah
+aenigma
+aenigmatite
+Aenius
+Aenneea
+aeolharmonica
+Aeolia
+Aeolian
+aeolian
+Aeolic
+aeolic
+Aeolicism
+aeolid
+Aeolidae
+Aeolides
+Aeolididae
+aeolight
+aeolina
+aeoline
+aeolipile
+aeolipyle
+Aeolis
+Aeolism
+Aeolist
+aeolist
+aeolistic
+aeolo-
+aeolodicon
+aeolodion
+aeolomelodicon
+aeolopantalon
+aeolotropic
+aeolotropism
+aeolotropy
+aeolsklavier
+Aeolus
+aeolus
+aeon
+aeonial
+aeonian
+aeonic
+aeonicaeonist
+aeonist
+aeons
+Aepyceros
+Aepyornis
+aepyornis
+Aepyornithidae
+Aepyornithiformes
+Aepytus
+aeq
+Aequi
+Aequian
+Aequiculi
+Aequipalpia
+aequor
+aequoreal
+aequorin
+aequorins
+aer
+aer-
+aerage
+aeraria
+aerarian
+aerarium
+aerate
+aerated
+aerates
+aerating
+aeration
+aerations
+aerator
+aerators
+aerenchyma
+aerenterectasia
+aeri-
+Aeria
+aerial
+aerialist
+aerialists
+aeriality
+aerially
+aerialness
+aerials
+aeric
+aerical
+Aerides
+aerides
+aerie
+aeried
+Aeriel
+Aeriela
+Aeriell
+aerier
+aeries
+aeriest
+aerifaction
+aeriferous
+aerification
+aerified
+aerifies
+aeriform
+aerify
+aerifying
+aerily
+aeriness
+aero
+aero-
+aeroacoustic
+Aerobacter
+aerobacter
+aerobacteriological
+aerobacteriologically
+aerobacteriologist
+aerobacteriology
+aerobacters
+aeroballistic
+aeroballistics
+aerobate
+aerobated
+aerobatic
+aerobatics
+aerobating
+aerobe
+aerobee
+aerobes
+aerobia
+aerobian
+aerobic
+aerobically
+aerobics
+aerobiologic
+aerobiological
+aerobiologically
+aerobiologist
+aerobiology
+aerobion
+aerobiont
+aerobioscope
+aerobiosis
+aerobiotic
+aerobiotically
+aerobious
+aerobium
+aeroboat
+Aerobranchia
+aerobranchiate
+aerobus
+aerocamera
+aerocar
+aerocartograph
+aerocartography
+Aerocharidae
+aerocolpos
+aerocraft
+aerocurve
+aerocyst
+aerodermectasia
+aerodone
+aerodonetic
+aerodonetics
+aerodontalgia
+aerodontia
+aerodontic
+aerodrome
+aerodromes
+aerodromics
+aeroduct
+aeroducts
+aerodynamic
+aerodynamical
+aerodynamically
+aerodynamicist
+aerodynamics
+aerodyne
+aerodynes
+aeroelastic
+aeroelasticity
+aeroelastics
+aeroembolism
+aeroenterectasia
+Aeroflot
+aerofoil
+aerofoils
+aerogel
+aerogels
+aerogen
+aerogene
+aerogenes
+aerogenesis
+aerogenic
+aerogenically
+aerogenous
+aerogeography
+aerogeologist
+aerogeology
+aerognosy
+aerogram
+aerogramme
+aerograms
+aerograph
+aerographer
+aerographic
+aerographical
+aerographics
+aerographies
+aerography
+aerogun
+aerohydrodynamic
+aerohydropathy
+aerohydroplane
+aerohydrotherapy
+aerohydrous
+aeroides
+Aerojet
+Aerol
+aerolite
+aerolites
+aerolith
+aerolithology
+aeroliths
+aerolitic
+aerolitics
+aerologic
+aerological
+aerologies
+aerologist
+aerologists
+aerology
+aeromaechanic
+aeromagnetic
+aeromancer
+aeromancy
+aeromantic
+aeromarine
+aeromechanic
+aeromechanical
+aeromechanics
+aeromedical
+aeromedicine
+aerometeorograph
+aerometer
+aerometric
+aerometry
+aeromotor
+aeron
+aeron.
+aeronat
+aeronaut
+aeronautic
+aeronautical
+aeronautically
+aeronautics
+aeronautism
+aeronauts
+aeronef
+aeroneurosis
+aeronomer
+aeronomic
+aeronomical
+aeronomics
+aeronomies
+aeronomist
+aeronomy
+aero-otitis
+aeropathy
+aeropause
+Aerope
+aeroperitoneum
+aeroperitonia
+aerophagia
+aerophagist
+aerophagy
+aerophane
+aerophilatelic
+aerophilatelist
+aerophilately
+aerophile
+aerophilia
+aerophilic
+aerophilous
+aerophobia
+aerophobic
+aerophone
+aerophor
+aerophore
+aerophoto
+aerophotography
+aerophotos
+aerophysical
+aerophysicist
+aerophysics
+aerophyte
+aeroplane
+aeroplaner
+aeroplanes
+aeroplanist
+aeroplankton
+aeropleustic
+aeroporotomy
+aeropulse
+aerosat
+aerosats
+aeroscepsis
+aeroscepsy
+aeroscope
+aeroscopic
+aeroscopically
+aeroscopy
+aerose
+aerosiderite
+aerosiderolite
+aerosinusitis
+Aerosol
+aerosol
+aerosolization
+aerosolize
+aerosolized
+aerosolizing
+aerosols
+aerospace
+aerosphere
+aerosporin
+aerostat
+aerostatic
+aerostatical
+aerostatics
+aerostation
+aerostats
+aerosteam
+aerotactic
+aerotaxis
+aerotechnical
+aerotechnics
+aerotherapeutics
+aerotherapy
+aerothermodynamic
+aerothermodynamics
+aerotonometer
+aerotonometric
+aerotonometry
+aerotow
+aerotropic
+aerotropism
+aeroview
+aeroyacht
+aeruginous
+aerugo
+aerugos
+aery
+AES
+aes
+Aesacus
+aesc
+Aeschines
+Aeschylean
+aeschylean
+Aeschylus
+aeschylus
+Aeschynanthus
+aeschynite
+Aeschynomene
+aeschynomenous
+Aesculaceae
+aesculaceous
+Aesculapian
+aesculapian
+Aesculapius
+aesculapius
+aesculetin
+aesculin
+Aesculus
+Aesepus
+Aeshma
+Aesir
+aesir
+Aesop
+aesop
+Aesopian
+aesopian
+Aesopic
+Aestatis
+aestethic
+aesthesia
+aesthesics
+aesthesio-
+aesthesis
+aesthesodic
+aesthete
+aesthetes
+aesthetic
+aesthetical
+aesthetically
+aesthetician
+aestheticism
+aestheticist
+aestheticize
+aesthetics
+aesthiology
+aestho-physiology
+aesthophysiology
+Aestii
+aestival
+aestivate
+aestivated
+aestivates
+aestivating
+aestivation
+aestivator
+aestive
+aestuary
+aestuate
+aestuation
+aestuous
+aesture
+aestus
+Aesyetes
+AET
+aet
+aet.
+aetat
+aethalia
+Aethalides
+aethalioid
+aethalium
+Aethelbert
+aetheling
+aetheogam
+aetheogamic
+aetheogamous
+aether
+aethereal
+aethered
+Aetheria
+aetheric
+aethers
+Aethionema
+aethogen
+aethon
+Aethra
+aethrioscope
+Aethusa
+Aethylla
+Aetian
+aetiogenic
+aetiological
+aetiologically
+aetiologies
+aetiologist
+aetiologue
+aetiology
+aetiophyllin
+aetiotropic
+aetiotropically
+aetites
+Aetna
+Aetobatidae
+Aetobatus
+Aetolia
+Aetolian
+Aetolus
+Aetomorphae
+aetosaur
+aetosaurian
+Aetosaurus
+aettekees
+AEU
+aevia
+aeviternal
+aevum
+A.F.
+A/F
+AF
+Af
+Af.
+a.f.
+af
+af-
+AFA
+aface
+afaced
+afacing
+AFACTS
+AFADS
+afaint
+A.F.A.M.
+AFAM
+Afar
+afar
+afara
+afars
+AFATDS
+AFB
+afb
+AFC
+AFCAC
+AFCC
+afd
+afdecho
+afear
+afeard
+afeared
+afebrile
+Afenil
+afer
+afernan
+afetal
+aff
+affa
+affabilities
+affability
+affable
+affableness
+affably
+affabrous
+affair
+affaire
+affaires
+affairs
+affaite
+affamish
+affatuate
+affect
+affectability
+affectable
+affectate
+affectation
+affectationist
+affectations
+affected
+affectedly
+affectedness
+affecter
+affecters
+affectibility
+affectible
+affecting
+affectingly
+affection
+affectional
+affectionally
+affectionate
+affectionately
+affectionateness
+affectioned
+affectionless
+affections
+affectious
+affective
+affectively
+affectivity
+affectless
+affectlessness
+affector
+affects
+affectual
+affectum
+affectuous
+affectus
+affeeble
+affeer
+affeerer
+affeerment
+affeeror
+affeir
+affenpinscher
+affenspalte
+Affer
+affere
+afferent
+afferently
+affettuoso
+affettuosos
+affiance
+affianced
+affiancer
+affiances
+affiancing
+affiant
+affiants
+affich
+affiche
+affiches
+afficionado
+affidare
+affidation
+affidavit
+affidavits
+affidavy
+affied
+affies
+affile
+affiliable
+affiliate
+affiliated
+affiliates
+affiliating
+affiliation
+affiliations
+affinage
+affinal
+affination
+affine
+affined
+affinely
+affines
+affing
+affinitative
+affinitatively
+affinite
+affinities
+affinition
+affinitive
+affinity
+affirm
+affirmable
+affirmably
+affirmance
+affirmant
+affirmation
+affirmations
+affirmative
+affirmative-action
+affirmatively
+affirmativeness
+affirmatives
+affirmatory
+affirmed
+affirmer
+affirmers
+affirming
+affirmingly
+affirmly
+affirms
+affix
+affixable
+affixal
+affixation
+affixed
+affixer
+affixers
+affixes
+affixial
+affixing
+affixion
+affixment
+affixt
+affixture
+afflate
+afflated
+afflation
+afflatus
+afflatuses
+afflict
+afflicted
+afflictedness
+afflicter
+afflicting
+afflictingly
+affliction
+afflictionless
+afflictions
+afflictive
+afflictively
+afflicts
+affloof
+afflue
+affluence
+affluences
+affluency
+affluent
+affluently
+affluentness
+affluents
+afflux
+affluxes
+affluxion
+affodill
+afforce
+afforced
+afforcement
+afforcing
+afford
+affordable
+afforded
+affording
+affords
+afforest
+afforestable
+afforestation
+afforestational
+afforested
+afforesting
+afforestment
+afforests
+afformative
+Affra
+affranchise
+affranchised
+affranchisement
+affranchising
+affrap
+affray
+affrayed
+affrayer
+affrayers
+affraying
+affrays
+affreight
+affreighter
+affreightment
+affret
+affrettando
+affreux
+Affrica
+affricate
+affricated
+affricates
+affrication
+affricative
+affriended
+affright
+affrighted
+affrightedly
+affrighter
+affrightful
+affrightfully
+affrighting
+affrightingly
+affrightment
+affrights
+affront
+affronted
+affrontedly
+affrontedness
+affrontee
+affronter
+affronting
+affrontingly
+affrontingness
+affrontive
+affrontiveness
+affrontment
+affronts
+affronty
+afft
+affuse
+affusedaffusing
+affusion
+affusions
+affy
+affydavy
+affying
+Afg
+AFGE
+Afgh
+Afghan
+afghan
+afghanets
+Afghani
+afghani
+afghanis
+Afghanistan
+afghanistan
+afghans
+afgod
+AFI
+afibrinogenemia
+aficionada
+aficionadas
+aficionado
+aficionados
+afield
+Afifi
+afikomen
+AFIPS
+afire
+AFL
+aflagellar
+aflame
+aflare
+A-flat
+aflat
+aflatoxin
+aflatus
+aflaunt
+AFL-CIO
+AFLCIO
+Aflex
+afley
+a-flicker
+aflicker
+aflight
+afloat
+aflow
+aflower
+afluking
+aflush
+aflutter
+AFM
+AFNOR
+afoam
+afocal
+afoot
+afore
+afore-acted
+afore-cited
+afore-coming
+afore-decried
+afore-given
+afore-going
+aforegoing
+afore-granted
+aforehand
+afore-heard
+afore-known
+afore-mentioned
+aforementioned
+aforenamed
+afore-planned
+afore-quoted
+afore-running
+aforesaid
+afore-seeing
+afore-seen
+afore-spoken
+afore-stated
+aforethought
+aforetime
+aforetimes
+afore-told
+aforeward
+afortiori
+afoul
+afounde
+AFP
+Afr
+afr-
+Afra
+afraid
+afraidness
+A-frame
+Aframerican
+Afrasia
+Afrasian
+afray
+afreet
+afreets
+afresca
+afresh
+afret
+afrete
+Afric
+Africa
+africa
+Africah
+African
+african
+Africana
+Africander
+africander
+Africanderism
+Africanism
+Africanist
+africanist
+Africanization
+Africanize
+Africanized
+Africanizing
+Africanoid
+africans
+Africanthropus
+Afridi
+afright
+Afrika
+Afrikaans
+afrikaans
+Afrikah
+Afrikander
+Afrikanderdom
+Afrikanderism
+Afrikaner
+afrikaner
+Afrikanerdom
+Afrikanerize
+afrit
+afrite
+afrits
+Afro
+Afro-
+afro
+Afro-American
+Afro-american
+afro-american
+Afro-Asian
+Afro-Asiatic
+Afro-asiatic
+Afroasiatic
+Afro-chain
+Afro-comb
+Afro-Cuban
+Afro-european
+Afrogaea
+Afrogaean
+afront
+afrormosia
+afros
+Afro-semitic
+afrown
+AFS
+AFSC
+AFSCME
+Afshah
+Afshar
+AFSK
+AFT
+aft
+aftaba
+after
+after-
+after-acquired
+afteract
+afterage
+afterattack
+afterband
+afterbay
+afterbeat
+afterbirth
+afterbirths
+afterblow
+afterbodies
+afterbody
+after-born
+afterbrain
+afterbreach
+afterbreast
+afterburner
+afterburners
+afterburning
+aftercare
+aftercareer
+aftercast
+aftercataract
+aftercause
+afterchance
+afterchrome
+afterchurch
+afterclap
+afterclause
+aftercome
+aftercomer
+aftercoming
+aftercooler
+aftercost
+after-course
+aftercourse
+aftercrop
+aftercure
+afterdamp
+afterdate
+afterdated
+afterdays
+afterdeal
+afterdeath
+afterdeck
+afterdecks
+after-described
+after-designed
+after-dinner
+afterdinner
+afterdischarge
+afterdrain
+afterdrops
+aftereffect
+aftereffects
+afterend
+aftereye
+afterfall
+afterfame
+afterfeed
+afterfermentation
+afterform
+afterfriend
+afterfruits
+afterfuture
+after-game
+aftergame
+aftergas
+afterglide
+afterglow
+afterglows
+aftergo
+aftergood
+after-grass
+aftergrass
+aftergrave
+aftergrief
+aftergrind
+aftergrowth
+after-guard
+afterguard
+afterguns
+afterhand
+afterharm
+afterhatch
+afterheat
+afterhelp
+afterhend
+afterhold
+afterhope
+afterhours
+after-image
+afterimage
+afterimages
+afterimpression
+afterings
+afterking
+afterknowledge
+after-life
+afterlife
+afterlifes
+afterlifetime
+afterlight
+afterlives
+afterloss
+afterlove
+aftermark
+aftermarket
+aftermarriage
+aftermass
+aftermast
+aftermath
+aftermaths
+aftermatter
+aftermeal
+after-mentioned
+aftermilk
+aftermost
+after-named
+afternight
+afternoon
+afternoons
+afternose
+afternote
+afteroar
+after-pain
+afterpain
+afterpains
+afterpart
+afterpast
+afterpeak
+afterpiece
+afterplanting
+afterplay
+afterpotential
+afterpressure
+afterproof
+afterrake
+afterreckoning
+afterrider
+afterripening
+afterroll
+afters
+afterschool
+aftersend
+aftersensation
+aftershaft
+aftershafted
+aftershave
+aftershaves
+aftershine
+aftership
+aftershock
+aftershocks
+aftersong
+aftersound
+after-specified
+afterspeech
+afterspring
+afterstain
+after-stampable
+afterstate
+afterstorm
+afterstrain
+afterstretch
+afterstudy
+after-supper
+aftersupper
+afterswarm
+afterswarming
+afterswell
+aftertan
+aftertask
+aftertaste
+aftertastes
+aftertax
+after-theater
+after-theatre
+afterthinker
+afterthought
+afterthoughted
+afterthoughts
+afterthrift
+aftertime
+aftertimes
+aftertouch
+aftertreatment
+aftertrial
+afterturn
+aftervision
+afterwale
+afterwar
+afterward
+afterwards
+afterwash
+afterwhile
+afterwisdom
+afterwise
+after-wit
+afterwit
+afterwitted
+afterword
+afterwork
+afterworking
+afterworld
+afterwort
+afterwrath
+afterwrist
+after-written
+afteryears
+aftmost
+Afton
+Aftonian
+aftosa
+aftosas
+AFTRA
+aftward
+aftwards
+afunction
+afunctional
+AFUU
+afwillite
+Afyon
+Afzelia
+A.G.
+AG
+Ag
+ag
+ag-
+aga
+agabanee
+Agabus
+agacant
+agacante
+Agace
+agacella
+agacerie
+Agaces
+Agacles
+agad
+agada
+Agade
+agadic
+Agadir
+Agag
+Agagianian
+again
+again-
+againbuy
+againsay
+against
+againstand
+againward
+agal
+agalactia
+agalactic
+agalactous
+agal-agal
+agalawood
+agalaxia
+agalaxy
+Agalena
+Agalenidae
+Agalinis
+agalite
+agalloch
+agallochs
+agallochum
+agallop
+agalma
+agalmatolite
+agalwood
+agalwoods
+Agama
+agama
+Agamae
+agamas
+a-game
+Agamede
+Agamedes
+Agamemnon
+agamemnon
+agamete
+agametes
+agami
+agamian
+agamic
+agamically
+agamid
+Agamidae
+agamis
+agamist
+agammaglobulinemia
+agammaglobulinemic
+agamobia
+agamobium
+agamogenesis
+agamogenetic
+agamogenetically
+agamogony
+agamoid
+agamont
+agamospermy
+agamospore
+agamous
+agamy
+Agan
+Agana
+aganglionic
+Aganice
+Aganippe
+aganippe
+Aganus
+Agao
+Agaonidae
+agapae
+agapai
+Agapanthus
+agapanthus
+agapanthuses
+Agape
+agape
+agapeic
+agapeically
+Agapemone
+Agapemonian
+Agapemonist
+Agapemonite
+agapetae
+agapeti
+agapetid
+Agapetidae
+agaphite
+Agapornis
+Agar
+agar
+agar-agar
+agaric
+agaricaceae
+agaricaceous
+Agaricales
+agaricic
+agariciform
+agaricin
+agaricine
+agaricinic
+agaricoid
+agarics
+Agaricus
+Agaristidae
+agarita
+agaroid
+agarose
+agaroses
+agars
+Agartala
+Agarum
+agarwal
+agas
+agasp
+Agassiz
+agast
+Agastache
+Agastreae
+agastric
+agastroneuria
+Agastrophus
+Agastya
+Agata
+agata
+Agate
+agate
+agatelike
+agates
+agateware
+Agatha
+Agathaea
+Agatharchides
+Agathaumas
+Agathe
+agathin
+Agathis
+agathism
+agathist
+Agatho
+agatho-
+Agathocles
+agathodaemon
+agathodaemonic
+agathodemon
+agathokakological
+agathology
+Agathon
+Agathosma
+Agathy
+Agathyrsus
+agatiferous
+agatiform
+agatine
+agatize
+agatized
+agatizes
+agatizing
+agatoid
+agaty
+Agau
+Agave
+agave
+agaves
+agavose
+Agawam
+Agaz
+agaze
+agazed
+agba
+Agbogla
+AGC
+AGCA
+AGCT
+agcy
+agcy.
+AGD
+Agdistis
+-age
+AGE
+AgE
+age
+ageable
+age-adorning
+age-bent
+age-coeval
+age-cracked
+aged
+age-despoiled
+age-dispelling
+agedly
+agedness
+agednesses
+Agee
+agee
+agee-jawed
+age-encrusted
+age-enfeebled
+age-group
+age-harden
+age-honored
+ageing
+ageings
+ageism
+ageisms
+ageist
+ageists
+Agelacrinites
+Agelacrinitidae
+Agelaius
+agelast
+age-lasting
+Agelaus
+ageless
+agelessly
+agelessness
+age-long
+agelong
+Agen
+agen
+Agena
+Agenais
+agencies
+agency
+agend
+agenda
+agendaless
+agendas
+agendum
+agendums
+agene
+agenes
+ageneses
+agenesia
+agenesias
+agenesic
+agenesis
+agenetic
+agenize
+agenized
+agenizes
+agenizing
+agennesis
+agennetic
+Agenois
+Agenor
+agent
+agentess
+agent-general
+agential
+agenting
+agentival
+agentive
+agentives
+agentries
+agentry
+agents
+agentship
+age-old
+ageometrical
+age-peeled
+ager
+agerasia
+Ageratum
+ageratum
+ageratums
+agers
+ages
+age-struck
+aget
+agete
+ageusia
+ageusic
+ageustia
+age-weary
+age-weathered
+age-worn
+Aggada
+Aggadah
+Aggadic
+aggadic
+Aggadoth
+Aggappe
+Aggappera
+Aggappora
+Aggarwal
+aggelation
+aggenerate
+agger
+aggerate
+aggeration
+aggerose
+aggers
+aggest
+Aggeus
+Aggi
+Aggie
+aggie
+aggies
+aggiornamenti
+aggiornamento
+agglomerant
+agglomerate
+agglomerated
+agglomerates
+agglomeratic
+agglomerating
+agglomeration
+agglomerations
+agglomerative
+agglomerator
+agglutinability
+agglutinable
+agglutinant
+agglutinate
+agglutinated
+agglutinates
+agglutinating
+agglutination
+agglutinationist
+agglutinations
+agglutinative
+agglutinatively
+agglutinator
+agglutinin
+agglutinins
+agglutinize
+agglutinogen
+agglutinogenic
+agglutinoid
+agglutinoscope
+agglutogenic
+aggrace
+aggradation
+aggradational
+aggrade
+aggraded
+aggrades
+aggrading
+aggrammatism
+aggrandise
+aggrandised
+aggrandisement
+aggrandiser
+aggrandising
+aggrandizable
+aggrandize
+aggrandized
+aggrandizement
+aggrandizements
+aggrandizer
+aggrandizers
+aggrandizes
+aggrandizing
+aggrate
+aggravable
+aggravate
+aggravated
+aggravates
+aggravating
+aggravatingly
+aggravation
+aggravations
+aggravative
+aggravator
+aggregable
+aggregant
+Aggregata
+Aggregatae
+aggregate
+aggregated
+aggregately
+aggregateness
+aggregates
+aggregating
+aggregation
+aggregational
+aggregations
+aggregative
+aggregatively
+aggregato-
+aggregator
+aggregatory
+aggrege
+aggress
+aggressed
+aggresses
+aggressing
+aggression
+aggressionist
+aggressions
+aggressive
+aggressively
+aggressiveness
+aggressivenesses
+aggressivity
+aggressor
+aggressors
+Aggri
+aggrievance
+aggrieve
+aggrieved
+aggrievedly
+aggrievedness
+aggrievement
+aggrieves
+aggrieving
+aggro
+aggros
+aggroup
+aggroupment
+aggry
+aggur
+Aggy
+Agh
+agha
+Aghan
+aghanee
+aghas
+aghast
+aghastness
+Aghlabite
+Aghorapanthi
+Aghori
+Agialid
+Agib
+agible
+Agiel
+agilawood
+agile
+agilely
+agileness
+agilities
+agility
+agillawood
+agilmente
+agin
+Agincourt
+aging
+agings
+aginner
+aginners
+agio
+agios
+agiotage
+agiotages
+agism
+agisms
+agist
+agistator
+agisted
+agister
+agisting
+agistment
+agistor
+agists
+agit
+agitability
+agitable
+agitant
+agitate
+agitated
+agitatedly
+agitates
+agitating
+agitation
+agitational
+agitationist
+agitations
+agitative
+agitato
+agitator
+agitatorial
+agitators
+agitatrix
+agitprop
+agitpropist
+agitprops
+agitpunkt
+Agkistrodon
+agkistrodon
+AGL
+agla
+Aglaia
+aglaia
+aglance
+Aglaonema
+Aglaos
+aglaozonia
+aglare
+Aglaspis
+Aglauros
+Aglaus
+Agle
+agleaf
+agleam
+aglee
+Agler
+aglet
+aglethead
+aglets
+agley
+a-glimmer
+aglimmer
+aglint
+Aglipayan
+Aglipayano
+aglisten
+aglitter
+aglobulia
+aglobulism
+Aglossa
+aglossal
+aglossate
+aglossia
+aglow
+aglucon
+aglucone
+a-glucosidase
+aglutition
+agly
+aglycon
+aglycone
+aglycones
+aglycons
+aglycosuric
+Aglypha
+aglyphodont
+Aglyphodonta
+Aglyphodontia
+aglyphous
+AGM
+AGMA
+agma
+agmas
+agmatine
+agmatology
+agminate
+agminated
+AGN
+Agna
+agnail
+agnails
+agname
+agnamed
+agnat
+agnate
+agnates
+Agnatha
+agnathia
+agnathic
+Agnathostomata
+agnathostomatous
+agnathous
+agnatic
+agnatical
+agnatically
+agnation
+agnations
+agnean
+agneau
+agneaux
+agnel
+Agnella
+Agnes
+Agnese
+Agness
+Agnesse
+Agneta
+Agnew
+Agni
+agnification
+agnition
+agnize
+agnized
+agnizes
+agnizing
+Agnoetae
+Agnoete
+Agnoetism
+agnoiology
+Agnoite
+agnoites
+Agnola
+agnomen
+agnomens
+agnomical
+agnomina
+agnominal
+agnomination
+agnosia
+agnosias
+agnosis
+agnostic
+agnostical
+agnostically
+agnosticism
+agnostics
+Agnostus
+agnosy
+Agnotozoic
+agnus
+agnuses
+ago
+agog
+agoge
+agogic
+agogics
+-agogue
+agoho
+agoing
+agomensin
+agomphiasis
+agomphious
+agomphosis
+Agon
+agon
+agonal
+agone
+agones
+agonia
+agoniada
+agoniadin
+agoniatite
+Agoniatites
+agonic
+agonied
+agonies
+agonise
+agonised
+agonises
+agonising
+agonisingly
+agonist
+Agonista
+agonistarch
+agonistic
+agonistical
+agonistically
+agonistics
+agonists
+agonium
+agonize
+agonized
+agonizedly
+agonizer
+agonizes
+agonizing
+agonizingly
+agonizingness
+Agonostomus
+agonothet
+agonothete
+agonothetic
+agons
+agony
+a-good
+agora
+agorae
+Agoraea
+Agoraeus
+agoramania
+agoranome
+agoranomus
+agoraphobia
+agoraphobiac
+agoraphobic
+agoras
+a-gore-blood
+agorot
+agoroth
+agos
+agostadero
+Agostini
+Agostino
+Agosto
+agouara
+agouta
+agouti
+agouties
+agoutis
+agouty
+agpaite
+agpaitic
+AGR
+agr
+agr.
+Agra
+agrace
+Agraeus
+agrafe
+agrafes
+agraffe
+agraffee
+agraffes
+agrah
+agral
+Agram
+agramed
+agrammaphasia
+agrammatica
+agrammatical
+agrammatism
+agrammatologia
+Agrania
+agranulocyte
+agranulocytosis
+agranuloplastic
+Agrapha
+agrapha
+agraphia
+agraphias
+agraphic
+agraria
+agrarian
+agrarianism
+agrarianisms
+agrarianize
+agrarianly
+agrarians
+Agrauleum
+Agraulos
+agravic
+agre
+agreat
+agreation
+agreations
+agree
+agreeability
+agreeable
+agreeableness
+agreeablenesses
+agreeable-sounding
+agreeably
+agreed
+agreeing
+agreeingly
+agreement
+agreements
+agreer
+agreers
+agrees
+agregation
+agrege
+agreges
+agreing
+agremens
+agrement
+agrements
+agrest
+agrestal
+agrestial
+agrestian
+agrestic
+agrestical
+agrestis
+Agretha
+agria
+agrias
+agribusiness
+agribusinesses
+agric
+agric.
+agricere
+Agricola
+agricole
+agricolist
+agricolite
+agricolous
+agricultor
+agricultural
+agriculturalist
+agriculturalists
+agriculturally
+agriculture
+agriculturer
+agricultures
+agriculturist
+agriculturists
+agrief
+Agrigento
+Agrilus
+Agrimonia
+agrimonies
+agrimony
+agrimotor
+agrin
+Agrinion
+Agriochoeridae
+Agriochoerus
+agriological
+agriologist
+agriology
+Agrionia
+agrionid
+Agrionidae
+Agriope
+agriot
+Agriotes
+agriotype
+Agriotypidae
+Agriotypus
+Agripina
+Agrippa
+Agrippina
+agrise
+agrised
+agrising
+agrito
+agritos
+Agrius
+agro-
+agroan
+agrobacterium
+agrobiologic
+agrobiological
+agrobiologically
+agrobiologist
+agrobiology
+agrodolce
+agrogeological
+agrogeologically
+agrogeology
+agrologic
+agrological
+agrologically
+agrologies
+agrologist
+agrology
+agrom
+agromania
+Agromyza
+agromyzid
+Agromyzidae
+agron
+agron.
+agronome
+agronomial
+agronomic
+agronomical
+agronomically
+agronomics
+agronomies
+agronomist
+agronomists
+agronomy
+agroof
+agrope
+Agropyron
+Agrostemma
+agrosteral
+agrosterol
+Agrostis
+agrostis
+agrostographer
+agrostographic
+agrostographical
+agrostographies
+agrostography
+agrostologic
+agrostological
+agrostologist
+agrostology
+agrote
+agrotechny
+Agrotera
+Agrotis
+agrotype
+aground
+agrufe
+agruif
+agrypnia
+agrypniai
+agrypnias
+agrypnode
+agrypnotic
+AGS
+agsam
+agst
+Agt
+agt
+agtbasic
+AGU
+agua
+aguacate
+Aguacateca
+Aguada
+aguada
+Aguadilla
+aguador
+Aguadulce
+aguaji
+aguamas
+aguamiel
+Aguanga
+aguara
+aguardiente
+Aguascalientes
+aguavina
+Aguayo
+Agudist
+ague
+Agueda
+ague-faced
+aguelike
+ague-plagued
+agueproof
+ague-rid
+agues
+ague-sore
+ague-struck
+agueweed
+agueweeds
+aguey
+aguglia
+Aguie
+Aguijan
+Aguila
+Aguilar
+aguilarite
+aguilawood
+aguilt
+Aguinaldo
+aguinaldo
+aguinaldos
+aguirage
+Aguirre
+aguise
+aguish
+aguishly
+aguishness
+Aguistin
+agujon
+Agulhas
+agunah
+Agung
+agura
+aguroth
+agush
+agust
+Aguste
+Agustin
+Agway
+agy
+Agyieus
+agyiomania
+agynarious
+agynary
+agynic
+agynous
+agyrate
+agyria
+agyrophobia
+A.H.
+AH
+Ah
+ah
+AHA
+aha
+ahaaina
+Ahab
+ahab
+ahamkara
+ahankara
+Ahantchuyuk
+Aharon
+ahartalav
+Ahasuerus
+ahaunch
+Ahaz
+Ahaziah
+ahchoo
+Ahders
+AHE
+ahead
+aheap
+Ahearn
+a-height
+aheight
+ahem
+ahems
+Ahepatokla
+Ahern
+Ahet
+a-hey
+ahey
+Ahgwahching
+Ahhiyawa
+ahi
+Ahidjo
+Ahiezer
+a-high
+a-high-lone
+Ahimaaz
+Ahimelech
+ahimsa
+ahimsas
+ahind
+ahint
+Ahir
+Ahira
+Ahisar
+Ahishar
+ahistoric
+ahistorical
+Ahithophel
+AHL
+Ahl
+Ahlgren
+ahluwalia
+Ahmad
+Ahmadabad
+Ahmadi
+ahmadi
+Ahmadiya
+Ahmadnagar
+Ahmadou
+Ahmadpur
+Ahmar
+Ahmed
+Ahmedabad
+ahmedi
+Ahmednagar
+Ahmeek
+Ahnfeltia
+aho
+Ahola
+Aholah
+a-hold
+ahold
+aholds
+Aholla
+aholt
+Ahom
+ahong
+a-horizon
+ahorse
+a-horseback
+ahorseback
+Ahoskie
+Ahoufe
+Ahouh
+Ahousaht
+ahoy
+ahoys
+AHQ
+Ahrendahronon
+Ahrendt
+Ahrens
+Ahriman
+Ahrimanian
+Ahron
+ahs
+AHSA
+Ahsahka
+ahsan
+Aht
+Ahtena
+ahu
+ahuaca
+ahuatle
+ahuehuete
+ahull
+ahum
+ahungered
+ahungry
+a-hunt
+ahunt
+ahura
+Ahura-mazda
+ahurewa
+ahush
+ahuula
+Ahuzzath
+Ahvaz
+Ahvenanmaa
+Ahwahnee
+ahwal
+Ahwaz
+ahypnia
+A.I.
+AI
+ai
+A.I.A.
+AIA
+Aia
+AIAA
+Aias
+Aiawong
+aiblins
+Aibonito
+AIC
+AICC
+aichmophobia
+A.I.D.
+AID
+aid
+Aida
+aidable
+Aidan
+aidance
+aidant
+AIDDE
+aid-de-camp
+aide
+aided
+aide-de-camp
+aide-de-campship
+aide-memoire
+aide-mmoire
+Aiden
+Aidenn
+aider
+aiders
+Aides
+aides
+aides-de-camp
+aidful
+Aidin
+aiding
+Aidit
+aidless
+aidman
+aidmanmen
+aidmen
+Aidoneus
+Aidos
+AIDS
+aids
+aids-de-camp
+Aiea
+AIEEE
+aiel
+Aiello
+aiery
+AIF
+aiger
+aigialosaur
+Aigialosauridae
+Aigialosaurus
+aiglet
+aiglets
+aiglette
+Aigneis
+aigre
+aigre-doux
+aigremore
+aigret
+aigrets
+aigrette
+aigrettes
+aiguelle
+aiguellette
+aigue-marine
+aiguiere
+aiguille
+aiguilles
+aiguillesque
+aiguillette
+aiguilletted
+AIH
+aik
+aikane
+Aiken
+aikido
+aikidos
+aikinite
+aikona
+aikuchi
+ail
+Aila
+ailantery
+ailanthic
+Ailanthus
+ailanthus
+ailanthuses
+ailantine
+ailanto
+Ailbert
+Aile
+aile
+ailed
+Ailee
+Aileen
+Ailene
+aileron
+ailerons
+ailette
+Ailey
+Aili
+Ailie
+Ailin
+Ailina
+ailing
+Ailis
+Ailleret
+aillt
+ailment
+ailments
+ails
+Ailsa
+Ailssa
+Ailsun
+ailsyte
+Ailuridae
+ailuro
+ailuroid
+Ailuroidea
+ailuromania
+ailurophile
+ailurophilia
+ailurophilic
+ailurophobe
+ailurophobia
+ailurophobic
+Ailuropoda
+Ailuropus
+Ailurus
+ailweed
+Ailyn
+AIM
+aim
+aimable
+Aimak
+aimak
+aimara
+AIME
+Aime
+aimed
+Aimee
+aimer
+aimers
+aimful
+aimfully
+Aimil
+aiming
+aimless
+aimlessly
+aimlessness
+aimlessnesses
+Aimo
+Aimore
+AIMS
+aims
+Aimwell
+aimworthiness
+Ain
+ain
+ainaleh
+AInd
+Aindrea
+aine
+ainee
+ainhum
+ainoi
+ains
+ainsell
+ainsells
+Ainslee
+Ainsley
+Ainslie
+Ainsworth
+ain't
+aint
+Aintab
+Ainu
+ainu
+Ainus
+ainus
+AIOD
+aioli
+aiolis
+aion
+aionial
+AIPS
+AIR
+Air
+air
+Aira
+airable
+airampo
+airan
+airbag
+airbags
+air-balloon
+airbill
+airbills
+air-bind
+air-blasted
+air-blown
+airboat
+airboats
+air-born
+airborn
+air-borne
+airborne
+air-bound
+airbound
+airbrained
+air-braked
+airbrasive
+air-braving
+air-breathe
+air-breathed
+air-breather
+air-breathing
+air-bred
+airbrick
+airbrush
+airbrushed
+airbrushes
+airbrushing
+air-built
+airburst
+airbursts
+airbus
+airbuses
+airbusses
+air-chambered
+aircheck
+airchecks
+air-cheeked
+air-clear
+aircoach
+aircoaches
+air-condition
+aircondition
+air-conditioned
+airconditioned
+air-conditioning
+airconditioning
+airconditions
+air-conscious
+air-conveying
+air-cool
+air-cooled
+air-core
+aircraft
+aircraftman
+aircraftmen
+aircrafts
+aircraftsman
+aircraftsmen
+aircraftswoman
+aircraftswomen
+aircraftwoman
+aircrew
+aircrewman
+aircrewmen
+aircrews
+air-cure
+air-cured
+airdate
+airdates
+air-defiling
+airdock
+air-drawn
+Airdrie
+air-dried
+air-driven
+airdrome
+airdromes
+airdrop
+airdropped
+airdropping
+airdrops
+air-dry
+air-drying
+Aire
+aire
+aired
+Airedale
+airedale
+airedales
+Airel
+air-embraced
+airer
+airers
+Aires
+airest
+air-express
+airfare
+airfares
+air-faring
+airfield
+airfields
+air-filled
+air-floated
+airflow
+airflows
+airfoil
+airfoils
+air-formed
+airframe
+airframes
+airfreight
+airfreighter
+airglow
+airglows
+airgraph
+airgraphics
+air-hardening
+airhead
+airheads
+air-heating
+airier
+airiest
+airiferous
+airified
+airify
+airily
+airiness
+airinesses
+airing
+airings
+air-insulated
+air-intake
+airish
+Airla
+air-lance
+air-lanced
+air-lancing
+Airlee
+airle-penny
+airless
+airlessly
+airlessness
+Airlia
+Airliah
+Airlie
+airlift
+airlifted
+airlifting
+airlifts
+airlight
+airlike
+air-line
+airline
+airliner
+airliners
+airlines
+airling
+airlock
+airlocks
+air-logged
+air-mail
+airmail
+airmailed
+airmailing
+airmails
+airman
+airmanship
+airmark
+airmarker
+airmass
+airmen
+air-minded
+air-mindedness
+airmobile
+airmonger
+airn
+airns
+airohydrogen
+airometer
+airpark
+airparks
+air-pervious
+airphobia
+airplane
+airplaned
+airplaner
+airplanes
+airplaning
+airplanist
+airplay
+airplays
+airplot
+airport
+airports
+airpost
+airposts
+airproof
+airproofed
+airproofing
+airproofs
+air-raid
+airs
+airscape
+airscapes
+airscrew
+airscrews
+air-season
+air-seasoned
+airshed
+airsheds
+airsheet
+airship
+airships
+air-shy
+airsick
+airsickness
+air-slake
+air-slaked
+air-slaking
+airsome
+airspace
+airspaces
+airspeed
+airspeeds
+air-spray
+air-sprayed
+air-spun
+air-stirring
+airstream
+airstrip
+airstrips
+air-swallowing
+airt
+airted
+airth
+airthed
+airthing
+air-threatening
+airths
+airtight
+airtightly
+airtightness
+airtime
+airtimes
+airting
+air-to-air
+air-to-ground
+air-to-surface
+air-trampling
+airts
+air-twisted
+air-vessel
+airview
+Airville
+airward
+airwards
+airwash
+airwave
+airwaves
+airway
+airwaybill
+airwayman
+airways
+air-wise
+airwise
+air-wiseness
+airwoman
+airwomen
+airworthier
+airworthiest
+airworthiness
+airworthy
+Airy
+airy
+airy-fairy
+AIS
+ais
+aischrolatreia
+aiseweed
+Aisha
+AISI
+aisle
+aisled
+aisleless
+aisles
+aisling
+Aisne
+Aisne-Marne
+Aissaoua
+Aissor
+aisteoir
+aistopod
+Aistopoda
+Aistopodes
+ait
+aitch
+aitch-bone
+aitchbone
+aitches
+aitchless
+aitchpiece
+aitesis
+aith
+aithochroi
+aitiology
+aition
+aitiotropic
+aitis
+Aitken
+Aitkenite
+Aitkin
+aits
+Aitutakian
+aiver
+aivers
+aivr
+aiwain
+aiwan
+AIX
+Aix
+Aix-en-Provence
+Aix-la-Chapelle
+Aix-la-chapelle
+Aix-les-Bains
+aizle
+Aizoaceae
+aizoaceous
+Aizoon
+AJ
+AJA
+Ajaccio
+Ajaja
+ajaja
+ajangle
+Ajani
+Ajanta
+ajar
+ajari
+Ajatasatru
+ajava
+Ajax
+ajax
+Ajay
+AJC
+ajee
+ajenjo
+ajhar
+ajimez
+Ajit
+ajitter
+ajiva
+ajivas
+Ajivika
+ajivika
+Ajmer
+Ajo
+Ajodhya
+ajog
+ajoint
+ajonjoli
+ajoure
+ajourise
+ajowan
+ajowans
+Ajuga
+ajuga
+ajugas
+ajutment
+AK
+ak
+AKA
+Aka
+aka
+akaakai
+Akaba
+Akademi
+Akal
+akala
+Akali
+akalimba
+akamai
+akamatsu
+Akamnik
+Akan
+akan
+Akanekunik
+Akania
+Akaniaceae
+Akanke
+akaroa
+akasa
+akasha
+Akaska
+Akas-mukhi
+Akawai
+akazga
+akazgin
+akazgine
+Akbar
+AKC
+akcheh
+ake
+akeake
+akebi
+Akebia
+aked
+akee
+akees
+akehorne
+akeki
+Akel
+Akela
+akela
+akelas
+Akeldama
+Akeley
+akeley
+akemboll
+akenbold
+akene
+akenes
+akenobeite
+akepiro
+akepiros
+Aker
+aker
+Akerboom
+akerite
+Akerley
+Akers
+aketon
+akey
+Akeyla
+Akeylah
+Akh
+Akha
+Akhaia
+akhara
+Akhenaten
+Akhetaton
+Akhisar
+Akhissar
+Akhlame
+Akhmatova
+Akhmimic
+Akhnaton
+akhoond
+akhrot
+akhund
+akhundzada
+akhyana
+Akhziv
+akia
+Akiachak
+Akiak
+Akiba
+Akihito
+Akili
+Akim
+akimbo
+Akimovsky
+Akin
+akin
+akindle
+akinesia
+akinesic
+akinesis
+akinete
+akinetic
+aking
+Akins
+Akira
+Akiskemikinik
+Akita
+Akiyenik
+Akka
+Akkad
+Akkadian
+akkadian
+Akkadist
+Akkerman
+Akkra
+Aklog
+akmite
+Akmolinsk
+akmudar
+akmuddar
+aknee
+aknow
+ako
+akoasm
+akoasma
+akolouthia
+akoluthia
+akonge
+Akontae
+Akoulalion
+akov
+akpek
+Akra
+akra
+Akrabattine
+akre
+akroasis
+akrochordite
+Akron
+akron
+akroter
+akroteria
+akroterial
+akroterion
+akrteria
+Aksel
+Aksoyn
+Aksum
+aktiebolag
+Aktiengesellschaft
+Aktistetae
+Aktistete
+Aktivismus
+Aktivist
+Aktyubinsk
+aku
+akuammin
+akuammine
+akule
+akund
+Akure
+Akutagawa
+Akutan
+akvavit
+akvavits
+Akwapim
+Akyab
+-al
+A.L.
+AL
+Al
+al
+al-
+al.
+ALA
+Ala
+Ala.
+ala
+Alabama
+alabama
+Alabaman
+Alabamian
+alabamian
+alabamians
+alabamide
+alabamine
+alabandine
+alabandite
+alabarch
+Alabaster
+alabaster
+alabasters
+alabastoi
+alabastos
+alabastra
+alabastrian
+alabastrine
+alabastrites
+alabastron
+alabastrons
+alabastrum
+alabastrums
+alablaster
+alacha
+alachah
+Alachua
+alack
+alackaday
+alacran
+alacreatine
+alacreatinin
+alacreatinine
+alacrify
+alacrious
+alacriously
+alacrities
+alacritous
+alacrity
+Alactaga
+alada
+Aladdin
+aladdin
+Aladdinize
+Aladfar
+Aladinist
+alae
+alagao
+alagarto
+alagau
+Alage
+Alagez
+Alagoas
+Alagoz
+alahee
+Alai
+alai
+alaihi
+Alain
+Alaine
+Alain-Fournier
+Alair
+alaite
+Alakanuk
+Alake
+Alaki
+Alala
+alala
+Alalcomeneus
+alalia
+alalite
+alaloi
+alalonga
+alalunga
+alalus
+Alamance
+Alamanni
+Alamannian
+Alamannic
+alambique
+Alameda
+alameda
+alamedas
+Alamein
+Alaminos
+alamiqui
+alamire
+Alamo
+alamo
+alamodality
+alamode
+alamodes
+Alamogordo
+alamonti
+alamort
+alamos
+Alamosa
+alamosite
+Alamota
+alamoth
+Alan
+alan
+Alana
+Alan-a-dale
+Alanah
+Alanbrooke
+Aland
+aland
+alands
+Alane
+alane
+alang
+alang-alang
+alange
+Alangiaceae
+alangin
+alangine
+Alangium
+alani
+alanin
+alanine
+alanines
+alanins
+Alanna
+alannah
+Alano
+Alanreed
+Alans
+alans
+Alansen
+Alanson
+alant
+alantic
+alantin
+alantol
+alantolactone
+alantolic
+alants
+alanyl
+alanyls
+ALAP
+alap
+alapa
+Alapaha
+Alar
+alar
+Alarbus
+Alarcon
+Alard
+alares
+alarge
+Alaria
+Alaric
+Alarice
+Alarick
+Alarise
+alarm
+alarmable
+alarmclock
+alarmed
+alarmedly
+alarming
+alarmingly
+alarmingness
+alarmism
+alarmisms
+alarmist
+alarmists
+alarms
+Alarodian
+alarum
+alarumed
+alaruming
+alarums
+alary
+Alas
+Alas.
+alas
+alasas
+Alascan
+Alasdair
+Alaska
+alaska
+alaskaite
+Alaskan
+alaskan
+alaskans
+alaskas
+alaskite
+Alastair
+Alasteir
+Alaster
+Alastor
+alastor
+alastors
+alastrim
+alate
+Alatea
+alated
+alatern
+alaternus
+alates
+Alathia
+alation
+alations
+Alauda
+Alaudidae
+alaudine
+alaund
+Alaunian
+alaunt
+Alawi
+alay
+Alayne
+alazor
+Alb
+Alb.
+alb
+Alba
+alba
+albacea
+Albacete
+albacora
+albacore
+albacores
+albahaca
+Albainn
+Albamycin
+Alban
+alban
+Albana
+Albanenses
+Albanensian
+Albanese
+Albania
+albania
+Albanian
+albanian
+albanians
+albanite
+Albany
+albany
+albarco
+albardine
+albarelli
+albarello
+albarellos
+albarium
+Albarran
+albas
+albaspidin
+albata
+albatas
+Albategnius
+albation
+Albatros
+albatross
+albatrosses
+Albay
+albe
+albedo
+albedoes
+albedograph
+albedometer
+albedos
+Albee
+albee
+albeit
+Albemarle
+Alben
+Albeniz
+Alber
+alberca
+Alberene
+albergatrice
+alberge
+alberghi
+albergo
+Alberic
+Alberich
+alberich
+Alberik
+Alberoni
+Albers
+Albert
+albert
+Alberta
+alberta
+Alberti
+albertin
+Albertina
+Albertine
+Albertinian
+Albertist
+albertite
+Albertlea
+Alberto
+Alberton
+Albertson
+albert-type
+alberttype
+albertustaler
+Albertville
+albertype
+albescence
+albescent
+albespine
+albespyne
+albeston
+albetad
+Albi
+Albia
+Albian
+albicans
+albicant
+albication
+albicore
+albicores
+albiculi
+Albie
+albification
+albificative
+albified
+albiflorous
+albify
+albifying
+Albigenses
+albigenses
+Albigensian
+Albigensianism
+Albin
+albin
+Albina
+albinal
+albines
+albiness
+albinic
+albinism
+albinisms
+albinistic
+albino
+albinoism
+Albinoni
+albinos
+albinotic
+albinuria
+Albinus
+Albion
+albion
+Albireo
+albite
+albites
+albitic
+albitical
+albitite
+albitization
+albitophyre
+albizia
+albizias
+Albizzia
+albizzia
+albizzias
+ALBM
+Albniz
+ALBO
+albocarbon
+albocinereous
+Albococcus
+albocracy
+Alboin
+albolite
+albolith
+albopannin
+albopruinose
+alborada
+alborak
+Alboran
+alboranite
+Alborn
+Albrecht
+Albric
+albricias
+Albright
+Albrightsville
+albronze
+Albruna
+albs
+Albuca
+Albuginaceae
+albuginea
+albugineous
+albugines
+albuginitis
+albugo
+album
+albumean
+albumen
+albumeniizer
+albumenisation
+albumenise
+albumenised
+albumeniser
+albumenising
+albumenization
+albumenize
+albumenized
+albumenizer
+albumenizing
+albumenoid
+albumens
+albumimeter
+albumin
+albuminate
+albuminaturia
+albuminiferous
+albuminiform
+albuminimeter
+albuminimetry
+albuminiparous
+albuminise
+albuminised
+albuminising
+albuminization
+albuminize
+albuminized
+albuminizing
+albumino-
+albuminocholia
+albuminofibrin
+albuminogenous
+albuminoid
+albuminoidal
+albuminolysis
+albuminometer
+albuminometry
+albuminone
+albuminorrhea
+albuminoscope
+albuminose
+albuminosis
+albuminous
+albuminousness
+albumins
+albuminuria
+albuminuric
+albuminurophobia
+albumoid
+albumoscope
+albumose
+albumoses
+albumosuria
+albums
+Albuna
+Albunea
+Albuquerque
+albuquerque
+Albur
+Alburg
+Alburga
+alburn
+Alburnett
+alburnous
+alburnum
+alburnums
+Alburtis
+Albury
+albus
+albutannin
+Alby
+Albyn
+ALC
+alc
+Alca
+Alcaaba
+alcabala
+alcade
+alcades
+Alcae
+Alcaeus
+alcahest
+alcahests
+Alcaic
+alcaic
+alcaiceria
+Alcaics
+alcaics
+alcaid
+alcaide
+alcaides
+Alcaids
+Alcalde
+alcalde
+alcaldes
+alcaldeship
+alcaldia
+alcali
+Alcaligenes
+alcaligenes
+alcalizate
+Alcalzar
+alcamine
+Alcandre
+alcanna
+Alcantara
+alcantara
+Alcantarines
+alcapton
+alcaptonuria
+alcargen
+alcarraza
+Alcathous
+alcatras
+Alcatraz
+alcavala
+alcayde
+alcaydes
+alcazaba
+Alcazar
+alcazar
+alcazars
+alcazava
+alce
+Alcedines
+Alcedinidae
+Alcedininae
+Alcedo
+alcelaphine
+Alcelaphus
+Alces
+Alceste
+Alcester
+Alcestis
+alcestis
+alchem
+alchemic
+alchemical
+alchemically
+alchemies
+Alchemilla
+alchemise
+alchemised
+alchemising
+alchemist
+alchemister
+alchemistic
+alchemistical
+alchemistry
+alchemists
+alchemize
+alchemized
+alchemizing
+alchemy
+alchera
+alcheringa
+alchim-
+alchimy
+alchitran
+alchochoden
+Alchornea
+alchornea
+Alchuine
+alchym-
+alchymies
+alchymy
+Alcibiadean
+Alcibiades
+alcibiades
+Alcicornium
+alcid
+Alcidae
+Alcide
+Alcides
+Alcidice
+alcidine
+alcids
+Alcimede
+Alcimedes
+Alcimedon
+Alcina
+Alcine
+alcine
+Alcinia
+Alcinous
+Alcippe
+Alcis
+Alcithoe
+alclad
+Alcmaeon
+Alcman
+Alcmaon
+Alcmena
+Alcmene
+alcmene
+Alco
+alco
+Alcoa
+alcoate
+Alcock
+alcogel
+alcogene
+alcohate
+alcohol
+alcoholate
+alcoholature
+alcoholdom
+alcoholemia
+alcoholic
+alcoholically
+alcoholicity
+alcoholics
+alcoholimeter
+alcoholisation
+alcoholise
+alcoholised
+alcoholising
+alcoholism
+alcoholisms
+alcoholist
+alcoholizable
+alcoholization
+alcoholize
+alcoholized
+alcoholizing
+alcoholmeter
+alcoholmetric
+alcoholomania
+alcoholometer
+alcoholometric
+alcoholometrical
+alcoholometry
+alcoholophilia
+alcohols
+alcoholuria
+alcoholysis
+alcoholytic
+Alcolu
+Alcon
+alconde
+alco-ometer
+alco-ometric
+alco-ometrical
+alco-ometry
+alcoothionic
+Alcor
+Alcoran
+alcoran
+Alcoranic
+Alcoranist
+alcornoco
+alcornoque
+alcosol
+Alcot
+Alcotate
+Alcott
+Alcova
+alcove
+alcoved
+alcoves
+alcovinometer
+Alcuin
+Alcuinian
+alcumy
+Alcus
+alcyon
+Alcyonacea
+alcyonacean
+Alcyonaria
+alcyonarian
+Alcyone
+alcyone
+Alcyones
+Alcyoneus
+Alcyoniaceae
+alcyonic
+alcyoniform
+Alcyonium
+alcyonium
+alcyonoid
+Ald
+Ald.
+ald
+Alda
+Aldabra
+aldamin
+aldamine
+Aldan
+aldane
+Aldarcie
+Aldarcy
+Aldas
+alday
+aldazin
+aldazine
+aldea
+aldeament
+Aldebaran
+aldebaran
+aldebaranium
+Alded
+aldehol
+aldehydase
+aldehyde
+aldehydes
+aldehydic
+aldehydine
+aldehydrol
+aldeia
+Alden
+alden
+Aldenville
+Alder
+alder
+alder-
+Alderamin
+Aldercy
+alderflies
+alderfly
+alder-leaved
+alderliefest
+alderling
+Alderman
+alderman
+aldermanate
+aldermancy
+aldermaness
+aldermanic
+aldermanical
+aldermanity
+aldermanlike
+aldermanly
+aldermanries
+aldermanry
+aldermanship
+Aldermaston
+aldermen
+aldern
+Alderney
+alders
+Aldershot
+Alderson
+alderwoman
+alderwomen
+Aldhafara
+Aldhafera
+aldide
+Aldie
+aldim
+aldime
+aldimin
+aldimine
+Aldin
+Aldine
+aldine
+Aldington
+Aldis
+alditol
+Aldm
+aldm
+Aldo
+aldoheptose
+aldohexose
+aldoketene
+aldol
+aldolase
+aldolases
+aldolization
+aldolize
+aldolized
+aldolizing
+aldols
+Aldon
+aldononose
+aldopentose
+Aldora
+Aldos
+aldose
+aldoses
+aldoside
+aldosterone
+aldosteronism
+Aldous
+aldovandi
+aldoxime
+Aldred
+Aldredge
+Aldric
+Aldrich
+Aldridge
+Aldridge-Brownhills
+Aldrin
+aldrin
+aldrins
+Aldrovanda
+Alduino
+Aldus
+Aldwin
+Aldwon
+ale
+Alea
+aleak
+Aleardi
+aleatoric
+aleatory
+alebench
+aleberry
+Alebion
+ale-blown
+ale-born
+alebush
+Alec
+alec
+Alecia
+alecithal
+alecithic
+alecize
+Aleck
+aleconner
+alecost
+alecs
+Alecto
+Alectoria
+alectoria
+alectoriae
+Alectorides
+alectoridine
+alectorioid
+Alectoris
+alectoromachy
+alectoromancy
+Alectoromorphae
+alectoromorphous
+Alectoropodes
+alectoropodous
+Alectrion
+Alectrionidae
+alectryomachy
+alectryomancy
+Alectryon
+alectryon
+alecup
+Aleda
+Aledo
+alee
+Aleece
+Aleedis
+Aleen
+Aleetha
+alef
+ale-fed
+alefnull
+alefs
+aleft
+alefzero
+alegar
+alegars
+aleger
+Alegre
+Alegrete
+alehoof
+alehouse
+alehouses
+Aleichem
+aleikoum
+aleikum
+aleiptes
+aleiptic
+Aleixandre
+Alejandra
+Alejandrina
+Alejandro
+Alejo
+Alejoa
+Alek
+Alekhine
+Aleknagik
+aleknight
+Aleksandr
+Aleksandropol
+Aleksandrov
+Aleksandrovac
+Aleksandrovsk
+Alekseyevska
+Aleksin
+Alem
+alem
+Aleman
+alemana
+Alemanni
+Alemannian
+Alemannic
+alemannic
+Alemannish
+Alembert
+alembic
+alembicate
+alembicated
+alembics
+alembroth
+Alemite
+alemite
+alemmal
+alemonger
+alen
+Alena
+Alencon
+alencon
+alencons
+Alene
+alenge
+alength
+Alenson
+Alentejo
+alentours
+alenu
+Aleochara
+Alep
+aleph
+aleph-null
+alephs
+aleph-zero
+alephzero
+alepidote
+alepine
+alepole
+alepot
+Aleppine
+Aleppo
+Aleras
+alerce
+alerion
+Aleris
+Aleron
+alerse
+alert
+alerta
+alerted
+alertedly
+alerter
+alerters
+alertest
+alerting
+alertly
+alertness
+alertnesses
+alerts
+-ales
+Ales
+ales
+alesan
+Alesandrini
+aleshot
+Alesia
+Alessandra
+Alessandri
+Alessandria
+Alessandro
+alestake
+ale-swilling
+Aleta
+aletap
+aletaster
+Aletes
+Aletha
+Alethea
+Alethia
+alethic
+alethiologic
+alethiological
+alethiologist
+alethiology
+alethopteis
+alethopteroid
+alethoscope
+aletocyte
+Aletris
+Aletta
+Alette
+alette
+aleucaemic
+aleucemic
+aleukaemic
+aleukemic
+Aleurites
+aleuritic
+Aleurobius
+Aleurodes
+Aleurodidae
+aleuromancy
+aleurometer
+aleuron
+aleuronat
+aleurone
+aleurones
+aleuronic
+aleurons
+aleuroscope
+Aleus
+Aleut
+aleut
+Aleutian
+aleutian
+Aleutians
+aleutians
+Aleutic
+aleutite
+alevin
+alevins
+Alevitsa
+alew
+ale-washed
+alewhap
+ale-wife
+alewife
+alewives
+Alex
+Alexa
+Alexander
+alexander
+alexanders
+Alexanderson
+Alexandr
+Alexandra
+Alexandre
+Alexandreid
+Alexandretta
+Alexandria
+alexandria
+Alexandrian
+alexandrian
+Alexandrianism
+Alexandrina
+Alexandrine
+alexandrine
+alexandrines
+Alexandrinus
+alexandrite
+Alexandro
+Alexandropolis
+Alexandros
+Alexandroupolis
+Alexas
+Alexei
+Alexi
+Alexia
+alexia
+Alexian
+Alexiares
+alexias
+alexic
+Alexicacus
+alexin
+Alexina
+Alexine
+alexine
+alexines
+alexinic
+alexins
+Alexio
+alexipharmacon
+alexipharmacum
+alexipharmic
+alexipharmical
+alexipyretic
+ALEXIS
+Alexis
+Alexishafen
+alexiteric
+alexiterical
+Alexius
+Aley
+aleyard
+Aleydis
+Aleyrodes
+aleyrodid
+Aleyrodidae
+alezan
+Alf
+alf
+ALFA
+alfa
+Alfadir
+alfaje
+alfaki
+alfakis
+alfalfa
+alfalfas
+alfaqui
+alfaquin
+alfaquins
+alfaquis
+Alfarabius
+alfarga
+alfas
+ALFE
+Alfedena
+alfenide
+Alfeo
+alferes
+alferez
+alfet
+Alfeus
+Alfheim
+Alfi
+Alfie
+Alfieri
+alfilaria
+alfileria
+alfilerilla
+alfilerillo
+alfin
+alfiona
+alfione
+Alfirk
+alfoncino
+Alfons
+Alfonse
+alfonsin
+Alfonso
+alfonso
+Alfonson
+Alfonzo
+Alford
+alforge
+alforja
+alforjas
+Alfraganus
+Alfred
+alfred
+Alfreda
+Alfredo
+alfresco
+Alfric
+alfridaric
+alfridary
+Alfur
+Alfurese
+Alfuro
+al-Fustat
+Alfy
+Alg
+Alg.
+alg
+alg-
+alg.
+alga
+algae
+algaecide
+algaeological
+algaeologist
+algaeology
+algaesthesia
+algaesthesis
+algal
+algal-algal
+Algalene
+algalia
+Algar
+algarad
+algarde
+algaroba
+algarobas
+algarot
+Algaroth
+algarroba
+algarrobilla
+algarrobin
+Algarsife
+Algarsyf
+Algarve
+algas
+algate
+algates
+Al-Gazel
+algazel
+Algebar
+algebra
+algebraic
+algebraical
+algebraically
+algebraist
+algebraists
+algebraization
+algebraize
+algebraized
+algebraizing
+algebras
+algebrization
+Algeciras
+Algedi
+algedo
+algedonic
+algedonics
+algefacient
+Algenib
+Alger
+Algeria
+algeria
+Algerian
+algerian
+algerians
+algerienne
+Algerine
+algerine
+algerines
+algerita
+algerite
+Algernon
+algesia
+algesic
+algesimeter
+algesiometer
+algesireceptor
+algesis
+algesthesis
+algetic
+Alghero
+-algia
+Algic
+algic
+algicidal
+algicide
+algicides
+algid
+algidities
+algidity
+algidness
+Algie
+Algieba
+Algiers
+algiers
+algific
+algin
+alginate
+alginates
+algine
+alginic
+algins
+alginuresis
+algiomuscular
+algist
+algivorous
+algo-
+algocyan
+algodon
+algodoncillo
+algodonite
+algoesthesiometer
+algogenic
+algoid
+ALGOL
+Algol
+algol
+algolagnia
+algolagnic
+algolagnist
+algolagny
+algological
+algologically
+algologies
+algologist
+algology
+Algoma
+Algoman
+algometer
+algometric
+algometrical
+algometrically
+algometry
+Algomian
+Algomic
+Algona
+Algonac
+Algonkian
+algonkian
+Algonkin
+Algonkins
+Algonquian
+algonquian
+Algonquians
+algonquians
+Algonquin
+algonquin
+Algonquins
+algonquins
+algophagous
+algophilia
+algophilist
+algophobia
+algor
+Algorab
+Algores
+algorism
+algorismic
+algorisms
+algorist
+algoristic
+algorithm
+algorithmic
+algorithmically
+algorithms
+algors
+algosis
+algous
+algovite
+algraphic
+algraphy
+Algren
+alguacil
+alguazil
+alguifou
+Alguire
+algum
+algums
+Algy
+alhacena
+Alhagi
+alhagi
+Alhambra
+alhambra
+Alhambraic
+Alhambresque
+alhambresque
+alhandal
+Alhazen
+Alhena
+alhenna
+alhet
+ALI
+Ali
+ali-
+Alia
+alia
+Aliacensis
+aliamenta
+alias
+aliased
+aliases
+aliasing
+Alibamu
+alibangbang
+Aliber
+alibi
+alibied
+alibies
+alibiing
+alibility
+alibis
+alible
+Alic
+Alica
+Alicant
+alicant
+Alicante
+Alice
+alice
+Alicea
+Alice-in-Wonderland
+Aliceville
+alichel
+Alichino
+Alicia
+Alick
+alicoche
+alictisal
+alicula
+aliculae
+alicyclic
+Alida
+alidad
+alidada
+alidade
+alidades
+alidads
+Alidia
+Alidis
+Alids
+Alidus
+Alie
+Alief
+alien
+alienabilities
+alienability
+alienable
+alienage
+alienages
+alienate
+alienated
+alienates
+alienating
+alienation
+alienations
+alienator
+aliency
+aliene
+aliened
+alienee
+alienees
+aliener
+alieners
+alienicola
+alienicolae
+alienigenate
+aliening
+alienism
+alienisms
+alienist
+alienists
+alienize
+alienly
+alienness
+alienor
+alienors
+aliens
+alienship
+aliesterase
+aliet
+aliethmoid
+aliethmoidal
+alif
+Alifanfaron
+alife
+aliferous
+aliform
+alifs
+Aligarh
+aligerous
+alight
+alighted
+alighten
+alighting
+alightment
+alights
+align
+aligned
+aligner
+aligners
+aligning
+alignment
+alignments
+aligns
+aligreek
+alii
+aliipoe
+Alika
+alike
+Alikee
+alikeness
+alikewise
+Alikuluf
+Alikulufan
+alilonghi
+alima
+alimenation
+aliment
+alimental
+alimentally
+alimentariness
+alimentary
+alimentation
+alimentative
+alimentatively
+alimentativeness
+alimented
+alimenter
+alimentic
+alimenting
+alimentive
+alimentiveness
+alimentotherapy
+aliments
+alimentum
+alimonied
+alimonies
+alimony
+alin
+Alina
+alinasal
+A-line
+Aline
+aline
+alineation
+alined
+alinement
+aliner
+aliners
+alines
+alingual
+alining
+alinit
+Alinna
+alinota
+alinotum
+alintatao
+aliofar
+Alioth
+alioth
+alipata
+aliped
+alipeds
+aliphatic
+alipin
+aliptae
+alipteria
+alipterion
+aliptes
+aliptic
+aliptteria
+aliquant
+aliquid
+Aliquippa
+aliquot
+aliquots
+Alis
+Alisa
+Alisan
+Alisander
+alisanders
+Alisen
+aliseptal
+alish
+Alisha
+Alisia
+alisier
+Al-Iskandariyah
+Alisma
+alisma
+Alismaceae
+alismaceous
+alismad
+alismal
+Alismales
+Alismataceae
+alismoid
+aliso
+Alison
+alison
+alisonite
+alisos
+alisp
+alispheno
+alisphenoid
+alisphenoidal
+Alissa
+alist
+Alistair
+Alister
+Alisun
+ALIT
+alit
+Alita
+Alitalia
+alite
+aliter
+Alitha
+Alithea
+Alithia
+alitrunk
+Alitta
+aliturgic
+aliturgical
+ality
+aliunde
+Alius
+alive
+aliveness
+alives
+alivincular
+Alix
+aliya
+aliyah
+aliyahaliyahs
+aliyahs
+aliyas
+aliyos
+aliyot
+aliyoth
+Aliza
+alizarate
+alizari
+alizarin
+alizarine
+alizarins
+aljama
+aljamado
+aljamia
+aljamiado
+aljamiah
+aljoba
+aljofaina
+alk
+alk.
+Alkabo
+alkahest
+alkahestic
+alkahestica
+alkahestical
+alkahests
+Alkaid
+alkalamide
+alkalemia
+alkalescence
+alkalescency
+alkalescent
+alkali
+alkalic
+alkalies
+alkaliferous
+alkalifiable
+alkalified
+alkalifies
+alkalify
+alkalifying
+alkaligen
+alkaligenous
+alkalimeter
+alkalimetric
+alkalimetrical
+alkalimetrically
+alkalimetry
+alkalin
+alkaline
+alkalinisation
+alkalinise
+alkalinised
+alkalinising
+alkalinities
+alkalinity
+alkalinization
+alkalinize
+alkalinized
+alkalinizes
+alkalinizing
+alkalinuria
+alkalis
+alkalisable
+alkalisation
+alkalise
+alkalised
+alkaliser
+alkalises
+alkalising
+alkalizable
+alkalizate
+alkalization
+alkalize
+alkalized
+alkalizer
+alkalizes
+alkalizing
+alkaloid
+alkaloidal
+alkaloids
+alkalometry
+alkalosis
+alkalous
+Alkalurops
+alkamin
+alkamine
+alkanal
+alkane
+alkanes
+alkanet
+alkanethiol
+alkanets
+Alkanna
+alkanna
+alkannin
+alkanol
+Alkaphrah
+alkapton
+alkaptone
+alkaptonuria
+alkaptonuric
+alkargen
+alkarsin
+alkarsine
+Alka-Seltzer
+alkatively
+alkedavy
+alkekengi
+alkene
+alkenes
+alkenna
+alkenyl
+alkermes
+Alkes
+Alkhimovo
+alkide
+alkies
+alkin
+alkine
+alkines
+alkitran
+Alkmaar
+Alkol
+alkool
+Alkoran
+Alkoranic
+alkoxid
+alkoxide
+alkoxy
+alkoxyl
+alky
+alkyd
+alkyds
+alkyl
+alkylamine
+alkylamino
+alkylarylsulfonate
+alkylate
+alkylated
+alkylates
+alkylating
+alkylation
+alkylbenzenesulfonate
+alkylbenzenesulfonates
+alkylene
+alkylic
+alkylidene
+alkylize
+alkylogen
+alkylol
+alkyloxy
+alkyls
+alkyne
+alkynes
+all
+all-
+Alla
+all-abhorred
+all-able
+all-absorbing
+allabuta
+all-accomplished
+allachesthesia
+all-acting
+allactite
+all-admired
+all-admiring
+all-advised
+allaeanthus
+all-affecting
+all-afflicting
+all-aged
+allagite
+allagophyllous
+allagostemonous
+Allah
+allah
+Allahabad
+Allain
+all-air
+allalinite
+Allamanda
+all-amazed
+All-american
+all-American
+all-american
+allamonti
+all-a-mort
+allamoth
+allamotti
+Allamuchy
+Allan
+allan
+Allana
+Allan-a-Dale
+allanite
+allanites
+allanitic
+Allanson
+allantiasis
+all'antica
+allantochorion
+allantoic
+allantoid
+allantoidal
+Allantoidea
+allantoidean
+allantoides
+allantoidian
+allantoin
+allantoinase
+allantoinuria
+allantois
+allantoxaidin
+allanturic
+all-appaled
+all-appointing
+all-approved
+all-approving
+Allard
+Allardt
+Allare
+allargando
+all-armed
+all-around
+all-arraigning
+all-arranging
+Allasch
+all-assistless
+allassotonic
+al-Lat
+allative
+all-atoning
+allatrate
+all-attempting
+all-availing
+allay
+allayed
+allayer
+allayers
+allaying
+allayment
+Allayne
+allays
+all-bearing
+all-beauteous
+all-beautiful
+Allbee
+all-beholding
+all-bestowing
+all-binding
+all-bitter
+all-black
+all-blasting
+all-blessing
+allbone
+all-bounteous
+all-bountiful
+all-bright
+all-brilliant
+All-british
+All-caucasian
+all-changing
+all-cheering
+all-collected
+all-colored
+all-comfortless
+all-commander
+all-commanding
+all-compelling
+all-complying
+all-composing
+all-comprehending
+all-comprehensive
+all-comprehensiveness
+all-concealing
+all-conceiving
+all-concerning
+all-confounding
+all-conquering
+all-conscious
+all-considering
+all-constant
+all-constraining
+all-consuming
+all-content
+all-controlling
+all-convincing
+all-convincingly
+Allcot
+all-covering
+all-creating
+all-creator
+all-curing
+all-daring
+all-day
+all-dazzling
+all-deciding
+all-defiance
+all-defying
+all-depending
+all-designing
+all-desired
+all-despising
+all-destroyer
+all-destroying
+all-devastating
+all-devouring
+all-dimming
+all-directing
+all-discerning
+all-discovering
+all-disgraced
+all-dispensing
+all-disposer
+all-disposing
+all-divine
+all-divining
+all-dreaded
+all-dreadful
+all-drowsy
+Alle
+all-earnest
+all-eating
+allecret
+allect
+allectory
+Alledonia
+Alleen
+Alleene
+all-efficacious
+all-efficient
+Allegan
+Allegany
+allegata
+allegate
+allegation
+allegations
+allegator
+allegatum
+allege
+allegeable
+alleged
+allegedly
+allegement
+alleger
+allegers
+alleges
+Alleghanian
+Alleghany
+Alleghenian
+Alleghenies
+Allegheny
+allegheny
+allegiance
+allegiances
+allegiancy
+allegiant
+allegiantly
+allegiare
+alleging
+allegoric
+allegorical
+allegorically
+allegoricalness
+allegories
+allegorisation
+allegorise
+allegorised
+allegoriser
+allegorising
+allegorism
+allegorist
+allegorister
+allegoristic
+allegorists
+allegorization
+allegorize
+allegorized
+allegorizer
+allegorizing
+allegory
+Allegra
+Allegre
+allegresse
+allegretto
+allegrettos
+allegro
+allegros
+allele
+alleles
+alleleu
+allelic
+allelism
+allelisms
+allelocatalytic
+allelomorph
+allelomorphic
+allelomorphism
+allelopathy
+all-eloquent
+allelotropic
+allelotropism
+allelotropy
+Alleluia
+alleluia
+alleluiah
+alleluias
+alleluiatic
+alleluja
+allelvia
+Alleman
+allemand
+allemande
+allemandes
+allemands
+all-embracing
+all-embracingness
+allemontite
+Allen
+allen
+allenarly
+Allenby
+all-encompasser
+all-encompassing
+Allendale
+Allende
+all-ending
+Allendorf
+all-enduring
+Allene
+allene
+all-engrossing
+all-engulfing
+Allenhurst
+alleniate
+all-enlightened
+all-enlightening
+Allenport
+all-enraged
+Allensville
+allentando
+allentato
+Allentiac
+Allentiacan
+Allenton
+Allentown
+all-envied
+Allenwood
+Alleppey
+aller
+Alleras
+allergen
+allergenic
+allergenicity
+allergens
+allergia
+allergic
+allergies
+allergin
+allergins
+allergist
+allergists
+allergology
+allergy
+Allerie
+allerion
+Alleris
+aller-retour
+Allerton
+Allerus
+all-essential
+allesthesia
+allethrin
+alleve
+alleviant
+alleviate
+alleviated
+alleviater
+alleviaters
+alleviates
+alleviating
+alleviatingly
+alleviation
+alleviations
+alleviative
+alleviator
+alleviators
+alleviatory
+all-evil
+all-excellent
+all-expense
+all-expenses-paid
+Alley
+alley
+all-eyed
+alleyed
+alleyite
+Alleyn
+Alleyne
+alley-oop
+alleys
+alleyway
+alleyways
+allez
+allez-vous-en
+all-fair
+All-father
+All-fatherhood
+All-fatherly
+all-filling
+all-fired
+all-firedest
+all-firedly
+all-flaming
+all-flotation
+all-flower-water
+all-foreseeing
+all-forgetful
+all-forgetting
+all-forgiving
+all-forgotten
+all-fullness
+all-gas
+all-giver
+all-glorious
+all-golden
+Allgood
+allgood
+all-governing
+allgovite
+all-gracious
+all-grasping
+all-great
+all-guiding
+Allhallow
+all-hallow
+all-hallowed
+Allhallowmas
+Allhallows
+allhallows
+Allhallowtide
+all-happy
+allheal
+all-healing
+allheals
+all-hearing
+all-heeding
+all-helping
+all-hiding
+all-holy
+all-honored
+all-hoping
+all-hurting
+Alli
+alliable
+alliably
+Alliaceae
+alliaceous
+alliage
+Alliance
+alliance
+allianced
+alliancer
+alliances
+alliancing
+Allianora
+alliant
+Alliaria
+Alliber
+allicampane
+allice
+allicholly
+alliciency
+allicient
+allicin
+allicins
+allicit
+all-idolizing
+Allie
+Allied
+allied
+Allier
+Allies
+allies
+alligate
+alligated
+alligating
+alligation
+alligations
+alligator
+alligatored
+alligatorfish
+alligatorfishes
+alligatoring
+alligators
+all-illuminating
+all-imitating
+all-important
+all-impressive
+Allin
+all-in
+Allina
+all-including
+all-inclusive
+all-inclusiveness
+All-india
+allineate
+allineation
+all-infolding
+all-informing
+all-in-one
+all-interesting
+all-interpreting
+all-invading
+all-involving
+Allionia
+Allioniaceae
+Allis
+allis
+Allisan
+allision
+Allison
+Allissa
+Allista
+Allister
+Allistir
+all'italiana
+alliteral
+alliterate
+alliterated
+alliterates
+alliterating
+alliteration
+alliterational
+alliterationist
+alliterations
+alliterative
+alliteratively
+alliterativeness
+alliterator
+allituric
+Allium
+allium
+alliums
+allivalite
+Allix
+all-jarred
+all-judging
+all-just
+all-justifying
+all-kind
+all-knavish
+all-knowing
+all-knowingness
+all-land
+all-lavish
+all-licensed
+all-lovely
+all-loving
+all-maintaining
+all-maker
+all-making
+all-maturing
+all-meaningness
+all-merciful
+all-metal
+all-might
+all-miscreative
+Allmon
+allmouth
+allmouths
+all-murdering
+allness
+all-night
+all-noble
+all-nourishing
+allo
+allo-
+Alloa
+alloantibody
+allobar
+allobaric
+allobars
+all-obedient
+all-obeying
+all-oblivious
+Allobroges
+allobrogical
+all-obscuring
+allocability
+allocable
+allocaffeine
+allocatable
+allocate
+allocated
+allocatee
+allocates
+allocating
+allocation
+allocations
+allocator
+allocators
+allocatur
+allocheiria
+allochetia
+allochetite
+allochezia
+allochiral
+allochirally
+allochiria
+allochlorophyll
+allochroic
+allochroite
+allochromatic
+allochroous
+allochthon
+allochthonous
+allocinnamic
+Allock
+alloclase
+alloclasite
+allocochick
+allocrotonic
+allocryptic
+allocthonous
+allocute
+allocution
+allocutive
+allocyanine
+allod
+allodelphite
+allodesmism
+allodge
+allodia
+allodial
+allodialism
+allodialist
+allodiality
+allodially
+allodian
+allodiaries
+allodiary
+allodies
+allodification
+allodium
+allods
+allody
+alloeosis
+alloeostropha
+alloeotic
+alloerotic
+alloerotism
+allogamies
+allogamous
+allogamy
+allogene
+allogeneic
+allogeneity
+allogeneous
+allogenic
+allogenically
+allograft
+allograph
+allographic
+all-oil
+alloimmune
+alloiogenesis
+alloiometric
+alloiometry
+alloisomer
+alloisomeric
+alloisomerism
+allokinesis
+allokinetic
+allokurtic
+allolalia
+allolalic
+allomerism
+allomerization
+allomerize
+allomerized
+allomerizing
+allomerous
+allometric
+allometry
+allomorph
+allomorphic
+allomorphism
+allomorphite
+allomucic
+allonge
+allonges
+allonomous
+Allons
+allonym
+allonymous
+allonymously
+allonyms
+alloo
+allo-octaploid
+allopalladium
+allopath
+allopathetic
+allopathetically
+allopathic
+allopathically
+allopathies
+allopathist
+allopaths
+allopathy
+allopatric
+allopatrically
+allopatry
+allopelagic
+allophanamid
+allophanamide
+allophanate
+allophanates
+allophane
+allophanic
+allophite
+allophone
+allophones
+allophonic
+allophonically
+allophore
+allophyle
+allophylian
+allophylic
+Allophylus
+allophytoid
+alloplasm
+alloplasmatic
+alloplasmic
+alloplast
+alloplastic
+alloplasty
+alloploidy
+allopolyploid
+allopolyploidy
+allopsychic
+allopurinol
+alloquial
+alloquialism
+alloquy
+all-ordering
+allorhythmia
+all-or-none
+allorrhyhmia
+allorrhythmic
+allosaur
+Allosaurus
+allose
+allosematic
+allosome
+allosteric
+allosterically
+allosyndesis
+allosyndetic
+allot
+alloted
+allotee
+allotelluric
+allotheism
+allotheist
+allotheistic
+Allotheria
+allothigene
+allothigenetic
+allothigenetically
+allothigenic
+allothigenous
+allothimorph
+allothimorphic
+allothogenic
+allothogenous
+allotment
+allotments
+allotransplant
+allotransplantation
+allotriodontia
+Allotriognathi
+allotriomorphic
+allotriophagia
+allotriophagy
+allotriuria
+allotrope
+allotropes
+allotrophic
+allotropic
+allotropical
+allotropically
+allotropicity
+allotropies
+allotropism
+allotropize
+allotropous
+allotropy
+allotrylic
+allots
+allottable
+all'ottava
+allotted
+allottee
+allottees
+allotter
+allotters
+allottery
+allotting
+allotype
+allotypes
+allotypic
+allotypical
+allotypically
+allotypies
+allotypy
+Allouez
+all-out
+all-over
+allover
+all-overish
+all-overishness
+all-overpowering
+all-overs
+allovers
+all-overtopping
+allow
+allowable
+allowableness
+allowably
+allowance
+allowanced
+allowances
+allowancing
+Alloway
+allowed
+allowedly
+allower
+allowing
+allows
+alloxan
+alloxanate
+alloxanic
+alloxans
+alloxantin
+alloxuraemia
+alloxuremia
+alloxuric
+alloxy
+alloxyproteic
+alloy
+alloyage
+alloyed
+alloying
+alloys
+allozooid
+all-panting
+all-parent
+all-pass
+all-patient
+all-peaceful
+all-penetrating
+all-peopled
+all-perceptive
+all-perfect
+all-perfection
+all-perfectness
+all-perficient
+all-persuasive
+all-pervading
+all-pervadingness
+all-pervasive
+all-pervasiveness
+all-piercing
+all-pitiless
+all-pitying
+all-pondering
+Allport
+all-possessed
+all-potency
+all-potent
+all-potential
+all-power
+all-powerful
+all-powerfully
+all-powerfulness
+all-praised
+all-praiseworthy
+all-presence
+all-present
+all-prevailing
+all-prevailingness
+all-prevalency
+all-prevalent
+all-preventing
+all-prolific
+all-protecting
+all-provident
+all-providing
+all-puissant
+all-pure
+all-purpose
+all-quickening
+all-rail
+all-rapacious
+all-reaching
+Allred
+all-red
+all-redeeming
+all-relieving
+all-rending
+all-righteous
+all-round
+allround
+all-roundedness
+all-rounder
+all-rubber
+Allrud
+all-ruling
+All-russia
+All-russian
+alls
+all-sacred
+all-sanctifying
+all-satiating
+all-satisfying
+all-saving
+all-sayer
+all-sea
+all-searching
+allseed
+allseeds
+all-seeing
+all-seeingly
+all-seeingness
+all-seer
+all-shaking
+all-shamed
+all-shaped
+all-shrouding
+all-shunned
+all-sided
+all-silent
+all-sized
+all-sliming
+all-soothing
+Allsopp
+all-sorts
+all-soul
+All-southern
+allspice
+allspices
+all-spreading
+all-star
+all-stars
+Allstate
+all-steel
+Allston
+all-strangling
+all-subduing
+all-submissive
+all-substantial
+all-sufficiency
+all-sufficient
+all-sufficiently
+all-sufficing
+Allsun
+all-surpassing
+all-surrounding
+all-surveying
+all-sustainer
+all-sustaining
+all-swallowing
+all-swaying
+all-telling
+all-terrible
+allthing
+allthorn
+all-thorny
+all-time
+all-tolerating
+all-transcending
+all-triumphing
+all-truth
+alltud
+all-turned
+all-turning
+allude
+alluded
+alludes
+alluding
+allumette
+allumine
+alluminor
+all-understanding
+all-unwilling
+all-upholder
+all-upholding
+allurance
+allure
+allured
+allurement
+allurements
+allurer
+allurers
+allures
+alluring
+alluringly
+alluringness
+allusion
+allusions
+allusive
+allusively
+allusiveness
+allusivenesses
+allusory
+allutterly
+alluvia
+alluvial
+alluvials
+alluviate
+alluviation
+alluvio
+alluvion
+alluvions
+alluvious
+alluvium
+alluviums
+alluvivia
+alluviviums
+Allvar
+all-various
+all-vast
+Allveta
+all-watched
+all-water
+all-weak
+all-weather
+all-weight
+Allwein
+allwhere
+allwhither
+all-whole
+all-wisdom
+all-wise
+all-wisely
+all-wiseness
+all-wondrous
+all-wood
+all-wool
+allwork
+all-working
+all-worshiped
+Allworthy
+all-worthy
+all-wrongness
+Allx
+-ally
+Ally
+ally
+Allyce
+all-year
+allyic
+allying
+allyl
+allylamine
+allylate
+allylation
+allylene
+allylic
+allyls
+allylthiourea
+Allyn
+Allyne
+allyou
+Allys
+Allyson
+ALM
+Alma
+alma
+Alma-Ata
+almacantar
+almacen
+almacenista
+Almach
+almaciga
+almacigo
+Almad
+Almada
+Almaden
+almadia
+almadie
+Almagest
+almagest
+almagests
+almagra
+almah
+almahs
+Almain
+almain
+almaine
+almain-rivets
+Almallah
+alma-materism
+al-Mamoun
+Alman
+almanac
+almanacs
+almander
+almandine
+almandines
+almandite
+almanner
+Almanon
+almas
+Alma-Tadema
+alme
+Almeda
+Almeeta
+almeh
+almehs
+Almeida
+almeidina
+Almelo
+almemar
+almemars
+almemor
+Almena
+almendro
+almendron
+Almera
+Almeria
+Almerian
+Almeric
+almeries
+almeriite
+almery
+almes
+Almeta
+almice
+almicore
+Almida
+almight
+almightily
+almightiness
+Almighty
+almighty
+almique
+Almira
+almirah
+Almire
+almistry
+Almita
+almner
+almners
+Almo
+almochoden
+almocrebe
+almogavar
+Almohad
+almohad
+Almohade
+Almohades
+almoign
+almoin
+Almon
+almon
+almonage
+Almond
+almond
+almond-eyed
+almond-furnace
+almond-leaved
+almondlike
+almonds
+almond-shaped
+almondy
+almoner
+almoners
+almonership
+almoning
+almonries
+almonry
+Almont
+Almoravid
+Almoravide
+Almoravides
+almose
+almost
+almous
+alms
+alms-dealing
+almsdeed
+alms-fed
+almsfolk
+almsful
+almsgiver
+almsgiving
+alms-house
+almshouse
+almshouses
+almsman
+almsmen
+almsmoney
+almswoman
+almswomen
+almucantar
+almuce
+almuces
+almud
+almude
+almudes
+almuds
+almuerzo
+almug
+almugs
+Almund
+Almuredin
+almury
+almuten
+Almyra
+aln
+Alna
+alnage
+alnager
+alnagership
+Alnaschar
+Alnascharism
+alnath
+alnein
+Alnico
+alnico
+alnicoes
+Alnilam
+alniresinol
+Alnitak
+Alnitham
+alniviridol
+alnoite
+alnuin
+Alnus
+alnus
+Alo
+alo
+Aloadae
+Alocasia
+alocasia
+alochia
+alod
+aloddia
+Alodee
+Alodi
+alodia
+alodial
+alodialism
+alodialist
+alodiality
+alodially
+alodialty
+alodian
+alodiaries
+alodiary
+Alodie
+alodies
+alodification
+alodium
+alody
+aloe
+aloed
+aloedary
+aloe-emodin
+aloelike
+aloemodin
+aloeroot
+aloes
+aloesol
+aloeswood
+aloetic
+aloetical
+Aloeus
+aloewood
+aloft
+Alogi
+alogia
+Alogian
+alogian
+alogical
+alogically
+alogism
+alogotrophy
+alogy
+Aloha
+aloha
+alohas
+aloid
+Aloidae
+Aloin
+aloin
+aloins
+Alois
+Aloise
+Aloisia
+aloisiite
+Aloisius
+Aloke
+aloma
+alomancy
+Alon
+alone
+alonely
+aloneness
+along
+alongships
+alongshore
+alongshoreman
+alongside
+alongst
+Alonso
+Alonsoa
+Alonzo
+aloof
+aloofe
+aloofly
+aloofness
+aloose
+alop
+alopathic
+Alope
+alopecia
+Alopecias
+alopecias
+alopecic
+alopecist
+alopecoid
+Alopecurus
+Alopecus
+alopekai
+alopeke
+alophas
+Alopias
+Alopiidae
+alorcinic
+Alorton
+Alosa
+alose
+Alost
+Alouatta
+alouatte
+aloud
+Alouette
+alouette
+alouettes
+alout
+alow
+alowe
+Aloxe-Corton
+Aloxite
+aloyau
+Aloys
+Aloysia
+aloysia
+Aloysius
+A.L.P.
+ALP
+alp
+alpaca
+alpacas
+alpargata
+alpasotes
+Alpaugh
+Alpax
+alpax
+alpeen
+Alpen
+alpen
+Alpena
+alpenglow
+alpenhorn
+alpenhorns
+alpenstock
+alpenstocker
+alpenstocks
+Alper
+Alpers
+Alpert
+Alpes-de-Haute-Provence
+Alpes-Maritimes
+alpestral
+alpestrian
+alpestrine
+Alpetragius
+Alpha
+alpha
+alpha-amylase
+alphabet
+alphabetarian
+alphabetary
+alphabeted
+alphabetic
+alphabetical
+alphabetically
+alphabetics
+alphabetiform
+alphabeting
+alphabetisation
+alphabetise
+alphabetised
+alphabetiser
+alphabetising
+alphabetism
+alphabetist
+alphabetization
+alphabetize
+alphabetized
+alphabetizer
+alphabetizers
+alphabetizes
+alphabetizing
+alphabetology
+alphabets
+alpha-cellulose
+Alphaea
+alpha-eucaine
+alpha-hypophamine
+alphameric
+alphamerical
+alphamerically
+alpha-naphthol
+alpha-naphthylamine
+alpha-naphthylthiourea
+alphanumeric
+alphanumerical
+alphanumerically
+alphanumerics
+Alphard
+Alpharetta
+alphas
+alpha-tocopherol
+alphatoluic
+alpha-truxilline
+Alphatype
+Alphean
+Alphecca
+alphenic
+Alpheratz
+Alphesiboea
+Alpheus
+alpheus
+alphin
+alphitomancy
+alphitomorphous
+alphol
+Alphonist
+Alphons
+Alphonsa
+Alphonse
+alphonsin
+Alphonsine
+alphonsine
+Alphonsism
+Alphonso
+Alphonsus
+alphorn
+alphorns
+alphos
+alphosis
+alphosises
+alphyl
+alphyls
+alphyn
+Alpian
+Alpid
+alpieu
+alpigene
+Alpine
+alpine
+alpinely
+alpinery
+alpines
+alpinesque
+Alpinia
+alpinia
+Alpiniaceae
+Alpinism
+alpinism
+alpinisms
+Alpinist
+alpinist
+alpinists
+alpist
+alpiste
+ALPO
+Alpoca
+Alps
+alps
+Alpujarra
+alqueire
+alquier
+alquifou
+alraun
+alreadiness
+already
+Alric
+Alrich
+Alrick
+alright
+alrighty
+Alroi
+alroot
+Alroy
+ALRU
+alruna
+alrune
+AlrZc
+ALS
+als
+Alsace
+Alsace-Lorraine
+Alsace-lorrainer
+al-Sahih
+Alsatia
+alsatia
+Alsatian
+alsatian
+alsbachite
+Alsea
+Alsen
+Alsey
+Alshain
+alsifilm
+alsike
+alsikes
+Alsinaceae
+alsinaceous
+Alsine
+Alsip
+alsmekill
+Also
+also
+Alson
+alsoon
+Alsop
+Alsophila
+also-ran
+Alstead
+Alston
+Alstonia
+alstonidine
+alstonine
+alstonite
+Alstroemeria
+alsweill
+alswith
+Alsworth
+alt
+alt.
+Alta
+Alta.
+Altadena
+Altaf
+Altai
+Altaian
+altaian
+Altaic
+altaic
+Altaid
+Altair
+altair
+altaite
+Altaloma
+altaltissimo
+Altamahaw
+Altamira
+Altamont
+altar
+altarage
+altared
+altarist
+altarlet
+altarpiece
+altarpieces
+altars
+altarwise
+Altavista
+Altay
+altazimuth
+Altdorf
+Altdorfer
+Alten
+Altenburg
+alter
+alterability
+alterable
+alterableness
+alterably
+alterant
+alterants
+alterate
+alteration
+alterations
+alterative
+alteratively
+altercate
+altercated
+altercating
+altercation
+altercations
+altercative
+altered
+alteregoism
+alteregoistic
+alterer
+alterers
+altering
+alterity
+alterius
+alterman
+altern
+alternacy
+alternamente
+alternance
+alternant
+Alternanthera
+Alternaria
+alternariose
+alternat
+alternate
+alternated
+alternate-leaved
+alternately
+alternateness
+alternater
+alternates
+alternating
+alternatingly
+alternation
+alternationist
+alternations
+alternative
+alternatively
+alternativeness
+alternatives
+alternativity
+alternativo
+alternator
+alternators
+alterne
+alterni-
+alternifoliate
+alternipetalous
+alternipinnate
+alternisepalous
+alternity
+alternize
+alterocentric
+alters
+alterum
+Altes
+altesse
+alteza
+altezza
+Altgeld
+Altha
+Althaea
+althaea
+althaeas
+althaein
+Althaemenes
+Althea
+althea
+altheas
+Althee
+Altheimer
+althein
+altheine
+Altheta
+Althing
+althing
+althionic
+altho
+althorn
+althorns
+although
+alti-
+Altica
+Alticamelus
+altify
+altigraph
+altilik
+altiloquence
+altiloquent
+altimeter
+altimeters
+altimetrical
+altimetrically
+altimetry
+altimettrically
+altin
+altincar
+Altingiaceae
+altingiaceous
+altininck
+altiplanicie
+Altiplano
+altiplano
+alti-rilievi
+Altis
+altiscope
+altisonant
+altisonous
+altissimo
+altitonant
+altitude
+altitudes
+altitudinal
+altitudinarian
+altitudinous
+Altman
+Altmar
+alto
+alto-
+alto-cumulus
+altocumulus
+alto-cumulus-castellatus
+altogether
+altogetherness
+altoist
+altoists
+altometer
+Alton
+Altona
+Altoona
+alto-relievo
+alto-relievos
+alto-rilievo
+altos
+alto-stratus
+altostratus
+altoun
+altrices
+altricial
+Altrincham
+Altro
+altropathy
+altrose
+altruism
+altruisms
+altruist
+altruistic
+altruistically
+altruists
+alts
+altschin
+altumal
+altun
+Altura
+Alturas
+alture
+Altus
+altus
+ALU
+Aluco
+Aluconidae
+Aluconinae
+aludel
+aludels
+Aludra
+Aluin
+Aluino
+alula
+alulae
+alular
+alulet
+Alulim
+alum
+alum.
+Alumbank
+alumbloom
+alumbrado
+Alumel
+alumen
+alumetize
+alumian
+alumic
+alumiferous
+alumin
+alumina
+aluminaphone
+aluminas
+aluminate
+alumine
+alumines
+aluminic
+aluminide
+aluminiferous
+aluminiform
+aluminio-
+aluminise
+aluminised
+aluminish
+aluminising
+aluminite
+aluminium
+aluminize
+aluminized
+aluminizes
+aluminizing
+alumino-
+aluminoferric
+aluminographic
+aluminography
+aluminose
+aluminosilicate
+aluminosis
+aluminosity
+aluminothermic
+aluminothermics
+aluminothermy
+aluminotype
+aluminous
+alumins
+aluminum
+aluminums
+aluminyl
+alumish
+alumite
+alumium
+alumna
+alumnae
+alumnal
+alumni
+alumniate
+Alumnol
+alumnus
+alumohydrocalcite
+alumroot
+alumroots
+alums
+alumstone
+alun-alun
+Alundum
+alundum
+aluniferous
+alunite
+alunites
+alunogen
+alupag
+Alur
+Alurd
+alure
+alurgite
+Alurta
+alushtite
+aluta
+alutaceous
+al-Uzza
+Alva
+Alvada
+Alvadore
+Alvah
+Alvan
+Alvar
+alvar
+Alvarado
+Alvarez
+Alvaro
+Alvaton
+alvearies
+alvearium
+alveary
+alveated
+alvelos
+alveloz
+alveola
+alveolae
+alveolar
+alveolariform
+alveolarly
+alveolars
+alveolary
+alveolate
+alveolated
+alveolation
+alveole
+alveolectomy
+alveoli
+alveoliform
+alveolite
+Alveolites
+alveolitis
+alveolo-
+alveoloclasia
+alveolocondylean
+alveolodental
+alveololabial
+alveololingual
+alveolonasal
+alveolosubnasal
+alveolotomy
+alveolus
+Alver
+Alvera
+Alverda
+Alverson
+Alverta
+Alverton
+Alves
+Alveta
+alveus
+alvia
+Alviani
+alviducous
+Alvie
+Alvin
+Alvina
+alvine
+Alvinia
+Alvino
+Alvira
+Alvis
+Alviso
+Alviss
+Alvissmal
+Alvita
+alvite
+Alvito
+Alvo
+Alvord
+Alvordton
+alvus
+Alvy
+alw
+alway
+always
+Alwin
+alwise
+alwite
+Alwitt
+Alwyn
+aly
+Alya
+Alyattes
+Alyce
+alycompaine
+Alyda
+Alydar
+Alyeska
+alymphia
+alymphopotent
+Alyose
+Alyosha
+alypin
+alypine
+alypum
+Alys
+Alysa
+Alyse
+Alysia
+Alyson
+Alysoun
+Alyss
+Alyssa
+alysson
+Alyssum
+alyssum
+alyssums
+alytarch
+Alytes
+Alyworth
+Alzada
+alzheimer
+A&M
+A.M.
+AM
+Am
+Am.
+a.m.
+am
+A.M.A.
+AMA
+Ama
+ama
+amaas
+Amabel
+Amabella
+Amabelle
+Amabil
+amabile
+amability
+amable
+amacratic
+amacrinal
+amacrine
+AMACS
+amadan
+Amadas
+amadavat
+amadavats
+amadelphous
+Amadeo
+Amadeus
+Amadi
+Amadis
+Amado
+Amador
+amadou
+amadous
+Amadus
+Amaethon
+Amafingo
+amaga
+Amagansett
+Amagasaki
+Amagon
+amah
+amahs
+Amahuaca
+Amaigbo
+amain
+amaine
+amaist
+amaister
+amakebe
+Amakosa
+Amal
+amal
+amala
+amalaita
+amalaka
+Amalbena
+Amalberga
+Amalbergas
+Amalburga
+Amalea
+Amalee
+Amalek
+Amalekite
+amalekite
+Amaleta
+amalett
+Amalfian
+Amalfitan
+amalg
+amalgam
+amalgamable
+amalgamate
+amalgamated
+amalgamater
+amalgamates
+amalgamating
+amalgamation
+amalgamationist
+amalgamations
+amalgamative
+amalgamatize
+amalgamator
+amalgamators
+amalgamist
+amalgamization
+amalgamize
+amalgams
+Amalia
+amalic
+Amalie
+Amalings
+Amalita
+Amalle
+Amalrician
+amaltas
+Amalthaea
+Amalthea
+Amaltheia
+amamau
+Amampondo
+Aman
+Amana
+Amand
+Amanda
+amande
+Amandi
+Amandie
+amandin
+amandine
+Amando
+Amandus
+Amandy
+amang
+amani
+amania
+Amanist
+Amanita
+amanita
+amanitas
+amanitin
+amanitine
+amanitins
+Amanitopsis
+Amann
+amanori
+amanous
+amant
+amantadine
+amante
+amantillo
+amanuenses
+amanuensis
+Amap
+Amapa
+amapa
+Amapondo
+Amar
+amar
+Amara
+amaracus
+Amara-kosha
+Amaral
+Amarant
+amarant
+Amarantaceae
+amarantaceous
+amaranth
+Amaranthaceae
+amaranthaceous
+amaranthine
+amaranthoid
+amaranth-purple
+amaranths
+Amaranthus
+amarantine
+amarantite
+Amarantus
+Amaras
+AMARC
+amarelle
+amarelles
+Amarette
+amaretto
+amarettos
+amarevole
+Amargo
+amargosa
+amargoso
+amargosos
+Amari
+Amarillas
+Amarillis
+Amarillo
+amarillo
+amarillos
+amarin
+amarine
+Amaris
+amaritude
+amarity
+Amarna
+amarna
+amaroid
+amaroidal
+amarthritis
+amarvel
+Amary
+Amaryl
+amaryllid
+Amaryllidaceae
+amaryllidaceous
+amaryllideous
+Amaryllis
+amaryllis
+amaryllises
+Amarynceus
+amas
+Amasa
+AMASE
+amasesis
+Amasias
+amass
+amassable
+amassed
+amasser
+amassers
+amasses
+amassette
+amassing
+amassment
+amassments
+Amasta
+amasthenic
+amastia
+amasty
+AMAT
+Amata
+amate
+amated
+Amatembu
+Amaterasu
+amaterialistic
+amateur
+amateurish
+amateurishly
+amateurishness
+amateurism
+amateurisms
+amateurs
+amateurship
+Amathi
+Amathist
+Amathiste
+amathophobia
+Amati
+amati
+amating
+amatito
+amative
+amatively
+amativeness
+Amato
+amatol
+amatols
+amatorial
+amatorially
+amatorian
+amatories
+amatorio
+amatorious
+amatory
+AMATPS
+amatrice
+Amatruda
+Amatsumara
+amatungula
+Amaty
+amaurosis
+amaurotic
+amaut
+Amawalk
+amaxomania
+amay
+Amaya
+amaze
+amazed
+amazedly
+amazedness
+amazeful
+amazement
+amazements
+amazer
+amazers
+amazes
+amazia
+Amaziah
+Amazilia
+amazing
+amazingly
+Amazon
+amazon
+Amazona
+Amazonas
+Amazonia
+Amazonian
+amazonian
+Amazonis
+Amazonism
+amazonite
+Amazonomachia
+amazons
+amazonstone
+Amazulu
+Amb
+amb
+AMBA
+amba
+ambach
+ambage
+ambages
+ambagiosity
+ambagious
+ambagiously
+ambagiousness
+ambagitory
+Ambala
+ambalam
+amban
+ambar
+ambaree
+ambarella
+ambari
+ambaries
+ambaris
+ambary
+ambas
+ambash
+ambassade
+Ambassadeur
+ambassador
+ambassador-at-large
+ambassadorial
+ambassadorially
+ambassadors
+ambassadors-at-large
+ambassadorship
+ambassadorships
+ambassadress
+ambassage
+ambassiate
+ambassy
+ambatch
+ambatoarinite
+ambay
+ambe
+Ambedkar
+ambeer
+ambeers
+Amber
+amber
+amber-clear
+amber-colored
+amber-days
+amber-dropping
+amberfish
+amberfishes
+Amberg
+ambergrease
+ambergris
+ambergrises
+amber-headed
+amber-hued
+amberies
+amberiferous
+amberina
+amberite
+amberjack
+amberjacks
+Amberley
+amberlike
+amber-locked
+Amberly
+amberoid
+amberoids
+amberous
+ambers
+Amberson
+Ambert
+amber-tinted
+amber-tipped
+amber-weeping
+amber-white
+ambery
+amber-yielding
+ambi-
+Ambia
+ambiance
+ambiances
+ambicolorate
+ambicoloration
+ambidexter
+ambidexterities
+ambidexterity
+ambidexterous
+ambidextral
+ambidextrous
+ambidextrously
+ambidextrousness
+Ambie
+ambience
+ambiences
+ambiency
+ambiens
+ambient
+ambients
+ambier
+ambigenal
+ambigenous
+ambigu
+ambiguities
+ambiguity
+ambiguous
+ambiguously
+ambiguousness
+ambilaevous
+ambil-anak
+ambilateral
+ambilateralaterally
+ambilaterality
+ambilaterally
+ambilevous
+ambilian
+ambilogy
+ambiopia
+ambiparous
+ambisextrous
+ambisexual
+ambisexualities
+ambisexuality
+ambisinister
+ambisinistrous
+ambisporangiate
+ambisyllabic
+ambit
+ambital
+ambitendencies
+ambitendency
+ambitendent
+ambition
+ambitioned
+ambitioning
+ambitionist
+ambitionless
+ambitionlessly
+ambitions
+ambitious
+ambitiously
+ambitiousness
+ambits
+ambitty
+ambitus
+ambivalence
+ambivalences
+ambivalency
+ambivalent
+ambivalently
+ambiversion
+ambiversive
+ambivert
+ambiverts
+Amble
+amble
+ambled
+ambleocarpus
+Ambler
+ambler
+amblers
+ambles
+ambling
+amblingly
+amblosis
+amblotic
+amblyacousia
+amblyaphia
+Amblycephalidae
+Amblycephalus
+amblychromatic
+Amblydactyla
+amblygeusia
+amblygon
+amblygonal
+amblygonite
+amblyocarpous
+Amblyomma
+amblyope
+amblyopia
+amblyopic
+Amblyopsidae
+Amblyopsis
+amblyoscope
+amblypod
+Amblypoda
+amblypodous
+Amblyrhynchus
+amblystegite
+Amblystoma
+ambo
+amboceptoid
+amboceptor
+Ambocoelia
+ambodexter
+Amboina
+amboina
+amboinas
+Amboinese
+Amboise
+ambolic
+ambomalleal
+Ambon
+ambon
+ambones
+ambonite
+Ambonnay
+ambos
+ambosexous
+ambosexual
+Amboy
+amboyna
+amboynas
+ambracan
+ambrain
+ambreate
+ambreic
+ambrein
+ambrette
+ambrettolide
+Ambrica
+ambries
+ambrite
+Ambrogino
+Ambrogio
+ambroid
+ambroids
+Ambroise
+ambrology
+Ambros
+Ambrosane
+Ambrose
+ambrose
+Ambrosi
+Ambrosia
+ambrosia
+ambrosiac
+Ambrosiaceae
+ambrosiaceous
+ambrosial
+ambrosially
+Ambrosian
+ambrosian
+ambrosias
+ambrosiate
+ambrosin
+Ambrosine
+ambrosine
+Ambrosio
+Ambrosius
+ambrosterol
+ambrotype
+ambry
+ambs-ace
+ambsace
+ambsaces
+ambulacra
+ambulacral
+ambulacriform
+ambulacrum
+ambulance
+ambulanced
+ambulancer
+ambulances
+ambulancing
+ambulant
+ambulante
+ambulantes
+ambulate
+ambulated
+ambulates
+ambulating
+ambulatio
+ambulation
+ambulative
+ambulator
+Ambulatoria
+ambulatoria
+ambulatorial
+ambulatories
+ambulatorily
+ambulatorium
+ambulatoriums
+ambulators
+ambulatory
+ambulia
+ambuling
+ambulomancy
+Ambur
+amburbial
+Amburgey
+ambury
+ambuscade
+ambuscaded
+ambuscader
+ambuscades
+ambuscading
+ambuscado
+ambuscadoed
+ambuscados
+ambush
+ambushed
+ambusher
+ambushers
+ambushes
+ambushing
+ambushlike
+ambushment
+ambustion
+Amby
+Ambystoma
+Ambystomidae
+AMC
+Amchitka
+amchoor
+AMD
+amdahl
+A.M.D.G.
+AMDG
+amdt
+AME
+Ame
+ame
+Ameagle
+ameba
+amebae
+ameban
+amebas
+amebean
+amebian
+amebiasis
+amebic
+amebicidal
+amebicide
+amebid
+amebiform
+amebobacter
+amebocyte
+ameboid
+ameboidism
+amebous
+amebula
+Amedeo
+AMEDS
+ameed
+ameen
+ameer
+ameerate
+ameerates
+ameers
+ameiosis
+ameiotic
+Ameiuridae
+Ameiurus
+Ameiva
+Ameizoeira
+amel
+Amelanchier
+amelanchier
+ameland
+amelcorn
+amelcorns
+amelet
+Amelia
+amelia
+Amelie
+amelification
+Amelina
+Ameline
+ameliorable
+ameliorableness
+ameliorant
+ameliorate
+ameliorated
+ameliorates
+ameliorating
+amelioration
+ameliorations
+ameliorativ
+ameliorative
+amelioratively
+ameliorator
+amelioratory
+Amelita
+amellus
+ameloblast
+ameloblastic
+amelu
+amelus
+Amen
+amen
+Amena
+amenability
+amenable
+amenableness
+amenably
+amenage
+amenance
+Amend
+amend
+amendable
+amendableness
+amendatory
+amende
+amended
+amende-honorable
+amender
+amenders
+amending
+amendment
+amendments
+amends
+amene
+Amenia
+amenia
+Amenism
+Amenite
+amenities
+amenity
+amenorrhea
+amenorrheal
+amenorrheic
+amenorrho
+amenorrhoea
+amenorrhoeal
+amenorrhoeic
+Amen-Ra
+Amen-ra
+amens
+ament
+amenta
+amentaceous
+amental
+Amenti
+amentia
+amentias
+Amentiferae
+amentiferous
+amentiform
+aments
+amentula
+amentulum
+amentum
+amenty
+amenuse
+Amer
+Amer.
+Amerada
+amerce
+amerceable
+amerced
+amercement
+amercements
+amercer
+amercers
+amerces
+amerciable
+amerciament
+amercing
+America
+america
+American
+american
+Americana
+americana
+Americanese
+Americanisation
+Americanise
+Americanised
+Americaniser
+Americanising
+Americanism
+americanism
+americanisms
+Americanist
+americanist
+Americanistic
+Americanitis
+Americanization
+americanization
+Americanize
+americanize
+Americanized
+americanized
+Americanizer
+americanizes
+Americanizing
+americanizing
+Americanly
+Americano
+Americano-european
+Americanoid
+Americanos
+americans
+americanum
+americanumancestors
+americas
+Americaward
+Americawards
+americium
+americo-
+Americomania
+Americophobe
+Americus
+Amerigo
+Amerika
+amerikani
+Amerimnon
+AmerInd
+Amerind
+amerind
+Amerindian
+amerindian
+amerindians
+Amerindic
+amerinds
+amerism
+ameristic
+AMERITECH
+Amero
+Amersfoort
+Amersham
+AmerSp
+amerveil
+Amery
+Ames
+ames-ace
+amesace
+amesaces
+Amesbury
+amesite
+Ameslan
+amess
+Amesville
+Ametabola
+ametabola
+ametabole
+ametabolia
+ametabolian
+ametabolic
+ametabolism
+ametabolous
+ametaboly
+ametallous
+Amethi
+Amethist
+amethodical
+amethodically
+Amethyst
+amethyst
+amethystine
+amethystlike
+amethysts
+ametoecious
+ametria
+ametrometer
+ametrope
+ametropia
+ametropic
+ametrous
+AMEX
+Amex
+amex
+Amfortas
+amgarn
+amhar
+Amhara
+Amharic
+amharic
+Amherst
+Amherstdale
+amherstite
+amhran
+AMI
+Ami
+ami
+Amia
+amia
+amiabilities
+amiability
+amiable
+amiableness
+amiably
+amiant
+amianth
+amianthiform
+amianthine
+Amianthium
+amianthoid
+amianthoidal
+amianthus
+amiantus
+amiantuses
+Amias
+amias
+amic
+amicabilities
+amicability
+amicable
+amicableness
+amicably
+amical
+AMICE
+Amice
+amice
+amiced
+amices
+AMIChemE
+amici
+amicicide
+Amick
+amicous
+amicrobic
+amicron
+amicronucleate
+amictus
+amicus
+amid
+amid-
+Amida
+Amidah
+amidase
+amidases
+amidate
+amidated
+amidating
+amidation
+amide
+amides
+amidic
+amidid
+amidide
+amidin
+amidine
+amidines
+amidins
+Amidism
+Amidist
+amidmost
+amido
+amido-
+amidoacetal
+amidoacetic
+amidoacetophenone
+amidoaldehyde
+amidoazo
+amidoazobenzene
+amidoazobenzol
+amidocaffeine
+amidocapric
+amidocyanogen
+amidofluorid
+amidofluoride
+amidogen
+amidogens
+amidoguaiacol
+amidohexose
+amidoketone
+Amidol
+amidol
+amidols
+amidomyelin
+Amidon
+amidon
+amidone
+amidones
+amidophenol
+amidophosphoric
+amidoplast
+amidoplastid
+amidopyrine
+amidosuccinamic
+amidosulphonal
+amidothiazole
+amido-urea
+amidoxime
+amidoxy
+amidoxyl
+amidrazone
+amids
+amidship
+amidships
+amidst
+amidstream
+amidulin
+amidward
+Amie
+amie
+Amiel
+Amiens
+amies
+Amieva
+amiga
+amigas
+Amigen
+amigo
+amigos
+Amii
+Amiidae
+Amil
+amil
+Amilcare
+amildar
+Amiles
+Amiloun
+AMIMechE
+amimia
+amimide
+Amin
+amin
+amin-
+aminase
+aminate
+aminated
+aminating
+amination
+aminded
+-amine
+amine
+amines
+amini
+aminic
+aminish
+aminities
+aminity
+aminization
+aminize
+amino
+amino-
+aminoacetal
+aminoacetanilide
+aminoacetic
+aminoacetone
+aminoacetophenetidine
+aminoacetophenone
+aminoacidemia
+aminoaciduria
+aminoanthraquinone
+aminoazo
+aminoazobenzene
+aminobarbituric
+aminobenzaldehyde
+aminobenzamide
+aminobenzene
+aminobenzine
+aminobenzoic
+aminocaproic
+aminodiphenyl
+aminoethionic
+aminoformic
+aminogen
+aminoglutaric
+aminoguanidine
+aminoid
+aminoketone
+aminolipin
+aminolysis
+aminolytic
+aminomalonic
+aminomyelin
+amino-oxypurin
+aminopeptidase
+aminophenol
+aminopherase
+aminophylline
+aminoplast
+aminoplastic
+aminopolypeptidase
+aminopropionic
+aminopurine
+aminopyrine
+aminoquin
+aminoquinoline
+aminosis
+aminosuccinamic
+aminosulphonic
+aminothiophen
+aminotransferase
+aminotriazole
+aminovaleric
+aminoxylol
+amins
+Aminta
+Amintor
+Amintore
+Amioidei
+Amir
+amir
+amiral
+Amiranha
+amirate
+amirates
+amiray
+amire
+Amiret
+amirs
+amirship
+Amis
+amis
+Amish
+amish
+Amishgo
+amiss
+amissibility
+amissible
+amissing
+amission
+amissness
+Amissville
+Amistad
+amit
+Amita
+Amitabha
+amitate
+Amite
+Amitie
+amitie
+amities
+amitoses
+amitosis
+amitotic
+amitotically
+amitriptyline
+amitrole
+amitroles
+Amittai
+amitular
+Amity
+amity
+Amityville
+amixia
+Amizilis
+amla
+amlacra
+amlet
+amli
+amlikar
+Amlin
+Amling
+amlong
+AMLS
+Amma
+amma
+Ammadas
+Ammadis
+Ammamaria
+Amman
+amman
+Ammanati
+Ammanite
+Ammann
+ammelide
+ammelin
+ammeline
+ammeos
+ammer
+Ammerman
+ammeter
+ammeters
+Ammi
+ammi
+Ammiaceae
+ammiaceous
+Ammianus
+AmMIEE
+ammine
+ammines
+ammino
+amminochloride
+amminolysis
+amminolytic
+ammiolite
+ammiral
+Ammisaddai
+Ammishaddai
+ammites
+ammo
+ammo-
+Ammobium
+ammobium
+ammocete
+ammocetes
+ammochaeta
+ammochaetae
+ammochryse
+ammocoete
+ammocoetes
+ammocoetid
+Ammocoetidae
+ammocoetiform
+ammocoetoid
+ammodyte
+Ammodytes
+Ammodytidae
+ammodytoid
+Ammon
+ammonal
+ammonals
+ammonate
+ammonation
+Ammonea
+ammonia
+ammoniac
+ammoniacal
+ammoniaco-
+ammoniacs
+ammoniacum
+ammoniaemia
+ammonias
+ammoniate
+ammoniated
+ammoniating
+ammoniation
+ammonic
+ammonical
+ammoniemia
+ammonification
+ammonified
+ammonifier
+ammonifies
+ammonify
+ammonifying
+ammonio-
+ammoniojarosite
+ammonion
+ammonionitrate
+Ammonite
+ammonite
+Ammonites
+ammonites
+Ammonitess
+ammonitic
+ammoniticone
+ammonitiferous
+Ammonitish
+ammonitoid
+Ammonitoidea
+ammonium
+ammoniums
+ammoniuret
+ammoniureted
+ammoniuria
+ammonization
+ammono
+ammonobasic
+ammonocarbonic
+ammonocarbonous
+ammonoid
+Ammonoidea
+ammonoidean
+ammonoids
+ammonolitic
+ammonolyses
+ammonolysis
+ammonolytic
+ammonolyze
+ammonolyzed
+ammonolyzing
+Ammophila
+ammophilous
+ammoresinol
+ammoreslinol
+ammos
+ammotherapy
+ammu
+ammunition
+ammunitions
+amnemonic
+amnesia
+amnesiac
+amnesiacs
+amnesias
+amnesic
+amnesics
+amnestic
+amnestied
+amnesties
+amnesty
+amnestying
+amnia
+amniac
+amniatic
+amnic
+Amnigenia
+amninia
+amninions
+amnioallantoic
+amniocentesis
+amniochorial
+amnioclepsis
+amniomancy
+amnion
+Amnionata
+amnionate
+amnionia
+amnionic
+amnions
+amniorrhea
+amnios
+Amniota
+amniota
+amniote
+amniotes
+amniotic
+amniotin
+amniotitis
+amniotome
+amn't
+Amo
+Amoakuh
+amobarbital
+amober
+amobyr
+Amoco
+amoeba
+amoebae
+Amoebaea
+amoebaea
+amoebaean
+amoebaeum
+amoebalike
+amoeban
+amoebas
+amoebean
+amoebeum
+amoebian
+amoebiasis
+amoebic
+amoebicidal
+amoebicide
+amoebid
+Amoebida
+Amoebidae
+amoebiform
+Amoebobacter
+Amoebobacterieae
+amoebocyte
+Amoebogeniae
+amoeboid
+amoeboidism
+amoebous
+amoebula
+amoibite
+amoinder
+amok
+amoke
+amoks
+amole
+amoles
+amolilla
+amolish
+amollish
+amomal
+Amomales
+Amomis
+amomum
+Amon
+Amonate
+among
+amongst
+Amon-Ra
+amontillado
+amontillados
+Amopaon
+Amor
+amor
+Amora
+amora
+amorado
+amoraic
+amoraim
+amoral
+amoralism
+amoralist
+amorality
+amoralize
+amorally
+AMORC
+Amores
+Amoret
+amoret
+Amoreta
+Amorete
+Amorette
+Amoretti
+amoretti
+amoretto
+amorettos
+Amoreuxia
+Amorgos
+amorini
+amorino
+amorism
+amorist
+amoristic
+amorists
+Amorita
+Amorite
+amorite
+Amoritic
+Amoritish
+Amoritta
+amornings
+amorosa
+amorosity
+amoroso
+amorous
+amorously
+amorousness
+amorousnesses
+amorph
+Amorpha
+amorpha
+amorphi
+amorphia
+amorphic
+amorphinism
+amorphism
+amorpho-
+Amorphophallus
+amorphophyte
+amorphotae
+amorphous
+amorphously
+amorphousness
+amorphozoa
+amorphus
+amorphy
+a-morrow
+amort
+amortisable
+amortise
+amortised
+amortises
+amortising
+amortissement
+amortisseur
+amortizable
+amortization
+amortizations
+amortize
+amortized
+amortizement
+amortizes
+amortizing
+Amorua
+Amory
+Amos
+amos
+amosite
+Amoskeag
+amotion
+amotions
+amotus
+Amou
+amouli
+amount
+amounted
+amounter
+amounters
+amounting
+amounts
+amour
+amouret
+amourette
+amourist
+amour-propre
+amours
+amovability
+amovable
+amove
+amoved
+amoving
+amowt
+Amoy
+Amoyan
+Amoyese
+AMP
+Amp
+amp
+amp.
+ampalaya
+ampalea
+ampangabeite
+amparo
+AMPAS
+ampasimenite
+ampassy
+Ampelidaceae
+ampelidaceous
+Ampelidae
+ampelideous
+Ampelis
+ampelite
+ampelitic
+ampelographist
+ampelography
+ampelograpny
+ampelopsidin
+ampelopsin
+Ampelopsis
+ampelopsis
+Ampelos
+Ampelosicyos
+ampelotherapy
+amper
+amperage
+amperages
+Ampere
+ampere
+ampere-foot
+ampere-hour
+amperemeter
+ampere-minute
+amperes
+ampere-second
+ampere-turn
+Amperian
+amperometer
+amperometric
+ampersand
+ampersands
+ampery
+Ampex
+amphanthia
+amphanthium
+ampheclexis
+ampherotokous
+ampherotoky
+amphetamine
+amphetamines
+amphi
+amphi-
+Amphiaraus
+amphiarthrodial
+amphiarthroses
+amphiarthrosis
+amphiaster
+amphib
+amphibali
+amphibalus
+Amphibia
+amphibia
+amphibial
+amphibian
+amphibians
+amphibichnite
+amphibiety
+amphibiological
+amphibiology
+amphibion
+amphibiontic
+amphibiotic
+Amphibiotica
+amphibious
+amphibiously
+amphibiousness
+amphibium
+amphiblastic
+amphiblastula
+amphiblestritis
+Amphibola
+amphibole
+amphiboles
+amphibolia
+amphibolic
+amphibolies
+amphiboliferous
+amphiboline
+amphibolite
+amphibolitic
+amphibological
+amphibologically
+amphibologies
+amphibologism
+amphibology
+amphibolostylous
+amphibolous
+amphiboly
+amphibrach
+amphibrachic
+amphibryous
+Amphicarpa
+Amphicarpaea
+amphicarpia
+amphicarpic
+amphicarpium
+amphicarpogenous
+amphicarpous
+amphicarpus
+amphicentric
+amphichroic
+amphichrom
+amphichromatic
+amphichrome
+amphichromy
+amphicoelian
+amphicoelous
+amphicome
+Amphicondyla
+amphicondylous
+amphicrania
+amphicreatinine
+amphicribral
+Amphictyon
+amphictyon
+amphictyonian
+amphictyonic
+amphictyonies
+amphictyons
+amphictyony
+Amphicyon
+Amphicyonidae
+amphicyrtic
+amphicyrtous
+amphicytula
+amphid
+Amphidamas
+amphide
+amphidesmous
+amphidetic
+amphidiarthrosis
+amphidiploid
+amphidiploidy
+amphidisc
+Amphidiscophora
+amphidiscophoran
+amphidisk
+amphidromia
+amphidromic
+amphierotic
+amphierotism
+Amphigaea
+amphigaean
+amphigam
+Amphigamae
+amphigamous
+amphigastria
+amphigastrium
+amphigastrula
+amphigean
+amphigen
+amphigene
+amphigenesis
+amphigenetic
+amphigenous
+amphigenously
+amphigonia
+amphigonic
+amphigonium
+amphigonous
+amphigony
+amphigoric
+amphigories
+amphigory
+amphigouri
+amphigouris
+amphikaryon
+amphikaryotic
+Amphilochus
+amphilogism
+amphilogy
+amphimacer
+Amphimachus
+Amphimarus
+amphimictic
+amphimictical
+amphimictically
+amphimixes
+amphimixis
+amphimorula
+amphimorulae
+Amphinesian
+Amphineura
+amphineurous
+Amphinome
+Amphinomus
+amphinucleus
+Amphion
+amphion
+Amphionic
+Amphioxi
+amphioxi
+Amphioxidae
+Amphioxides
+Amphioxididae
+amphioxis
+amphioxus
+amphioxuses
+amphipeptone
+amphiphithyra
+amphiphloic
+amphiplatyan
+Amphipleura
+amphiploid
+amphiploidy
+amphipneust
+Amphipneusta
+amphipneustic
+Amphipnous
+amphipod
+Amphipoda
+amphipoda
+amphipodal
+amphipodan
+amphipodiform
+amphipodous
+amphipods
+amphiprostylar
+amphiprostyle
+amphiprotic
+amphipyrenin
+Amphirhina
+amphirhinal
+amphirhine
+amphisarca
+amphisbaena
+amphisbaenae
+amphisbaenas
+amphisbaenian
+amphisbaenic
+amphisbaenid
+Amphisbaenidae
+amphisbaenoid
+amphisbaenous
+amphiscians
+amphiscii
+Amphisile
+Amphisilidae
+amphispermous
+amphisporangiate
+amphispore
+Amphissa
+Amphissus
+Amphistoma
+amphistomatic
+amphistome
+amphistomoid
+amphistomous
+Amphistomum
+amphistylar
+amphistylic
+amphistyly
+amphitene
+amphithalami
+amphithalamus
+amphithalmi
+amphitheater
+amphitheatered
+amphitheaters
+amphitheatral
+amphitheatre
+amphitheatric
+amphitheatrical
+amphitheatrically
+amphitheccia
+amphithecia
+amphithecial
+amphithecium
+amphithect
+Amphithemis
+amphithere
+amphithura
+amphithuron
+amphithurons
+amphithurthura
+amphithyra
+amphithyron
+amphithyrons
+amphitokal
+amphitokous
+amphitoky
+amphitriaene
+amphitricha
+amphitrichate
+amphitrichous
+Amphitrite
+amphitrite
+amphitron
+amphitropal
+amphitropous
+Amphitruo
+Amphitryon
+amphitryon
+Amphiuma
+amphiuma
+Amphiumidae
+Amphius
+amphivasal
+amphivorous
+Amphizoidae
+amphodarch
+amphodelite
+amphodiplopia
+amphogenic
+amphogenous
+amphogeny
+ampholyte
+ampholytic
+amphopeptone
+amphophil
+amphophile
+amphophilic
+amphophilous
+amphora
+amphorae
+amphoral
+amphoras
+amphore
+amphorette
+amphoric
+amphoricity
+amphoriloquy
+amphoriskoi
+amphoriskos
+amphorophony
+amphorous
+amphoteric
+amphotericin
+Amphoterus
+Amphrysian
+ampicillin
+ampitheater
+ample
+amplect
+amplectant
+ampleness
+ampler
+amplest
+amplex
+amplexation
+amplexicaudate
+amplexicaul
+amplexicauline
+amplexifoliate
+amplexus
+amplexuses
+ampliate
+ampliation
+ampliative
+amplication
+amplicative
+amplidyne
+amplifiable
+amplificate
+amplification
+amplifications
+amplificative
+amplificator
+amplificatory
+amplified
+amplifier
+amplifiers
+amplifies
+amplify
+amplifying
+amplitude
+amplitudes
+amplitudinous
+amply
+ampollosity
+ampongue
+ampoule
+ampoules
+AMPS
+amps
+ampul
+ampulate
+ampulated
+ampulating
+ampule
+ampules
+ampulla
+ampullaceous
+ampullae
+ampullar
+Ampullaria
+Ampullariidae
+ampullary
+ampullate
+ampullated
+ampulliform
+ampullitis
+ampullosity
+ampullula
+ampullulae
+ampuls
+ampus-and
+amputate
+amputated
+amputates
+amputating
+amputation
+amputational
+amputations
+amputative
+amputator
+amputee
+amputees
+ampyces
+Ampycides
+Ampycus
+Ampyx
+ampyx
+ampyxes
+Amr
+amra
+AMRAAM
+Amram
+Amratian
+Amravati
+amreeta
+amreetas
+amrelle
+Amri
+amrit
+Amrita
+amrita
+amritas
+Amritsar
+Amroati
+AMROC
+AMS
+AMSAT
+amsath
+Amschel
+Amsden
+amsel
+Amsha-spand
+Amsha-spend
+Amsonia
+amsonia
+Amsterdam
+amsterdam
+Amsterdamer
+Amston
+AMSW
+AMT
+amt
+amt.
+amtman
+amtmen
+Amtorg
+amtrac
+amtrack
+amtracks
+amtracs
+Amtrak
+amtrak
+AMU
+amu
+Amuchco
+amuck
+amucks
+Amueixa
+amugis
+amuguis
+amula
+amulae
+amulas
+amulet
+amuletic
+amulets
+Amulius
+amulla
+amunam
+Amund
+Amundsen
+Amur
+amurca
+amurcosity
+amurcous
+Amurru
+amus
+amusable
+amuse
+amused
+amusedly
+amusee
+amusement
+amusements
+amuser
+amusers
+amuses
+amusette
+Amusgo
+amusia
+amusias
+amusing
+amusingly
+amusingness
+amusive
+amusively
+amusiveness
+amutter
+amuyon
+amuyong
+amuze
+amuzzle
+AMVET
+amvis
+Amvrakikos
+Amy
+amy
+Amyas
+amyatonic
+Amyclaean
+Amyclas
+amyctic
+Amycus
+amydon
+Amye
+amyelencephalia
+amyelencephalic
+amyelencephalous
+amyelia
+amyelic
+amyelinic
+amyelonic
+amyelotrophy
+amyelous
+amygdal
+amygdala
+Amygdalaceae
+amygdalaceous
+amygdalae
+amygdalase
+amygdalate
+amygdale
+amygdalectomy
+amygdales
+amygdalic
+amygdaliferous
+amygdaliform
+amygdalin
+amygdaline
+amygdalinic
+amygdalitis
+amygdaloid
+amygdaloidal
+amygdalolith
+amygdaloncus
+amygdalopathy
+amygdalothripsis
+amygdalotome
+amygdalotomy
+amygdalo-uvular
+Amygdalus
+amygdonitrile
+amygdophenin
+amygdule
+amygdules
+amyl
+amyl-
+amylaceous
+amylamine
+amylan
+amylase
+amylases
+amylate
+amylemia
+amylene
+amylenes
+amylenol
+amylic
+amylidene
+amyliferous
+amylin
+amylo
+amylo-
+amylocellulose
+amyloclastic
+amylocoagulase
+amylodextrin
+amylodyspepsia
+amylogen
+amylogenesis
+amylogenic
+amylogens
+amylohydrolysis
+amylohydrolytic
+amyloid
+amyloidal
+amyloidoses
+amyloidosis
+amyloids
+amyloleucite
+amylolysis
+amylolytic
+amylom
+amylome
+amylometer
+amylon
+amylopectin
+amylophagia
+amylophosphate
+amylophosphoric
+amyloplast
+amyloplastic
+amyloplastid
+amylopsase
+amylopsin
+amylose
+amyloses
+amylosis
+amylosynthesis
+amyls
+amylum
+amylums
+amyluria
+Amymone
+Amynodon
+amynodont
+Amyntor
+amyosthenia
+amyosthenic
+amyotaxia
+amyotonia
+amyotrophia
+amyotrophic
+amyotrophy
+amyous
+Amyraldism
+Amyraldist
+Amyridaceae
+amyrin
+Amyris
+amyris
+amyrol
+amyroot
+Amytal
+Amythaon
+amyxorrhea
+amyxorrhoea
+amzel
+-an
+A.N.
+AN
+An
+an
+an-
+an.
+-ana
+ANA
+Ana
+an'a
+ana
+ana-
+Anabaena
+anabaena
+anabaenas
+Anabal
+anabantid
+Anabantidae
+Anabaptism
+anabaptism
+Anabaptist
+anabaptist
+Anabaptistic
+Anabaptistical
+Anabaptistically
+Anabaptistry
+anabaptists
+anabaptize
+anabaptized
+anabaptizing
+Anabas
+anabas
+Anabase
+anabases
+anabasin
+anabasine
+anabasis
+anabasse
+anabata
+anabathmoi
+anabathmos
+anabathrum
+anabatic
+Anabel
+Anabella
+Anabelle
+anaberoga
+anabia
+anabibazon
+anabiosis
+anabiotic
+Anablepidae
+Anableps
+anableps
+anablepses
+anabo
+anabohitsite
+anabolic
+anabolin
+anabolism
+anabolite
+anabolitic
+anabolize
+anaboly
+anabong
+anabranch
+anabrosis
+anabrotic
+ANAC
+anacahuita
+anacahuite
+anacalypsis
+anacampsis
+anacamptic
+anacamptically
+anacamptics
+anacamptometer
+anacanth
+anacanthine
+Anacanthini
+anacanthous
+anacara
+anacard
+Anacardiaceae
+anacardiaceous
+anacardic
+Anacardium
+anacatadidymus
+anacatharsis
+anacathartic
+anacephalaeosis
+anacephalize
+Anaces
+Anacharis
+anacharis
+anachoret
+anachorism
+anachromasis
+anachronic
+anachronical
+anachronically
+anachronism
+anachronismatical
+anachronisms
+anachronist
+anachronistic
+anachronistical
+anachronistically
+anachronize
+anachronous
+anachronously
+anachueta
+anacid
+anacidity
+Anacin
+anack
+anaclasis
+anaclastic
+anaclastics
+Anaclete
+anaclete
+anacletica
+anacleticum
+Anacletus
+anaclinal
+anaclisis
+anaclitic
+Anacoco
+anacoenoses
+anacoenosis
+anacolutha
+anacoluthia
+anacoluthic
+anacoluthically
+anacoluthon
+anacoluthons
+anacoluttha
+Anaconda
+anaconda
+anacondas
+Anacortes
+Anacostia
+anacoustic
+Anacreon
+Anacreontic
+anacreontic
+Anacreontically
+anacrisis
+Anacrogynae
+anacrogynae
+anacrogynous
+anacromyodian
+anacrotic
+anacrotism
+anacruses
+anacrusis
+anacrustic
+anacrustically
+anaculture
+anacusia
+anacusic
+anacusis
+Anacyclus
+Anadarko
+anadem
+anadems
+anadenia
+anadesm
+anadicrotic
+anadicrotism
+anadidymus
+anadiplosis
+anadipsia
+anadipsic
+anadrom
+anadromous
+Anadyomene
+Anadyr
+anaematosis
+anaemia
+anaemias
+anaemic
+anaemotropy
+anaeretic
+anaerobation
+anaerobe
+anaerobes
+anaerobia
+anaerobian
+anaerobic
+anaerobically
+anaerobies
+anaerobion
+anaerobiont
+anaerobiosis
+anaerobiotic
+anaerobiotically
+anaerobious
+anaerobism
+anaerobium
+anaerophyte
+anaeroplastic
+anaeroplasty
+anaesthatic
+anaesthesia
+anaesthesiant
+anaesthesiologist
+anaesthesiology
+anaesthesis
+anaesthetic
+anaesthetically
+anaesthetics
+anaesthetist
+anaesthetization
+anaesthetize
+anaesthetized
+anaesthetizer
+anaesthetizing
+anaesthyl
+anaetiological
+anagalactic
+Anagallis
+anagap
+anagenesis
+anagenetic
+anagenetical
+anagennesis
+anagep
+anagignoskomena
+anaglyph
+anaglyphic
+anaglyphical
+anaglyphics
+anaglyphoscope
+anaglyphs
+anaglyphy
+anaglypta
+anaglyptic
+anaglyptical
+anaglyptics
+anaglyptograph
+anaglyptographic
+anaglyptography
+anaglypton
+Anagni
+anagnorises
+anagnorisis
+Anagnos
+anagnost
+anagnostes
+anagoge
+anagoges
+anagogic
+anagogical
+anagogically
+anagogics
+anagogies
+anagogy
+anagram
+anagrammatic
+anagrammatical
+anagrammatically
+anagrammatise
+anagrammatised
+anagrammatising
+anagrammatism
+anagrammatist
+anagrammatization
+anagrammatize
+anagrammatized
+anagrammatizing
+anagrammed
+anagramming
+anagrams
+anagraph
+anagua
+anagyrin
+anagyrine
+Anagyris
+anahao
+anahau
+Anaheim
+anaheim
+Anahita
+Anahola
+Anahuac
+Anaitis
+Anakes
+Anakim
+anakinesis
+anakinetic
+anakinetomer
+anakinetomeric
+anakoluthia
+anakrousis
+anaktoron
+anal
+anal.
+analabos
+analagous
+analav
+analcime
+analcimes
+analcimic
+analcimite
+analcite
+analcites
+analcitite
+analecta
+analectic
+analects
+analemma
+analemmas
+analemmata
+analemmatic
+analepses
+analepsis
+analepsy
+analeptic
+analeptical
+analgen
+analgene
+analgesia
+analgesic
+analgesics
+Analgesidae
+analgesis
+analgesist
+analgetic
+analgia
+analgias
+analgic
+analgize
+Analiese
+Analise
+analities
+anality
+analkalinity
+anallagmatic
+anallagmatis
+anallantoic
+Anallantoidea
+anallantoidean
+anallergic
+Anallese
+Anallise
+anally
+analog
+analoga
+analogal
+analogia
+analogic
+analogical
+analogically
+analogicalness
+analogice
+analogies
+analogion
+analogions
+analogise
+analogised
+analogising
+analogism
+analogist
+analogistic
+analogize
+analogized
+analogizing
+analogon
+analogous
+analogously
+analogousness
+analogs
+analogue
+analogues
+analogy
+Analomink
+analphabet
+analphabete
+analphabetic
+analphabetical
+analphabetism
+analysability
+analysable
+analysand
+analysands
+analysation
+analyse
+analysed
+analyser
+analysers
+analyses
+analysing
+analysis
+analyst
+analysts
+analyt
+analytic
+analytical
+analytically
+analyticities
+analyticity
+analytico-architectural
+analytics
+analytique
+analyzability
+analyzable
+analyzation
+analyze
+analyzed
+analyzer
+analyzers
+analyzes
+analyzing
+Anam
+anam
+anama
+Anambra
+Anamelech
+anamesite
+anametadromous
+Anamirta
+anamirtin
+Anamite
+anamite
+Anammelech
+anammonid
+anammonide
+anamneses
+Anamnesis
+anamnesis
+anamnestic
+anamnestically
+Anamnia
+Anamniata
+Anamnionata
+anamnionic
+Anamniota
+anamniote
+anamniotic
+Anamoose
+anamorphic
+anamorphism
+anamorphoscope
+anamorphose
+anamorphoses
+anamorphosis
+anamorphote
+anamorphous
+Anamosa
+anan
+Anana
+anana
+ananaplas
+ananaples
+ananas
+Anand
+Ananda
+ananda
+anandrarious
+anandria
+anandrious
+anandrous
+ananepionic
+anangioid
+anangular
+Ananias
+ananias
+Ananism
+Ananite
+anankastic
+ananke
+anankes
+Ananna
+Anansi
+Ananta
+ananter
+anantherate
+anantherous
+ananthous
+ananthropism
+ananym
+anapaest
+anapaestic
+anapaestical
+anapaestically
+anapaests
+anapaganize
+anapaite
+anapanapa
+anapeiratic
+anapes
+anapest
+anapestic
+anapestically
+anapests
+anaphalantiasis
+Anaphalis
+anaphase
+anaphases
+anaphasic
+Anaphe
+anaphia
+anaphora
+anaphoral
+anaphoras
+anaphoria
+anaphoric
+anaphorical
+anaphorically
+anaphrodisia
+anaphrodisiac
+anaphroditic
+anaphroditous
+anaphylactic
+anaphylactically
+anaphylactin
+anaphylactogen
+anaphylactogenic
+anaphylactoid
+anaphylatoxin
+anaphylaxis
+anaphyte
+anaplasia
+anaplasis
+anaplasm
+Anaplasma
+anaplasmoses
+anaplasmosis
+anaplastic
+anaplasty
+anapleroses
+anaplerosis
+anaplerotic
+anapnea
+anapneic
+anapnoeic
+anapnograph
+anapnoic
+anapnometer
+anapodeictic
+Anapolis
+anapophyses
+anapophysial
+anapophysis
+anapsid
+Anapsida
+anapsidan
+Anapterygota
+anapterygote
+anapterygotism
+anapterygotous
+Anaptomorphidae
+Anaptomorphus
+anaptotic
+anaptychi
+anaptychus
+anaptyctic
+anaptyctical
+anaptyxes
+anaptyxis
+Anapurna
+anaqua
+anarcestean
+Anarcestes
+anarch
+anarchal
+anarchial
+anarchic
+anarchical
+anarchically
+anarchies
+anarchism
+anarchisms
+anarchist
+anarchistic
+anarchists
+anarchize
+anarcho
+anarchoindividualist
+anarchosocialist
+anarcho-syndicalism
+anarchosyndicalism
+anarcho-syndicalist
+anarchosyndicalist
+anarchs
+anarchy
+anarcotin
+anareta
+anaretic
+anaretical
+anargyroi
+anargyros
+anarithia
+anarithmia
+anarthria
+anarthric
+anarthropod
+Anarthropoda
+anarthropodous
+anarthrosis
+anarthrous
+anarthrously
+anarthrousness
+anartismos
+anarya
+Anaryan
+Anas
+anas
+Anasa
+anasarca
+anasarcas
+anasarcous
+Anasazi
+Anasazis
+anaschistic
+Anasco
+anaseismic
+Anasitch
+anaspadias
+anaspalin
+anaspid
+Anaspida
+Anaspidacea
+Anaspides
+anastalsis
+anastaltic
+Anastas
+Anastase
+anastases
+Anastasia
+Anastasian
+Anastasie
+anastasimon
+anastasimos
+Anastasio
+anastasis
+Anastasius
+Anastassia
+anastate
+anastatic
+Anastatica
+Anastatius
+Anastatus
+Anastice
+anastigmat
+anastigmatic
+anastomos
+anastomose
+anastomosed
+anastomoses
+anastomosing
+anastomosis
+anastomotic
+Anastomus
+Anastos
+anastrophe
+Anastrophia
+anastrophy
+Anat
+anat
+anat.
+anatabine
+anatase
+anatases
+anatexes
+anatexis
+anathem
+anathema
+anathemas
+anathemata
+anathematic
+anathematical
+anathematically
+anathematisation
+anathematise
+anathematised
+anathematiser
+anathematising
+anathematism
+anathematization
+anathematize
+anathematized
+anathematizer
+anathematizes
+anathematizing
+anatheme
+anathemize
+Anatherum
+Anatidae
+anatifa
+Anatifae
+anatifae
+anatifer
+anatiferous
+Anatinacea
+Anatinae
+anatine
+anatira
+anatman
+anatocism
+Anatol
+Anatola
+Anatole
+Anatolia
+Anatolian
+anatolian
+Anatolic
+Anatolio
+Anatollo
+anatomic
+anatomical
+anatomically
+anatomicals
+anatomico-
+anatomicobiological
+anatomicochirurgical
+anatomicomedical
+anatomicopathologic
+anatomicopathological
+anatomicophysiologic
+anatomicophysiological
+anatomicosurgical
+anatomies
+anatomiless
+anatomisable
+anatomisation
+anatomise
+anatomised
+anatomiser
+anatomising
+anatomism
+anatomist
+anatomists
+anatomizable
+anatomization
+anatomize
+anatomized
+anatomizer
+anatomizes
+anatomizing
+anatomopathologic
+anatomopathological
+anatomy
+Anatone
+anatopism
+anatosaurus
+anatox
+anatoxin
+anatoxins
+anatreptic
+anatripsis
+anatripsology
+anatriptic
+anatron
+anatropal
+anatropia
+anatropous
+anatta
+anatto
+anattos
+Anatum
+anaudia
+anaudic
+anaunter
+anaunters
+anauxite
+Anawalt
+Anax
+Anaxagoras
+Anaxagorean
+anaxagorean
+Anaxagorize
+anaxagorize
+Anaxarete
+anaxial
+Anaxibia
+Anaximander
+Anaximandrian
+anaximandrian
+Anaximenes
+Anaxo
+anaxon
+anaxone
+Anaxonia
+anay
+anazoturia
+anba
+anbury
+ANC
+anc
+Ancaeus
+Ancalin
+-ance
+Ancel
+Ancelin
+Anceline
+Ancell
+Ancerata
+ancestor
+ancestorial
+ancestorially
+ancestors
+ancestral
+ancestrally
+ancestress
+ancestresses
+ancestrial
+ancestrian
+ancestries
+ancestry
+Ancha
+Anchat
+Anchesmius
+Anchiale
+Anchie
+Anchietea
+anchietin
+anchietine
+anchieutectic
+anchimonomineral
+Anchinoe
+Anchisaurus
+Anchises
+anchises
+Anchistea
+Anchistopoda
+anchithere
+anchitherioid
+anchoic
+Anchong-Ni
+anchor
+anchorable
+Anchorage
+anchorage
+anchorages
+anchorate
+anchored
+anchorer
+anchoress
+anchoresses
+anchoret
+anchoretic
+anchoretical
+anchoretish
+anchoretism
+anchorets
+anchorhold
+anchoring
+anchorite
+anchorites
+anchoritess
+anchoritic
+anchoritical
+anchoritically
+anchoritish
+anchoritism
+anchorless
+anchorlike
+anchorman
+anchormen
+anchors
+anchor-shaped
+Anchorville
+anchorwise
+anchory
+anchoveta
+anchovies
+anchovy
+Anchtherium
+Anchusa
+anchusa
+anchusas
+anchusin
+anchusine
+anchusins
+anchylose
+anchylosed
+anchylosing
+anchylosis
+anchylotic
+ancien
+ancience
+anciency
+anciennete
+anciens
+ancient
+ancienter
+ancientest
+ancientism
+anciently
+ancientness
+ancientry
+ancients
+ancienty
+Ancier
+ancile
+ancilia
+Ancilin
+ancilla
+ancillae
+ancillaries
+ancillary
+ancillas
+ancille
+ancipital
+ancipitous
+Ancistrocladaceae
+ancistrocladaceous
+Ancistrocladus
+ancistrodon
+ancistroid
+Ancius
+ancle
+Anco
+ancodont
+Ancohuma
+ancoly
+ancome
+Ancon
+ancon
+Ancona
+ancona
+anconad
+anconagra
+anconal
+anconas
+ancone
+anconeal
+anconei
+anconeous
+ancones
+anconeus
+anconitis
+anconoid
+ancony
+ancor
+ancora
+ancoral
+Ancram
+Ancramdale
+ancraophobia
+ancre
+ancress
+ancresses
+-ancy
+Ancyloceras
+Ancylocladus
+Ancylodactyla
+ancylopod
+Ancylopoda
+ancylose
+Ancylostoma
+ancylostome
+ancylostomiasis
+Ancylostomum
+Ancylus
+Ancyrean
+Ancyrene
+ancyroid
+-and
+And
+and
+and-
+anda
+anda-assu
+andabata
+andabatarian
+andabatism
+Andale
+Andalusia
+Andalusian
+andalusite
+Andaman
+Andamanese
+andamenta
+andamento
+andamentos
+andante
+andantes
+andantini
+andantino
+andantinos
+Andaqui
+Andaquian
+Andarko
+Andaste
+Ande
+Andean
+andean
+anded
+Andee
+Andeee
+Andel
+Andelee
+Ander
+Anderea
+Anderegg
+Anderer
+Anderlecht
+Anders
+anders
+Andersen
+Anderson
+anderson
+Andersonville
+Anderssen
+Anderstorp
+Andert
+anderun
+Andes
+andes
+Andesic
+andesine
+andesinite
+andesite
+andesites
+andesitic
+andesyte
+andesytes
+Andevo
+ANDF
+Andhra
+Andi
+andia
+Andian
+Andie
+Andikithira
+Andine
+anding
+Andira
+andirin
+andirine
+andiroba
+andiron
+andirons
+Andizhan
+Ando
+Andoche
+Andoke
+Andonis
+and/or
+andor
+andorite
+andoroba
+Andorobo
+Andorra
+andorra
+Andorran
+Andorre
+andouille
+andouillet
+andouillette
+Andover
+Andr
+andr-
+Andra
+Andrade
+andradite
+andragogy
+andranatomy
+andrarchy
+Andras
+Andrassy
+Andre
+andre
+Andrea
+Andreaea
+Andreaeaceae
+Andreaeales
+Andreana
+Andreas
+Andree
+Andrei
+Andrej
+Andrel
+Andrena
+andrena
+andrenid
+Andrenidae
+Andreotti
+Andres
+Andrew
+andrew
+andrewartha
+Andrewes
+Andrews
+andrewsite
+Andrey
+Andreyev
+Andreyevka
+Andri
+Andria
+Andriana
+Andrias
+Andric
+andric
+Andrien
+Andriette
+Andrija
+Andris
+andrite
+andro-
+androcentric
+androcephalous
+androcephalum
+androclclinia
+Androclea
+Androcles
+androcles
+androclinia
+androclinium
+Androclus
+androclus
+androconia
+androconium
+androcracy
+Androcrates
+androcratic
+androcyte
+androdioecious
+androdioecism
+androdynamous
+androeccia
+androecia
+androecial
+androecium
+androgametangium
+androgametophore
+androgamone
+androgen
+androgenesis
+androgenetic
+androgenic
+androgenous
+androgens
+Androgeus
+androginous
+androgone
+androgonia
+androgonial
+androgonidium
+androgonium
+Andrographis
+andrographolide
+androgyn
+androgynal
+androgynary
+androgyne
+androgyneity
+androgynia
+androgynic
+androgynies
+androgynism
+androgynous
+androgynus
+androgyny
+android
+androidal
+androides
+androids
+androkinin
+androl
+androlepsia
+androlepsy
+Andromache
+andromache
+Andromada
+andromania
+Andromaque
+andromed
+Andromeda
+andromeda
+Andromede
+andromedotoxin
+andromonoecious
+andromonoecism
+andromorphous
+Andron
+andron
+Andronicus
+andronitis
+andropetalar
+andropetalous
+androphagous
+androphobia
+androphonomania
+Androphonos
+androphore
+androphorous
+androphorum
+androphyll
+Andropogon
+Andros
+Androsace
+Androscoggin
+androseme
+androsin
+androsphinges
+androsphinx
+androsphinxes
+androsporangium
+androspore
+androsterone
+androtauric
+androtomy
+Androuet
+-androus
+Androw
+Andrsy
+Andrus
+-andry
+Andryc
+ands
+Andvar
+Andvare
+Andvari
+andvari
+Andy
+Andy-over
+-ane
+ane
+Aneale
+anear
+aneared
+anearing
+anears
+aneath
+anecdota
+anecdotage
+anecdotal
+anecdotalism
+anecdotalist
+anecdotally
+anecdote
+anecdotes
+anecdotic
+anecdotical
+anecdotically
+anecdotist
+anecdotists
+anecdysis
+anechoic
+anelace
+anelastic
+anelasticity
+anele
+anelectric
+anelectrode
+anelectrotonic
+anelectrotonus
+aneled
+aneles
+aneling
+anelytrous
+anem-
+anematize
+anematized
+anematizing
+anematosis
+Anemia
+anemia
+anemias
+anemic
+anemically
+anemious
+anemo-
+anemobiagraph
+anemochord
+anemochore
+anemochoric
+anemochorous
+anemoclastic
+anemogram
+anemograph
+anemographic
+anemographically
+anemography
+anemologic
+anemological
+anemology
+anemometer
+anemometers
+anemometric
+anemometrical
+anemometrically
+anemometrograph
+anemometrographic
+anemometrographically
+anemometry
+anemonal
+anemone
+Anemonella
+anemones
+anemonin
+anemonol
+anemony
+anemopathy
+anemophile
+anemophilous
+anemophily
+Anemopsis
+anemoscope
+anemoses
+anemosis
+anemotactic
+anemotaxis
+Anemotis
+anemotropic
+anemotropism
+anencephalia
+anencephalic
+anencephalotrophia
+anencephalous
+anencephalus
+anencephaly
+an-end
+anend
+anenergia
+anenst
+anent
+anenterous
+anepia
+anepigraphic
+anepigraphous
+anepiploic
+anepithymia
+anerethisia
+aneretic
+anergia
+anergias
+anergic
+anergies
+anergy
+anerly
+aneroid
+aneroidograph
+aneroids
+anerotic
+anerythroplasia
+anerythroplastic
+anes
+Anesidora
+anesis
+anesone
+Anestassia
+anesthesia
+anesthesiant
+anesthesias
+anesthesimeter
+anesthesiologies
+anesthesiologist
+anesthesiologists
+anesthesiology
+anesthesiometer
+anesthesis
+anesthetic
+anesthetically
+anesthetics
+anesthetist
+anesthetists
+anesthetization
+anesthetize
+anesthetized
+anesthetizer
+anesthetizes
+anesthetizing
+anesthyl
+anestri
+anestrous
+anestrus
+Anet
+anet
+Aneta
+Aneth
+anethene
+anethol
+anethole
+anetholes
+anethols
+Anethum
+anetic
+anetiological
+Aneto
+Anett
+Anetta
+Anette
+aneuch
+aneuploid
+aneuploidy
+aneuria
+aneuric
+aneurilemmic
+Aneurin
+aneurin
+aneurine
+aneurins
+aneurism
+aneurismal
+aneurismally
+aneurismatic
+aneurisms
+aneurysm
+aneurysmal
+aneurysmally
+aneurysmatic
+aneurysms
+anew
+Aney
+Anezeh
+ANF
+anfeeld
+anfract
+anfractuose
+anfractuosity
+anfractuous
+anfractuousness
+anfracture
+Anfuso
+ANG
+anga
+Angadreme
+Angadresma
+angakok
+angakoks
+angakut
+Angami
+Angami-naga
+Angang
+Angara
+angaralite
+angareb
+angareeb
+angarep
+angaria
+angarias
+angariation
+angaries
+Angarsk
+Angarstroi
+angary
+angas
+Angdistis
+Ange
+angekkok
+angekok
+angekut
+Angel
+angel
+Angela
+angelate
+angel-borne
+angel-bright
+angel-builded
+angeldom
+Angele
+angeled
+angeleen
+Angeleno
+Angelenos
+Angeles
+angeles
+angelet
+angel-eyed
+angeleyes
+angel-faced
+angelfish
+angelfishes
+angel-guarded
+angel-heralded
+angelhood
+Angeli
+Angelia
+Angelic
+angelic
+Angelica
+angelica
+Angelical
+angelical
+angelically
+angelicalness
+Angelican
+angelica-root
+angelicas
+angelicic
+angelicize
+angelicness
+Angelico
+angelico
+Angelika
+angelim
+angelin
+Angelina
+angelina
+Angeline
+angeline
+angelinformal
+angeling
+Angelique
+angelique
+Angelis
+Angelita
+angelito
+angelize
+angelized
+angelizing
+Angell
+Angelle
+angellike
+angel-noble
+Angelo
+angelocracy
+angelographer
+angelolater
+angelolatry
+angelologic
+angelological
+angelology
+angelomachy
+angelon
+Angelonia
+angelophanic
+angelophany
+angelot
+angels
+angel-seeming
+angelship
+angels-on-horseback
+angel's-trumpet
+Angelus
+angelus
+angeluses
+angel-warned
+Angelyn
+anger
+Angerboda
+angered
+angering
+angerless
+angerly
+Angerona
+Angeronalia
+Angeronia
+Angers
+angers
+Angetenar
+Angevin
+angevin
+Angevine
+angeyok
+Angi
+angi-
+angia
+angiasthenia
+angico
+Angie
+angiectasis
+angiectopia
+angiemphraxis
+Angier
+angiitis
+Angil
+angild
+angili
+angilo
+angina
+anginal
+anginas
+anginiform
+anginoid
+anginophobia
+anginose
+anginous
+angio-
+angioasthenia
+angioataxia
+angioblast
+angioblastic
+angiocardiographic
+angiocardiographies
+angiocardiography
+angiocarditis
+angiocarp
+angiocarpian
+angiocarpic
+angiocarpous
+angiocarpy
+angiocavernous
+angiocholecystitis
+angiocholitis
+angiochondroma
+angioclast
+angiocyst
+angiodermatitis
+angiodiascopy
+angioelephantiasis
+angiofibroma
+angiogenesis
+angiogenic
+angiogeny
+angioglioma
+angiogram
+angiograph
+angiographic
+angiography
+angiohemophilia
+angiohyalinosis
+angiohydrotomy
+angiohypertonia
+angiohypotonia
+angioid
+angiokeratoma
+angiokinesis
+angiokinetic
+angioleucitis
+angiolipoma
+angiolith
+angiology
+angiolymphitis
+angiolymphoma
+angioma
+angiomalacia
+angiomas
+angiomata
+angiomatosis
+angiomatous
+angiomegaly
+angiometer
+angiomyocardiac
+angiomyoma
+angiomyosarcoma
+angioneoplasm
+angioneurosis
+angioneurotic
+angionoma
+angionosis
+angioparalysis
+angioparalytic
+angioparesis
+angiopathy
+angiophorous
+angioplany
+angioplasty
+angioplerosis
+angiopoietic
+angiopressure
+angiorrhagia
+angiorrhaphy
+angiorrhea
+angiorrhexis
+angiosarcoma
+angiosclerosis
+angiosclerotic
+angioscope
+angiosis
+angiospasm
+angiospastic
+angiosperm
+Angiospermae
+angiospermal
+angiospermatous
+angiospermic
+angiospermous
+angiosperms
+angiosporous
+angiostegnosis
+angiostenosis
+angiosteosis
+angiostomize
+angiostomy
+angiostrophy
+angiosymphysis
+angiotasis
+angiotelectasia
+angiotenosis
+angiotensin
+angiotensinase
+angiothlipsis
+angiotome
+angiotomy
+angiotonase
+angiotonic
+angiotonin
+angiotribe
+angiotripsy
+angiotrophic
+angiport
+Angka
+ang-khak
+angkhak
+Angkor
+Angl
+Angl.
+anglaise
+Angle
+angle
+angleberry
+angled
+angledog
+Angledozer
+angledozer
+angled-toothed
+anglehook
+Angleinlet
+anglemeter
+angle-off
+anglepod
+anglepods
+angler
+anglers
+Angles
+angles
+Anglesey
+anglesite
+anglesmith
+Angleton
+angletouch
+angletwitch
+anglewing
+anglewise
+angleworm
+angleworms
+Anglia
+angliae
+Anglian
+anglian
+anglians
+Anglic
+Anglican
+anglican
+Anglicanism
+anglicanism
+anglicanisms
+Anglicanize
+Anglicanly
+anglicans
+Anglicanum
+Anglice
+anglice
+Anglicisation
+anglicisation
+Anglicise
+Anglicised
+Anglicising
+Anglicism
+anglicism
+anglicisms
+Anglicist
+anglicist
+Anglicization
+anglicization
+Anglicize
+anglicize
+Anglicized
+anglicized
+anglicizes
+Anglicizing
+anglicizing
+Anglification
+Anglified
+Anglify
+anglify
+Anglifying
+Anglim
+anglimaniac
+angling
+anglings
+Anglish
+anglish
+Anglist
+Anglistics
+Anglo
+Anglo-
+anglo
+anglo-
+Anglo-abyssinian
+Anglo-afghan
+Anglo-african
+Anglo-america
+Anglo-American
+Anglo-american
+Anglo-Americanism
+Anglo-americanism
+Anglo-asian
+Anglo-asiatic
+Anglo-australian
+Anglo-austrian
+Anglo-belgian
+Anglo-boer
+Anglo-brazilian
+Anglo-canadian
+Anglo-Catholic
+Anglo-catholic
+anglo-catholic
+Anglo-Catholicism
+Anglo-catholicism
+AngloCatholicism
+Anglo-chinese
+Anglo-danish
+Anglo-dutch
+Anglo-dutchman
+Anglo-ecclesiastical
+Anglo-ecuadorian
+Anglo-egyptian
+Anglo-French
+Anglo-french
+anglo-french
+Anglogaea
+Anglogaean
+Anglo-Gallic
+Anglo-german
+Anglo-greek
+Anglo-hibernian
+angloid
+Anglo-Indian
+Anglo-indian
+anglo-indian
+Anglo-Irish
+Anglo-irish
+Anglo-irishism
+Anglo-israel
+Anglo-israelism
+Anglo-israelite
+Anglo-italian
+Anglo-japanese
+Anglo-jewish
+Anglo-judaic
+Anglo-latin
+Anglo-maltese
+Angloman
+angloman
+Anglomane
+Anglomania
+anglomania
+Anglomaniac
+Anglomaniacal
+Anglo-manx
+Anglo-mexican
+Anglo-mohammedan
+Anglo-Norman
+Anglo-norman
+anglo-norman
+Anglo-norwegian
+Anglo-nubian
+Anglo-persian
+Anglophil
+anglophil
+Anglophile
+anglophile
+anglophiles
+Anglophilia
+anglophilia
+Anglophiliac
+anglophiliac
+Anglophilic
+anglophilic
+anglophilism
+anglophily
+Anglophobe
+anglophobe
+anglophobes
+Anglophobia
+anglophobia
+Anglophobiac
+Anglophobic
+anglophobic
+Anglophobist
+Anglophone
+Anglo-portuguese
+Anglo-russian
+Anglos
+anglos
+Anglo-Saxon
+Anglo-saxon
+anglo-saxon
+Anglo-saxondom
+Anglo-saxonic
+Anglo-saxonism
+Anglo-scottish
+Anglo-serbian
+Anglo-soviet
+Anglo-spanish
+Anglo-swedish
+Anglo-swiss
+Anglo-teutonic
+Anglo-turkish
+Anglo-venetian
+ango
+angoise
+Angola
+angola
+angolan
+angolans
+angolar
+Angolese
+angor
+Angora
+angora
+angoras
+Angostura
+angostura
+Angouleme
+Angoumian
+Angoumois
+Angraecum
+Angrbodha
+angrier
+angriest
+angrily
+angriness
+Angrist
+angrite
+angry
+angry-eyed
+angry-looking
+angst
+angster
+Angstrom
+angstrom
+angstroms
+angsts
+anguid
+Anguidae
+Anguier
+anguiform
+Anguilla
+Anguillaria
+anguille
+Anguillidae
+anguilliform
+anguilloid
+Anguillula
+anguillule
+Anguillulidae
+Anguimorpha
+anguine
+anguineal
+anguineous
+Anguinidae
+anguiped
+Anguis
+anguis
+anguish
+anguished
+anguishes
+anguishful
+anguishing
+anguishous
+anguishously
+angula
+angular
+angulare
+angularia
+angularities
+angularity
+angularization
+angularize
+angularly
+angularness
+angular-toothed
+angulate
+angulated
+angulately
+angulateness
+angulates
+angulating
+angulation
+angulato-
+angulatogibbous
+angulatosinuous
+angule
+anguliferous
+angulinerved
+angulo-
+Anguloa
+angulodentate
+angulometer
+angulose
+angulosity
+anguloso-
+angulosplenial
+angulous
+angulus
+Angurboda
+anguria
+Angus
+angus
+anguses
+angust
+angustate
+angusti-
+angustia
+angusticlave
+angustifoliate
+angustifolious
+angustirostrate
+angustisellate
+angustiseptal
+angustiseptate
+angustura
+angwantibo
+angwich
+Angwin
+Angy
+Anh
+anhaematopoiesis
+anhaematosis
+anhaemolytic
+anhalamine
+anhaline
+anhalonidine
+anhalonin
+anhalonine
+Anhalonium
+anhalouidine
+Anhalt
+anhang
+Anhanga
+anharmonic
+anhedonia
+anhedonic
+anhedral
+anhedron
+anhelation
+anhele
+anhelose
+anhelous
+anhematopoiesis
+anhematosis
+anhemitonic
+anhemolytic
+Anheuser
+anhidrosis
+anhidrotic
+anhima
+Anhimae
+Anhimidae
+anhinga
+anhingas
+anhistic
+anhistous
+anhungered
+anhungry
+Anhwei
+anhyd
+anhydraemia
+anhydraemic
+anhydrate
+anhydrated
+anhydrating
+anhydration
+anhydremia
+anhydremic
+anhydric
+anhydride
+anhydrides
+anhydridization
+anhydridize
+anhydrite
+anhydrization
+anhydrize
+anhydro-
+anhydroglocose
+anhydromyelia
+anhydrosis
+anhydrotic
+anhydrous
+anhydrously
+anhydroxime
+anhysteretic
+ANI
+ani
+Ania
+Aniak
+Aniakchak
+Aniakudo
+Aniba
+Anica
+anicca
+Anice
+Anicetus
+aniconic
+aniconism
+anicular
+anicut
+anidian
+anidiomatic
+anidiomatical
+anidrosis
+Aniela
+Aniellidae
+aniente
+anientise
+ANIF
+anigh
+anight
+anights
+Anil
+anil
+anilao
+anilau
+anile
+anileness
+anilic
+anilid
+anilide
+anilidic
+anilidoxime
+aniliid
+anilin
+anilinctus
+aniline
+anilines
+anilingus
+anilinism
+anilino
+anilinophile
+anilinophilous
+anilins
+anilities
+anility
+anilla
+anilopyrin
+anilopyrine
+anils
+anim
+anim.
+anima
+animability
+animable
+animableness
+animacule
+animadversal
+animadversion
+animadversional
+animadversions
+animadversive
+animadversiveness
+animadvert
+animadverted
+animadverter
+animadverting
+animadverts
+animal
+animala
+animalcula
+animalculae
+animalcular
+animalcule
+animalcules
+animalculine
+animalculism
+animalculist
+animalculous
+animalculum
+animalhood
+Animalia
+animalian
+animalic
+animalier
+animalillio
+animalisation
+animalise
+animalised
+animalish
+animalising
+animalism
+animalist
+animalistic
+animalities
+animality
+Animalivora
+animalivore
+animalivorous
+animalization
+animalize
+animalized
+animalizing
+animallike
+animally
+animalness
+animals
+animal-sized
+animando
+animant
+Animas
+animas
+animastic
+animastical
+animate
+animated
+animatedly
+animately
+animateness
+animater
+animaters
+animates
+animating
+animatingly
+animation
+animations
+animatism
+animatist
+animatistic
+animative
+animato
+animatograph
+animator
+animators
+anime
+animes
+animetta
+animi
+Animikean
+animikite
+animine
+animis
+animism
+animisms
+animist
+animistic
+animists
+animize
+animized
+animo
+animose
+animoseness
+animosities
+animosity
+animoso
+animotheism
+animous
+animus
+animuses
+anion
+anionic
+anionically
+anionics
+anions
+aniridia
+Anis
+anis
+anis-
+anisado
+anisal
+anisalcohol
+anisaldehyde
+anisaldoxime
+anisamide
+anisandrous
+anisanilide
+anisanthous
+anisate
+anisated
+anischuria
+anise
+aniseed
+aniseeds
+aniseikonia
+aniseikonic
+aniselike
+aniseroot
+anises
+anisette
+anisettes
+anisic
+anisidin
+anisidine
+anisidino
+anisil
+anisilic
+aniso-
+anisobranchiate
+anisocarpic
+anisocarpous
+anisocercal
+anisochromatic
+anisochromia
+anisocoria
+anisocotyledonous
+anisocotyly
+anisocratic
+anisocycle
+anisocytosis
+anisodactyl
+Anisodactyla
+anisodactyle
+Anisodactyli
+anisodactylic
+anisodactylous
+anisodont
+anisogamete
+anisogametes
+anisogametic
+anisogamic
+anisogamous
+anisogamy
+anisogenous
+anisogeny
+anisognathism
+anisognathous
+anisogynous
+anisoiconia
+anisoin
+anisokonia
+anisol
+anisole
+anisoles
+anisoleucocytosis
+Anisomeles
+anisomelia
+anisomelus
+anisomeric
+anisomerous
+anisometric
+anisometrope
+anisometropia
+anisometropic
+anisomyarian
+Anisomyodi
+anisomyodian
+anisomyodous
+anisopetalous
+anisophyllous
+anisophylly
+anisopia
+anisopleural
+anisopleurous
+anisopod
+Anisopoda
+anisopodal
+anisopodous
+anisopogonous
+Anisoptera
+anisopteran
+anisopterous
+anisosepalous
+anisospore
+anisostaminous
+anisostemonous
+anisosthenic
+anisostichous
+Anisostichus
+anisostomous
+anisotonic
+anisotropal
+anisotrope
+anisotropic
+anisotropical
+anisotropically
+anisotropies
+anisotropism
+anisotropous
+anisotropy
+anisoyl
+Anissa
+anisum
+anisuria
+anisyl
+anisylidene
+Anita
+anither
+anitinstitutionalism
+anitos
+Anitra
+anitrogenous
+Anius
+Aniwa
+Aniweta
+Anjali
+anjan
+Anjanette
+Anjela
+Anjou
+Ankara
+ankara
+ankaramite
+ankaratrite
+ankee
+Ankeny
+anker
+ankerhold
+ankerite
+ankerites
+ankh
+ankhs
+Anking
+ankle
+anklebone
+anklebones
+ankled
+ankle-deep
+anklejack
+ankle-jacked
+ankles
+anklet
+anklets
+ankling
+anklong
+anklung
+Ankney
+Ankoli
+Ankou
+ankus
+ankuses
+ankush
+ankusha
+ankushes
+ankylenteron
+ankyloblepharon
+ankylocheilia
+ankylodactylia
+ankylodontia
+ankyloglossia
+ankylomele
+ankylomerism
+ankylophobia
+ankylopodia
+ankylopoietic
+ankyloproctia
+ankylorrhinia
+ankylos
+ankylosaur
+Ankylosaurus
+ankylosaurus
+ankylose
+ankylosed
+ankyloses
+ankylosing
+ankylosis
+ankylostoma
+ankylostomiasis
+ankylotia
+ankylotic
+ankylotome
+ankylotomy
+ankylurethria
+ankyroid
+ANL
+anlace
+anlaces
+Anlage
+anlage
+anlagen
+anlages
+anlas
+anlases
+anlaut
+anlaute
+anlet
+anlia
+anmia
+Anmoore
+Ann
+ann
+ann.
+Anna
+anna
+Annaba
+Annabal
+Annabel
+Annabela
+Annabell
+Annabella
+Annabelle
+annabergite
+Annada
+Anna-Diana
+Annadiana
+Anna-Diane
+Annadiane
+annal
+Annale
+annale
+Annalee
+Annalen
+annalia
+Annaliese
+annaline
+Annalise
+annalism
+annalist
+annalistic
+annalistically
+annalists
+annalize
+annals
+annaly
+Annam
+Anna-Maria
+Annamaria
+Annamarie
+Annamese
+annamese
+Annamite
+Annamitic
+Annam-Muong
+Annam-muong
+Annandale
+Annapolis
+annapolis
+Annapurna
+Annarbor
+annary
+annas
+annat
+annates
+Annatol
+annats
+annatto
+annattos
+Annawan
+Anne
+anne
+anneal
+annealed
+annealer
+annealers
+annealing
+anneals
+Anne-Corinne
+Annecorinne
+annect
+annectant
+annectent
+annection
+Annecy
+annelid
+Annelida
+annelida
+annelidan
+Annelides
+annelidian
+annelidous
+annelids
+Anneliese
+Annelise
+annelism
+Annellata
+anneloid
+Annemanie
+Anne-Marie
+Annemarie
+Annenski
+Annensky
+annerodite
+annerre
+Anneslia
+annet
+Annetta
+Annette
+annex
+annexa
+annexable
+annexal
+annexation
+annexational
+annexationism
+annexationist
+annexations
+annexe
+annexed
+annexer
+annexes
+annexing
+annexion
+annexionist
+annexitis
+annexive
+annexment
+annexure
+Annfwn
+Anni
+anni
+Annia
+Annibale
+Annice
+annicut
+annidalin
+Annie
+annie
+Anniellidae
+annihil
+annihilability
+annihilable
+annihilate
+annihilated
+annihilates
+annihilating
+annihilation
+annihilationism
+annihilationist
+annihilationistic
+annihilationistical
+annihilations
+annihilative
+annihilator
+annihilators
+annihilatory
+Anniken
+Annis
+Annissa
+Annist
+annist
+Anniston
+annite
+anniv
+anniversalily
+anniversaries
+anniversarily
+anniversariness
+anniversary
+anniverse
+Annmaria
+Ann-Marie
+Annmarie
+Annnora
+anno
+annodated
+annominate
+annomination
+Annona
+annona
+Annonaceae
+annonaceous
+annonce
+Annora
+Annorah
+annot
+annotate
+annotated
+annotater
+annotates
+annotating
+annotation
+annotations
+annotative
+annotatively
+annotativeness
+annotator
+annotators
+annotatory
+annotine
+annotinous
+annotto
+announce
+announceable
+announced
+announcement
+announcements
+announcer
+announcers
+announces
+announcing
+annoy
+annoyance
+annoyancer
+annoyances
+annoyed
+annoyer
+annoyers
+annoyful
+annoying
+annoyingly
+annoyingness
+annoyment
+annoyous
+annoyously
+annoys
+annual
+annualist
+annualize
+annualized
+annually
+annuals
+annuary
+annuation
+annueler
+annueller
+annuent
+annuisance
+annuitant
+annuitants
+annuities
+annuity
+annul
+annular
+Annularia
+annularity
+annularly
+annulary
+Annulata
+annulata
+annulate
+annulated
+annulately
+annulation
+annulations
+annule
+annuler
+annulet
+annulets
+annulettee
+annuli
+annulism
+annullable
+annullate
+annullation
+annulled
+annuller
+annulli
+annulling
+annulment
+annulments
+annuloid
+Annuloida
+annuloida
+Annulosa
+annulosa
+annulosan
+annulose
+annuls
+annulus
+annuluses
+annum
+annumerate
+annunciable
+annunciade
+Annunciata
+annunciate
+annunciated
+annunciates
+annunciating
+Annunciation
+annunciation
+annunciations
+annunciative
+annunciator
+annunciators
+annunciatory
+Annunziata
+annus
+Annville
+Annwfn
+Annwn
+Anny
+ano-
+anoa
+anoas
+Anobiidae
+anobing
+anocarpous
+anocathartic
+anociassociation
+anociation
+anocithesia
+anococcygeal
+anodal
+anodally
+anode
+anodendron
+anodes
+anodic
+anodically
+anodine
+anodization
+anodize
+anodized
+anodizes
+anodizing
+Anodon
+anodon
+Anodonta
+anodontia
+anodos
+anodyne
+anodynes
+anodynia
+anodynic
+anodynous
+anoegenetic
+anoesia
+anoesis
+anoestrous
+anoestrum
+anoestrus
+anoetic
+anogenic
+anogenital
+Anogra
+anoia
+anoil
+anoine
+anoint
+anointed
+anointer
+anointers
+anointing
+anointment
+anointments
+anoints
+Anoka
+anole
+anoles
+anoli
+anolian
+Anolis
+Anolympiad
+anolyte
+anolytes
+anomal
+Anomala
+anomalies
+anomaliflorous
+anomaliped
+anomalipod
+anomalism
+anomalist
+anomalistic
+anomalistical
+anomalistically
+anomalo-
+anomalocephalus
+anomaloflorous
+Anomalogonatae
+anomalogonatous
+Anomalon
+anomalonomy
+Anomalopteryx
+anomaloscope
+anomalotrophy
+anomalous
+anomalously
+anomalousness
+anomalure
+Anomaluridae
+Anomalurus
+anomaly
+Anomatheca
+anomer
+Anomia
+anomia
+Anomiacea
+anomic
+anomie
+anomies
+Anomiidae
+anomite
+anomo-
+anomocarpous
+anomodont
+Anomodontia
+Anomoean
+Anomoeanism
+anomoeomery
+anomophyllous
+anomorhomboid
+anomorhomboidal
+anomouran
+anomphalous
+Anomura
+anomural
+anomuran
+anomurous
+anomy
+anon
+anon.
+anonaceous
+anonad
+anonang
+anoncillo
+anonol
+anonychia
+anonym
+anonyma
+anonyme
+anonymities
+anonymity
+anonymous
+anonymously
+anonymousness
+anonyms
+anonymuncule
+anoopsia
+anoopsias
+anoperineal
+anophele
+Anopheles
+anopheles
+Anophelinae
+anopheline
+anophoria
+anophthalmia
+anophthalmos
+Anophthalmus
+anophyte
+anopia
+anopias
+anopisthograph
+anopisthographic
+anopisthographically
+Anopla
+Anoplanthus
+anoplocephalic
+anoplonemertean
+Anoplonemertini
+anoplothere
+Anoplotheriidae
+anoplotherioid
+Anoplotherium
+anoplotheroid
+Anoplura
+anopluriform
+anopsia
+anopsias
+anopsy
+anopubic
+Anora
+anorak
+anoraks
+anorchi
+anorchia
+anorchism
+anorchous
+anorchus
+anorectal
+anorectic
+anorectous
+anoretic
+anorexia
+anorexiant
+anorexias
+anorexic
+anorexics
+anorexies
+anorexigenic
+anorexy
+anorgana
+anorganic
+anorganism
+anorganology
+anormal
+anormality
+anorn
+anorogenic
+anorth
+anorthic
+anorthite
+anorthite-basalt
+anorthitic
+anorthitite
+anorthoclase
+anorthographic
+anorthographical
+anorthographically
+anorthography
+anorthophyre
+anorthopia
+anorthoscope
+anorthose
+anorthosite
+anoscope
+anoscopy
+Anosia
+anosmatic
+anosmia
+anosmias
+anosmic
+anosognosia
+anosphrasia
+anosphresia
+anospinal
+anostosis
+Anostraca
+anoterite
+Another
+another
+another-gates
+another-guess
+anotherguess
+another-guise
+anotherkins
+anotia
+anotropia
+anotta
+anotto
+anotus
+Anouilh
+anounou
+anour
+anoura
+anoure
+anourous
+Anous
+ANOVA
+anova
+anovesical
+anovulant
+anovular
+anovulatory
+anoxaemia
+anoxaemic
+anoxemia
+anoxemias
+anoxemic
+anoxia
+anoxias
+anoxic
+anoxidative
+anoxybiosis
+anoxybiotic
+anoxyscope
+anp-
+ANPA
+anquera
+anre
+ans
+ansa
+ansae
+Ansar
+ansar
+Ansarian
+ansarian
+Ansarie
+ansate
+ansated
+ansation
+Anschauung
+anschauung
+Anschluss
+anschluss
+Anse
+Anseis
+Ansel
+Ansela
+Ansell
+Anselm
+Anselma
+Anselme
+Anselmi
+Anselmian
+Anselmo
+Anser
+anserated
+Anseres
+Anseriformes
+anserin
+Anserinae
+anserine
+anserines
+Ansermet
+anserous
+Ansgarius
+Anshan
+Anshar
+ANSI
+ansi
+Ansilma
+Ansilme
+Ansley
+Anson
+Ansonia
+Ansonville
+anspessade
+Ansted
+Anstice
+anstoss
+anstosse
+Anstus
+ansu
+ansulate
+answer
+answerability
+answerable
+answerableness
+answerably
+answer-back
+answered
+answerer
+answerers
+answering
+answeringly
+answerless
+answerlessly
+answers
+-ant
+an't
+ant
+ant-
+ant.
+ANTA
+Anta
+anta
+Antabus
+Antabuse
+antacid
+antacids
+antacrid
+antadiform
+antae
+Antaea
+Antaean
+antaean
+Antaeus
+antaeus
+antagonisable
+antagonisation
+antagonise
+antagonised
+antagonising
+antagonism
+antagonisms
+antagonist
+antagonistic
+antagonistical
+antagonistically
+antagonists
+antagonizable
+antagonization
+antagonize
+antagonized
+antagonizer
+antagonizes
+antagonizing
+antagony
+Antagoras
+Antaimerina
+Antaios
+Antaiva
+Antakiya
+Antakya
+Antal
+antal
+antalgesic
+antalgic
+antalgics
+antalgol
+antalkali
+antalkalies
+antalkaline
+antalkalis
+Antalya
+antambulacral
+antanacathartic
+antanaclasis
+antanagoge
+Antananarivo
+Antanandro
+antanemic
+antapex
+antapexes
+antaphrodisiac
+antaphroditic
+antapices
+antapocha
+antapodosis
+antapology
+antapoplectic
+Antar
+Antara
+antarala
+antaranga
+antarchism
+antarchist
+antarchistic
+antarchistical
+antarchy
+Antarctalia
+Antarctalian
+Antarctic
+antarctic
+Antarctica
+antarctica
+antarctical
+antarctically
+Antarctogaea
+Antarctogaean
+Antares
+antares
+antarthritic
+antas
+antasphyctic
+antasthenic
+antasthmatic
+antatrophic
+antbird
+antdom
+ante
+ante-
+anteact
+ante-acted
+anteal
+anteambulate
+anteambulation
+ante-ambulo
+ant-eater
+anteater
+anteaters
+Ante-babylonish
+antebaptismal
+antebath
+ante-bellum
+antebellum
+Antebi
+antebrachia
+antebrachial
+antebrachium
+antebridal
+antecabinet
+antecaecal
+antecardium
+antecavern
+antecedal
+antecedaneous
+antecedaneously
+antecede
+anteceded
+antecedence
+antecedency
+antecedent
+antecedental
+antecedently
+antecedents
+antecedes
+anteceding
+antecell
+antecessor
+antechamber
+antechambers
+ante-chapel
+antechapel
+Antechinomys
+antechoir
+antechoirs
+Ante-christian
+ante-Christum
+antechurch
+anteclassical
+antecloset
+antecolic
+antecommunion
+anteconsonantal
+antecornu
+antecourt
+antecoxal
+antecubital
+antecurvature
+Ante-cuvierian
+anted
+antedate
+antedated
+antedates
+antedating
+antedawn
+antediluvial
+antediluvially
+antediluvian
+Antedon
+antedonin
+antedorsal
+ante-ecclesiastical
+anteed
+ante-eternity
+antefact
+antefebrile
+antefix
+antefixa
+antefixal
+antefixes
+anteflected
+anteflexed
+anteflexion
+antefurca
+antefurcae
+antefurcal
+antefuture
+antegarden
+Ante-gothic
+antegrade
+antehall
+Ante-hieronymian
+antehistoric
+antehuman
+antehypophysis
+anteing
+anteinitial
+antejentacular
+antejudiciary
+antejuramentum
+Ante-justinian
+antelabium
+antelation
+antelegal
+antelocation
+antelope
+antelopes
+antelopian
+antelopine
+antelucan
+antelude
+anteluminary
+antemarginal
+antemarital
+antemask
+antemedial
+antemeridian
+antemetallic
+antemetic
+antemillennial
+antemingent
+antemortal
+ante-mortem
+antemortem
+Ante-mosaic
+Ante-mosaical
+antemundane
+antemural
+antenarial
+antenatal
+antenatalitial
+antenati
+antenatus
+antenave
+ante-Nicaean
+Ante-nicene
+ante-Nicene
+antenna
+antennae
+antennal
+Antennaria
+antennariid
+Antennariidae
+Antennarius
+antennary
+antennas
+Antennata
+antennate
+antennifer
+antenniferous
+antenniform
+antennula
+antennular
+antennulary
+antennule
+antenodal
+antenoon
+Antenor
+Ante-norman
+antenumber
+antenuptial
+anteoccupation
+anteocular
+anteopercle
+anteoperculum
+ante-orbital
+anteorbital
+Antep
+antepagment
+antepagmenta
+antepagments
+antepalatal
+ante-partum
+antepartum
+antepaschal
+antepaschel
+antepast
+antepasts
+antepatriarchal
+antepectoral
+antepectus
+antependia
+antependium
+antependiums
+antepenuit
+antepenult
+antepenultima
+antepenultimate
+antepenults
+antephialtic
+antepileptic
+antepirrhema
+antepone
+anteporch
+anteport
+anteportico
+anteporticoes
+anteporticos
+anteposition
+anteposthumous
+anteprandial
+antepredicament
+antepredicamental
+antepreterit
+antepretonic
+anteprohibition
+anteprostate
+anteprostatic
+antepyretic
+antequalm
+antereformation
+antereformational
+anteresurrection
+anterethic
+anterevolutional
+anterevolutionary
+antergic
+anteri
+anteriad
+anterin
+anterior
+anteriority
+anteriorly
+anteriorness
+anteriors
+anterioyancer
+antero-
+anteroclusion
+anterodorsal
+anteroexternal
+anterofixation
+anteroflexion
+anterofrontal
+anterograde
+anteroinferior
+anterointerior
+anterointernal
+anterolateral
+anterolaterally
+anteromedial
+anteromedian
+ante-room
+anteroom
+anterooms
+anteroparietal
+anteroposterior
+anteroposteriorly
+anteropygal
+Anteros
+anterospinal
+anterosuperior
+anteroventral
+anteroventrally
+Anterus
+antes
+antescript
+Antesfort
+antesignani
+antesignanus
+antespring
+antestature
+antesternal
+antesternum
+antesunrise
+antesuperior
+ante-temple
+antetemple
+antethem
+antetype
+antetypes
+Anteva
+antevenient
+anteversion
+antevert
+anteverted
+anteverting
+anteverts
+Ante-victorian
+antevocalic
+Antevorta
+antewar
+anth-
+Anthas
+anthdia
+Anthe
+Anthea
+anthecological
+anthecologist
+anthecology
+Antheia
+Antheil
+anthela
+anthelae
+anthelia
+anthelices
+anthelion
+anthelions
+anthelix
+Anthelme
+anthelminthic
+anthelmintic
+anthem
+anthema
+anthemas
+anthemata
+anthemed
+anthemene
+anthemia
+Anthemideae
+antheming
+anthemion
+Anthemis
+anthemis
+anthems
+anthemwise
+anthemy
+anther
+Antheraea
+antheral
+Anthericum
+antherid
+antheridia
+antheridial
+antheridiophore
+antheridium
+antherids
+antheriferous
+antheriform
+antherine
+antherless
+antherogenous
+antheroid
+antherozoid
+antherozoidal
+antherozooid
+antherozooidal
+anthers
+antheses
+anthesis
+Anthesteria
+Anthesteriac
+anthesterin
+Anthesterion
+anthesterol
+Antheus
+antheximeter
+Anthia
+Anthiathia
+Anthicidae
+Anthidium
+anthill
+anthills
+Anthinae
+anthine
+antho-
+anthobian
+anthobiology
+anthocarp
+anthocarpous
+anthocephalous
+Anthoceros
+Anthocerotaceae
+Anthocerotales
+anthocerote
+anthochlor
+anthochlorine
+anthoclinium
+anthocyan
+anthocyanidin
+anthocyanin
+anthodia
+anthodium
+anthoecological
+anthoecologist
+anthoecology
+anthogenesis
+anthogenetic
+anthogenous
+anthography
+anthoid
+anthokyan
+anthol
+antholite
+anthological
+anthologically
+anthologies
+anthologion
+anthologise
+anthologised
+anthologising
+anthologist
+anthologists
+anthologize
+anthologized
+anthologizer
+anthologizes
+anthologizing
+anthology
+antholysis
+Antholyza
+anthomania
+anthomaniac
+Anthomedusae
+anthomedusan
+Anthomyia
+anthomyiid
+Anthomyiidae
+Anthon
+Anthonin
+Anthonomus
+Anthony
+anthony
+anthood
+anthophagous
+anthophagy
+Anthophila
+anthophile
+anthophilian
+anthophilous
+anthophobia
+Anthophora
+anthophore
+Anthophoridae
+anthophorous
+anthophyllite
+anthophyllitic
+Anthophyta
+anthophyte
+anthorine
+anthos
+anthosiderite
+Anthospermum
+anthotaxis
+anthotaxy
+anthotropic
+anthotropism
+anthoxanthin
+Anthoxanthum
+Anthozoa
+anthozoa
+anthozoan
+anthozoic
+anthozooid
+anthozoon
+anthra-
+anthracaemia
+anthracemia
+anthracene
+anthraceniferous
+anthraces
+anthrachrysone
+anthracia
+anthracic
+anthraciferous
+anthracin
+anthracite
+anthracites
+anthracitic
+anthracitiferous
+anthracitious
+anthracitism
+anthracitization
+anthracitous
+anthracnose
+anthracnosis
+anthracocide
+anthracoid
+anthracolithic
+anthracomancy
+Anthracomarti
+anthracomartian
+Anthracomartus
+anthracometer
+anthracometric
+anthraconecrosis
+anthraconite
+Anthracosaurus
+anthracosilicosis
+anthracosis
+anthracothere
+Anthracotheriidae
+Anthracotherium
+anthracotic
+anthracoxen
+anthracyl
+anthradiol
+anthradiquinone
+anthraflavic
+anthragallol
+anthrahydroquinone
+anthralin
+anthramin
+anthramine
+anthranil
+anthranilate
+anthranilic
+anthranol
+anthranone
+anthranoyl
+anthranyl
+anthraphenone
+anthrapurpurin
+anthrapyridine
+anthraquinol
+anthraquinone
+anthraquinonyl
+anthrarufin
+anthrasilicosis
+anthratetrol
+anthrathiophene
+anthratriol
+anthrax
+anthraxolite
+anthraxylon
+Anthrenus
+anthribid
+Anthribidae
+Anthriscus
+anthrohopobiological
+anthroic
+anthrol
+anthrone
+anthrop
+anthrop-
+anthrop.
+anthrophore
+anthropic
+anthropical
+Anthropidae
+anthropo-
+anthropobiologist
+anthropobiology
+anthropocentric
+anthropocentrically
+anthropocentricity
+anthropocentrism
+anthropoclimatologist
+anthropoclimatology
+anthropocosmic
+anthropodeoxycholic
+Anthropodus
+anthropogenesis
+anthropogenetic
+anthropogenic
+anthropogenist
+anthropogenous
+anthropogeny
+anthropogeographer
+anthropogeographic
+anthropogeographical
+anthropogeography
+anthropoglot
+anthropogony
+anthropographic
+anthropography
+anthropoid
+anthropoidal
+Anthropoidea
+anthropoidea
+anthropoidean
+anthropoids
+anthropol
+anthropol.
+anthropolater
+anthropolatric
+anthropolatry
+anthropolite
+anthropolith
+anthropolithic
+anthropolitic
+anthropologic
+anthropological
+anthropologically
+anthropologies
+anthropologist
+anthropologists
+anthropology
+anthropomancy
+anthropomantic
+anthropomantist
+anthropometer
+anthropometric
+anthropometrical
+anthropometrically
+anthropometrist
+anthropometry
+anthropomophitism
+anthropomorph
+Anthropomorpha
+anthropomorphic
+anthropomorphical
+anthropomorphically
+Anthropomorphidae
+anthropomorphisation
+anthropomorphise
+anthropomorphised
+anthropomorphising
+anthropomorphism
+anthropomorphisms
+anthropomorphist
+anthropomorphite
+anthropomorphitic
+anthropomorphitical
+anthropomorphitism
+anthropomorphization
+anthropomorphize
+anthropomorphized
+anthropomorphizing
+anthropomorphological
+anthropomorphologically
+anthropomorphology
+anthropomorphosis
+anthropomorphotheist
+anthropomorphous
+anthropomorphously
+anthroponomical
+anthroponomics
+anthroponomist
+anthroponomy
+anthroponym
+anthropopathia
+anthropopathic
+anthropopathically
+anthropopathism
+anthropopathite
+anthropopathy
+anthropophagi
+anthropophagic
+anthropophagical
+anthropophaginian
+anthropophagism
+anthropophagist
+anthropophagistic
+anthropophagit
+anthropophagite
+anthropophagize
+anthropophagous
+anthropophagously
+anthropophagus
+anthropophagy
+anthropophilous
+anthropophobia
+anthropophuism
+anthropophuistic
+anthropophysiography
+anthropophysite
+Anthropopithecus
+anthropopsychic
+anthropopsychism
+Anthropos
+anthroposcopy
+anthroposociologist
+anthroposociology
+anthroposomatology
+anthroposophic
+anthroposophical
+anthroposophist
+anthroposophy
+anthropoteleoclogy
+anthropoteleological
+anthropotheism
+anthropotheist
+anthropotheistic
+anthropotomical
+anthropotomist
+anthropotomy
+anthropotoxin
+Anthropozoic
+anthropozoic
+anthropurgic
+anthroropolith
+anthroxan
+anthroxanic
+anthryl
+anthrylene
+anththeridia
+Anthurium
+anthurium
+Anthus
+Anthyllis
+anthypnotic
+anthypophora
+anthypophoretic
+Anti
+anti
+anti-
+Antia
+antiabolitionist
+antiabortion
+antiabrasion
+antiabrin
+antiabsolutist
+antiacademic
+anti-acid
+antiacid
+antiadiaphorist
+antiaditis
+antiadministration
+antiae
+antiaesthetic
+antiager
+antiagglutinant
+antiagglutinating
+antiagglutination
+antiagglutinative
+antiagglutinin
+antiaggression
+antiaggressionist
+antiaggressive
+antiaggressively
+antiaggressiveness
+anti-aircraft
+antiaircraft
+antialbumid
+antialbumin
+antialbumose
+antialcoholic
+antialcoholism
+antialcoholist
+antialdoxime
+antialexin
+antialien
+Anti-allied
+Anti-ally
+antiamboceptor
+Anti-american
+anti-American
+Anti-americanism
+antiamusement
+antiamylase
+antianaphylactogen
+antianaphylaxis
+antianarchic
+antianarchist
+Anti-anglican
+antiangular
+antiannexation
+antiannexationist
+antianopheline
+antianthrax
+antianthropocentric
+antianthropomorphism
+antiantibody
+antiantidote
+antiantienzyme
+antiantitoxin
+antianxiety
+antiapartheid
+antiaphrodisiac
+antiaphthic
+antiapoplectic
+antiapostle
+antiaquatic
+antiar
+Anti-arab
+anti-Arab
+Antiarcha
+Antiarchi
+Anti-arian
+antiarin
+antiarins
+Antiaris
+antiaristocracies
+antiaristocracy
+antiaristocrat
+antiaristocratic
+antiaristocratical
+antiaristocratically
+Anti-aristotelian
+anti-Aristotelian
+anti-Aristotelianism
+Anti-armenian
+Anti-arminian
+Anti-arminianism
+antiarrhythmic
+antiars
+antiarthritic
+antiascetic
+antiasthmatic
+antiastronomical
+Anti-athanasian
+antiatheism
+antiatheist
+antiatheistic
+antiatheistical
+antiatheistically
+Anti-athenian
+antiatom
+antiatoms
+antiatonement
+anti-attrition
+antiattrition
+anti-Australian
+anti-Austria
+Anti-austrian
+anti-Austrian
+antiauthoritarian
+antiauthoritarianism
+antiautolysin
+antiauxin
+Anti-babylonianism
+antibacchic
+antibacchii
+antibacchius
+antibacterial
+antibacteriolytic
+antiballistic
+antiballooner
+antibalm
+antibank
+Anti-bartholomew
+antibaryon
+antibasilican
+antibenzaldoxime
+antiberiberin
+Antibes
+antibias
+anti-Bible
+Anti-biblic
+Anti-biblical
+anti-Biblical
+anti-Biblically
+antibibliolatry
+antibigotry
+antibilious
+antibiont
+antibiosis
+antibiotic
+antibiotically
+antibiotics
+Anti-birmingham
+anti-birmingham
+antibishop
+antiblack
+antiblackism
+antiblastic
+antiblennorrhagic
+antiblock
+antiblue
+antibodies
+antibody
+Anti-bohemian
+Anti-bolshevik
+anti-Bolshevik
+anti-Bolshevism
+Anti-bolshevist
+anti-Bolshevist
+anti-Bolshevistic
+Anti-bonapartist
+antiboss
+antibourgeois
+antiboxing
+antiboycott
+antibrachial
+antibreakage
+antibridal
+Anti-british
+anti-British
+Anti-britishism
+antibromic
+antibubonic
+antibug
+antibureaucratic
+Antiburgher
+antiburgher
+antiburglar
+antiburglary
+antibusiness
+antibusing
+antic
+antica
+anticachectic
+Anti-caesar
+antical
+anticalcimine
+anticalculous
+anticalligraphic
+antically
+Anti-calvinism
+anti-Calvinism
+Anti-calvinist
+anti-Calvinist
+Anti-calvinistic
+anti-Calvinistic
+anti-Calvinistical
+Anti-calvinistically
+anticamera
+anticancer
+anticancerous
+anticapital
+anticapitalism
+anticapitalist
+anticapitalistic
+anticapitalistically
+anticapitalists
+anticar
+anticardiac
+anticardium
+anticarious
+anticarnivorous
+anticaste
+anticatalase
+anticatalyst
+anticatalytic
+anticatalytically
+anticatalyzer
+anticatarrhal
+Anti-cathedralist
+anticathexis
+anticathode
+Anti-catholic
+anti-Catholic
+anticatholic
+anti-Catholicism
+anticausotic
+anticaustic
+anticensorial
+anticensorious
+anticensoriously
+anticensoriousness
+anticensorship
+anticentralism
+anticentralist
+anticentralization
+anticephalalgic
+anticeremonial
+anticeremonialism
+anticeremonialist
+anticeremonially
+anticeremonious
+anticeremoniously
+anticeremoniousness
+antichamber
+antichance
+anticheater
+antichlor
+antichlorine
+antichloristic
+antichlorotic
+anticholagogue
+anticholinergic
+anticholinesterase
+antichoromanic
+antichorus
+antichreses
+antichresis
+antichretic
+Antichrist
+antichrist
+Anti-christian
+anti-christian
+antichristian
+Anti-christianism
+antichristianism
+Anti-christianity
+antichristianity
+Anti-christianize
+Anti-christianly
+antichristianly
+antichrists
+antichrome
+antichronical
+antichronically
+antichronism
+antichthon
+antichthones
+antichurch
+antichurchian
+antichymosin
+anticigarette
+anticipant
+anticipatable
+anticipate
+anticipated
+anticipates
+anticipating
+anticipatingly
+anticipation
+anticipations
+anticipative
+anticipatively
+anticipator
+anticipatorily
+anticipators
+anticipatory
+anticity
+anticivic
+anticivil
+anticivilian
+anticivism
+anticize
+antick
+anticked
+anticker
+anticking
+anticks
+antickt
+anticlactic
+anticlassical
+anticlassicalism
+anticlassicalist
+anticlassically
+anticlassicalness
+anticlassicism
+anticlassicist
+anticlastic
+Anticlea
+anticlergy
+anticlerical
+anticlericalism
+anticlericalist
+anticlimactic
+anticlimactical
+anticlimactically
+anticlimax
+anticlimaxes
+anticlinal
+anticline
+anticlines
+anticlinoria
+anticlinorium
+anticlnoria
+anticlockwise
+anticlogging
+anticly
+anticnemion
+anticness
+anticoagulan
+anticoagulant
+anticoagulants
+anticoagulate
+anticoagulating
+anticoagulation
+anticoagulative
+anticoagulator
+anticoagulin
+anticodon
+anticogitative
+anticoincidence
+anticold
+anticolic
+anticollision
+anticolonial
+anticombination
+anticomet
+anticomment
+anticommercial
+anticommercialism
+anticommercialist
+anticommercialistic
+anticommerciality
+anticommercially
+anticommercialness
+anticommunism
+anticommunist
+anticommunistic
+anticommunistical
+anticommunistically
+anticommunists
+anticommutative
+anticompetitive
+anticomplement
+anticomplementary
+anticomplex
+anticonceptionist
+anticonductor
+anticonfederationism
+anticonfederationist
+anticonfederative
+anticonformist
+anticonformities
+anticonformity
+anticonscience
+anticonscription
+anticonscriptive
+anticonservation
+anticonservationist
+anticonservatism
+anticonservative
+anticonservatively
+anticonservativeness
+anticonstitution
+anticonstitutional
+anticonstitutionalism
+anticonstitutionalist
+anticonstitutionally
+anticonsumer
+anticontagion
+anticontagionist
+anticontagious
+anticontagiously
+anticontagiousness
+anticonvellent
+anticonvention
+anticonventional
+anticonventionalism
+anticonventionalist
+anticonventionally
+anticonvulsant
+anticonvulsive
+anticor
+anticorn
+anticorona
+anticorrosion
+anticorrosive
+anticorrosively
+anticorrosiveness
+anticorrosives
+anticorruption
+anticorset
+anticosine
+anticosmetic
+anticosmetics
+Anticosti
+anticouncil
+anticourt
+anticourtier
+anticous
+anticovenanter
+anticovenanting
+anticreation
+anticreational
+anticreationism
+anticreationist
+anticreative
+anticreatively
+anticreativeness
+anticreativity
+anticreator
+anticreep
+anticreeper
+anticreeping
+anticrepuscular
+anticrepuscule
+anticrime
+anticrisis
+anticritic
+anticritical
+anticritically
+anticriticalness
+anticritique
+anticrochet
+anticrotalic
+anticruelty
+anticryptic
+anticryptically
+antics
+anticularia
+anticult
+anticultural
+anticum
+anticus
+anticyclic
+anticyclical
+anticyclically
+anticyclogenesis
+anticyclolysis
+anticyclone
+anticyclones
+anticyclonic
+anticyclonically
+anticynic
+anticynical
+anticynically
+anticynicism
+anticytolysin
+anticytotoxin
+antidactyl
+antidancing
+antidandruff
+anti-Darwin
+Anti-darwinian
+anti-Darwinian
+Anti-darwinism
+anti-Darwinism
+anti-Darwinist
+antidecalogue
+antideflation
+antidemocracies
+antidemocracy
+antidemocrat
+antidemocratic
+antidemocratical
+antidemocratically
+antidemoniac
+anti-depressant
+antidepressant
+antidepressants
+antidepressive
+antiderivative
+antidetonant
+antidetonating
+antidiabetic
+antidiastase
+Antidicomarian
+Antidicomarianite
+antidicomarianite
+antidictionary
+antidiffuser
+antidinic
+antidiphtheria
+antidiphtheric
+antidiphtherin
+antidiphtheritic
+antidisciplinarian
+antidiscrimination
+antidisestablishmentarian
+antidisestablishmentarianism
+antidiuretic
+antidivine
+antidivorce
+Antido
+Anti-docetae
+antidogmatic
+antidogmatical
+antidogmatically
+antidogmatism
+antidogmatist
+antidomestic
+antidomestically
+antidominican
+antidora
+Antidorcas
+antidoron
+antidotal
+antidotally
+antidotary
+antidote
+antidoted
+antidotes
+antidotical
+antidotically
+antidoting
+antidotism
+antidraft
+antidrag
+Anti-dreyfusard
+antidromal
+antidromic
+antidromically
+antidromous
+antidromy
+antidrug
+antiduke
+antidumping
+antidynamic
+antidynastic
+antidynastical
+antidynastically
+antidynasty
+antidyscratic
+antidysenteric
+antidysuric
+antieavesdropping
+antiecclesiastic
+antiecclesiastical
+antiecclesiastically
+antiecclesiasticism
+antiedemic
+antieducation
+antieducational
+antieducationalist
+antieducationally
+antieducationist
+antiegoism
+antiegoist
+antiegoistic
+antiegoistical
+antiegoistically
+antiegotism
+antiegotist
+antiegotistic
+antiegotistical
+antiegotistically
+antiejaculation
+antielectron
+antielectrons
+anti-emetic
+antiemetic
+antiemetics
+antiemperor
+antiempiric
+antiempirical
+antiempirically
+antiempiricism
+antiempiricist
+antiendotoxin
+antiendowment
+antienergistic
+Anti-english
+anti-English
+antient
+Anti-entente
+antienthusiasm
+antienthusiast
+antienthusiastic
+antienthusiastically
+antienvironmentalism
+antienvironmentalist
+antienvironmentalists
+antienzymatic
+antienzyme
+antienzymic
+antiepicenter
+antiepileptic
+antiepiscopal
+antiepiscopist
+antiepithelial
+antierosion
+antierosive
+antierysipelas
+antiestablishment
+Antietam
+anti-ethmc
+antiethnic
+antieugenic
+anti-Europe
+Anti-european
+anti-European
+anti-Europeanism
+antievangelical
+antievolution
+antievolutional
+antievolutionally
+antievolutionary
+antievolutionist
+antievolutionistic
+antiexpansion
+antiexpansionism
+antiexpansionist
+antiexporting
+antiexpressionism
+antiexpressionist
+antiexpressionistic
+antiexpressive
+antiexpressively
+antiexpressiveness
+antiextreme
+antieyestrain
+antiface
+antifaction
+antifame
+antifanatic
+Anti-fascism
+antifascism
+Anti-fascist
+antifascist
+Anti-fascisti
+antifascists
+antifat
+antifatigue
+antifebrile
+antifebrin
+antifederal
+Antifederalism
+antifederalism
+Antifederalist
+anti-federalist
+antifederalist
+antifelon
+antifelony
+antifemale
+antifeminine
+antifeminism
+antifeminist
+antifeministic
+antiferment
+antifermentative
+antiferroelectric
+antiferromagnet
+antiferromagnetic
+antiferromagnetism
+antifertility
+antifertilizer
+antifeudal
+antifeudalism
+antifeudalist
+antifeudalistic
+antifeudalization
+antifibrinolysin
+antifibrinolysis
+antifideism
+antifire
+antiflash
+antiflattering
+antiflatulent
+antiflux
+antifoam
+antifoaming
+antifoggant
+antifogmatic
+antiforeign
+antiforeigner
+antiforeignism
+antiformant
+antiformin
+antifouler
+antifouling
+Anti-fourierist
+antifowl
+anti-France
+antifraud
+antifreeze
+antifreezes
+antifreezing
+Anti-french
+anti-French
+anti-Freud
+Anti-freudian
+anti-Freudian
+anti-Freudianism
+antifriction
+antifrictional
+antifrost
+antifundamentalism
+antifundamentalist
+antifungal
+antifungin
+antifungus
+antigalactagogue
+antigalactic
+anti-gallic
+Anti-gallican
+anti-gallican
+anti-gallicanism
+antigambling
+antiganting
+antigay
+antigen
+antigene
+antigenes
+antigenic
+antigenically
+antigenicity
+antigens
+Anti-german
+anti-German
+anti-Germanic
+Anti-germanism
+anti-Germanism
+anti-Germanization
+antighostism
+antigigmanic
+antiglare
+antiglobulin
+antiglyoxalase
+Anti-gnostic
+antignostic
+antignostical
+Antigo
+anti-god
+antigod
+Antigone
+antigone
+antigonococcic
+Antigonon
+antigonorrheal
+antigonorrheic
+Antigonus
+antigorite
+Anti-gothicist
+antigovernment
+antigovernmental
+antigovernmentally
+antigraft
+antigrammatical
+antigrammatically
+antigrammaticalness
+antigraph
+antigraphy
+antigravitate
+antigravitation
+antigravitational
+antigravitationally
+antigravity
+anti-Greece
+anti-Greek
+antigropelos
+antigrowth
+Antigua
+Antiguan
+antiguerilla
+anti-guggler
+antiguggler
+antigun
+antigyrous
+antihalation
+Anti-hanoverian
+antiharmonist
+antihectic
+antihelices
+antihelix
+antihelixes
+antihelminthic
+antihemagglutinin
+antihemisphere
+antihemoglobin
+antihemolysin
+antihemolytic
+antihemophilic
+antihemorrhagic
+antihemorrheidal
+anti-hero
+antihero
+antiheroes
+anti-heroic
+antiheroic
+antiheroism
+antiheterolysin
+antihidrotic
+antihierarchal
+antihierarchic
+antihierarchical
+antihierarchically
+antihierarchies
+antihierarchism
+antihierarchist
+antihierarchy
+antihijack
+antihistamine
+antihistamines
+antihistaminic
+antihistorical
+anti-hog-cholera
+antiholiday
+antihomosexual
+antihormone
+antihuff
+antihum
+antihuman
+antihumanism
+antihumanist
+antihumanistic
+antihumanity
+antihumbuggist
+antihunting
+antihydrophobic
+antihydropic
+antihydropin
+antihygienic
+antihygienically
+antihylist
+antihypertensive
+antihypertensives
+antihypnotic
+antihypnotically
+antihypochondriac
+antihypophora
+antihysteric
+Anti-ibsenite
+anti-icer
+anti-icteric
+anti-idealism
+anti-idealist
+anti-idealistic
+anti-idealistically
+anti-idolatrous
+anti-immigration
+anti-immigrationist
+anti-immune
+anti-imperialism
+anti-imperialist
+anti-imperialistic
+anti-incrustator
+anti-indemnity
+anti-induction
+anti-inductive
+anti-inductively
+anti-inductiveness
+anti-infallibilist
+anti-infantal
+antiinflammatories
+antiinflammatory
+anti-innovationist
+antiinstitutionalist
+antiinstitutionalists
+antiinsurrectionally
+antiinsurrectionists
+anti-intellectual
+anti-intellectualism
+anti-intellectualist
+anti-intellectuality
+anti-intermediary
+anti-Irish
+Anti-irishism
+anti-isolation
+anti-isolationism
+anti-isolationist
+anti-isolysin
+Anti-italian
+anti-Italian
+anti-Italianism
+anti-jacobin
+anti-jacobinism
+antijam
+antijamming
+Anti-jansenist
+Anti-japanese
+anti-Japanese
+Anti-japanism
+Anti-jesuit
+anti-Jesuit
+anti-Jesuitic
+anti-Jesuitical
+anti-Jesuitically
+anti-Jesuitism
+anti-Jesuitry
+Anti-jewish
+anti-Jewish
+Anti-judaic
+anti-Judaic
+Anti-judaism
+anti-Judaism
+anti-Judaist
+anti-Judaistic
+Antikamnia
+antikathode
+antikenotoxin
+antiketogen
+antiketogenesis
+antiketogenic
+antikinase
+antiking
+antikings
+Anti-klan
+Anti-klanism
+antiknock
+antiknocks
+Antikythera
+antilabor
+antilaborist
+antilacrosse
+antilacrosser
+antilactase
+anti-laissez-faire
+Anti-lamarckian
+antilapsarian
+antilapse
+Anti-latin
+anti-Latin
+anti-Latinism
+Anti-laudism
+antileague
+anti-leaguer
+antileak
+Anti-Lebanon
+anti-lecomption
+anti-lecomptom
+antileft
+antilegalist
+antilegomena
+antilemic
+antilens
+antilepsis
+antileptic
+antilepton
+antilethargic
+antileukemic
+antileveling
+antilevelling
+Antilia
+Anti-liberal
+antiliberal
+antiliberalism
+antiliberalist
+antiliberalistic
+antiliberally
+antiliberalness
+antiliberals
+antilibration
+antilife
+antilift
+antilipase
+antilipoid
+antiliquor
+antilithic
+antilitter
+antilittering
+antiliturgic
+antiliturgical
+antiliturgically
+antiliturgist
+antiliturgy
+Antillean
+Antilles
+antilles
+antilobium
+Antilocapra
+Antilocapridae
+Antilochus
+antiloemic
+antilog
+antilogarithm
+antilogarithmic
+antilogarithms
+antilogic
+antilogical
+antilogies
+antilogism
+antilogistic
+antilogistically
+antilogous
+antilogs
+antilogy
+antiloimic
+Antilope
+Antilopinae
+antilopine
+antiloquy
+antilottery
+antiluetic
+antiluetin
+antilynching
+antilysin
+antilysis
+antilyssic
+antilytic
+antimacassar
+antimacassars
+Anti-macedonian
+Anti-macedonianism
+antimachination
+antimachine
+antimachinery
+Antimachus
+antimagistratical
+antimagnetic
+antimalaria
+antimalarial
+antimale
+antimallein
+Anti-malthusian
+anti-Malthusian
+anti-Malthusianism
+antiman
+antimanagement
+antimaniac
+anti-maniacal
+antimaniacal
+Antimarian
+antimark
+antimartyr
+antimask
+antimasker
+antimasks
+Anti-Mason
+Antimason
+antimason
+Anti-Masonic
+Antimasonic
+Anti-Masonry
+Antimasonry
+antimasque
+antimasquer
+antimasquerade
+antimaterialism
+antimaterialist
+antimaterialistic
+antimaterialistically
+antimatrimonial
+antimatrimonialist
+antimatter
+antimechanism
+antimechanist
+antimechanistic
+antimechanistically
+antimechanization
+antimediaeval
+antimediaevalism
+antimediaevalist
+antimediaevally
+antimedical
+antimedically
+antimedication
+antimedicative
+antimedicine
+antimedieval
+antimedievalism
+antimedievalist
+antimedievally
+antimelancholic
+antimellin
+antimeningococcic
+antimensia
+antimension
+antimensium
+antimephitic
+antimere
+antimeres
+antimerger
+antimerging
+antimeric
+Antimerina
+antimerism
+antimeristem
+antimesia
+antimeson
+Anti-messiah
+antimetabole
+antimetabolite
+antimetathesis
+antimetathetic
+antimeter
+antimethod
+antimethodic
+antimethodical
+antimethodically
+antimethodicalness
+antimetrical
+antimetropia
+antimetropic
+Anti-mexican
+anti-Mexican
+antimiasmatic
+antimicrobial
+antimicrobic
+antimilitarism
+antimilitarist
+antimilitaristic
+antimilitaristically
+antimilitary
+antiministerial
+antiministerialist
+antiministerially
+antiminsia
+antiminsion
+antimiscegenation
+antimissile
+antimission
+antimissionary
+antimissioner
+antimitotic
+antimixing
+antimnemonic
+antimodel
+antimodern
+antimodernism
+antimodernist
+antimodernistic
+antimodernization
+antimodernly
+antimodernness
+Anti-mohammedan
+antimonarch
+antimonarchal
+antimonarchally
+antimonarchial
+antimonarchic
+antimonarchical
+antimonarchically
+antimonarchicalness
+antimonarchism
+antimonarchist
+antimonarchistic
+antimonarchists
+antimonarchy
+antimonate
+Anti-mongolian
+antimonial
+antimoniate
+antimoniated
+antimonic
+antimonid
+antimonide
+antimonies
+antimoniferous
+antimonioso-
+antimonious
+antimonite
+antimonium
+antimoniuret
+antimoniureted
+antimoniuretted
+antimonopolism
+antimonopolist
+antimonopolistic
+antimonopolization
+antimonopoly
+antimonous
+antimonsoon
+antimony
+antimonyl
+anti-mony-yellow
+antimoral
+antimoralism
+antimoralist
+antimoralistic
+antimorality
+Anti-mosaical
+antimosquito
+antimusical
+antimusically
+antimusicalness
+antimycotic
+antimystic
+antimystical
+antimystically
+antimysticalness
+antimysticism
+antimythic
+antimythical
+Antin
+antinarcotic
+antinarcotics
+antinarrative
+antinational
+antinationalism
+Anti-nationalist
+antinationalist
+antinationalistic
+antinationalistically
+antinationalists
+antinationalization
+antinationally
+antinatural
+antinaturalism
+antinaturalist
+antinaturalistic
+antinaturally
+antinaturalness
+anti-nebraska
+anti-Negro
+antinegro
+anti-Negroes
+anti-Negroism
+antinegroism
+antineologian
+antineoplastic
+antinephritic
+antinepotic
+antineuralgic
+antineuritic
+antineurotoxin
+antineutral
+antineutralism
+antineutrality
+antineutrally
+antineutrino
+antineutrinos
+antineutron
+antineutrons
+anting
+antinganting
+antings
+antinial
+anti-nicaean
+antinicotine
+antinihilism
+Anti-nihilist
+antinihilist
+antinihilistic
+antinion
+Anti-noahite
+antinodal
+antinode
+antinodes
+antinoise
+antinome
+antinomian
+antinomianism
+antinomians
+antinomic
+antinomical
+antinomies
+antinomist
+antinomy
+antinoness
+Anti-nordic
+anti-Nordic
+antinormal
+antinormality
+antinormalness
+Antinos
+antinosarian
+Antinous
+anti-novel
+antinovel
+anti-novelist
+antinovelist
+antinovels
+antinucleon
+antinucleons
+antinuke
+antiobesity
+Antioch
+Antiochene
+Antiochian
+Antiochianism
+Antiochus
+antiodont
+anti-odontalgic
+antiodontalgic
+Antiope
+antiopelmous
+anti-open-shop
+antiophthalmic
+antiopium
+antiopiumist
+antiopiumite
+antioptimism
+antioptimist
+antioptimistic
+antioptimistical
+antioptimistically
+antioptionist
+anti-orgastic
+antiorgastic
+Anti-oriental
+anti-Oriental
+anti-Orientalism
+anti-Orientalist
+antiorthodox
+antiorthodoxly
+antiorthodoxy
+anti-over
+antioxidant
+antioxidants
+antioxidase
+antioxidizer
+antioxidizing
+antioxygen
+antioxygenating
+antioxygenation
+antioxygenator
+antioxygenic
+antiozonant
+antipacifism
+antipacifist
+antipacifistic
+antipacifists
+antipapacy
+antipapal
+antipapalist
+antipapism
+antipapist
+antipapistic
+antipapistical
+antiparabema
+antiparabemata
+antiparagraphe
+antiparagraphic
+antiparallel
+antiparallelogram
+antiparalytic
+antiparalytical
+antiparasitic
+antiparasitical
+antiparasitically
+antiparastatitis
+antiparliament
+antiparliamental
+antiparliamentarian
+antiparliamentarians
+antiparliamentarist
+antiparliamentary
+antiparliamenteer
+antipart
+antiparticle
+antiparticles
+Antipas
+Antipasch
+Antipascha
+antipass
+antipasti
+antipastic
+antipasto
+antipastos
+Antipater
+Antipatharia
+antipatharian
+antipathetic
+antipathetical
+antipathetically
+antipatheticalness
+antipathic
+Antipathida
+antipathies
+antipathist
+antipathize
+antipathogen
+antipathogene
+antipathogenic
+antipathy
+antipatriarch
+antipatriarchal
+antipatriarchally
+antipatriarchy
+antipatriot
+antipatriotic
+antipatriotically
+antipatriotism
+Anti-paul
+Anti-pauline
+antipedal
+Antipedobaptism
+Antipedobaptist
+antipeduncular
+Anti-pelagian
+antipellagric
+antipendium
+antipepsin
+antipeptone
+antiperiodic
+antiperistalsis
+antiperistaltic
+antiperistasis
+antiperistatic
+antiperistatical
+antiperistatically
+antipersonnel
+antiperspirant
+antiperspirants
+antiperthite
+antipestilence
+antipestilent
+antipestilential
+antipestilently
+antipetalous
+antipewism
+antiphagocytic
+antipharisaic
+antipharmic
+Antiphas
+antiphase
+Antiphates
+Anti-philippizing
+antiphilosophic
+antiphilosophical
+antiphilosophically
+antiphilosophies
+antiphilosophism
+antiphilosophy
+antiphlogistian
+antiphlogistic
+antiphlogistin
+antiphon
+antiphona
+antiphonal
+antiphonally
+antiphonaries
+antiphonary
+antiphoner
+antiphonetic
+antiphonic
+antiphonical
+antiphonically
+antiphonies
+antiphonon
+antiphons
+antiphony
+antiphrases
+antiphrasis
+antiphrastic
+antiphrastical
+antiphrastically
+antiphthisic
+antiphthisical
+Antiphus
+antiphylloxeric
+antiphysic
+antiphysical
+antiphysically
+antiphysicalness
+antiphysician
+antipill
+antiplague
+antiplanet
+antiplastic
+antiplatelet
+anti-Plato
+Anti-platonic
+anti-Platonic
+anti-Platonically
+anti-Platonism
+anti-Platonist
+antipleion
+antiplenist
+antiplethoric
+antipleuritic
+antiplurality
+antipneumococcic
+antipodagric
+antipodagron
+antipodal
+antipode
+antipodean
+antipodeans
+Antipodes
+antipodes
+antipodic
+antipodism
+antipodist
+Antipoenus
+antipoetic
+antipoetical
+antipoetically
+antipoints
+antipolar
+antipole
+antipolemist
+antipoles
+antipolice
+Anti-polish
+anti-Polish
+antipolitical
+antipolitically
+antipolitics
+antipollution
+antipolo
+antipolygamy
+antipolyneuritic
+antipool
+antipooling
+antipope
+antipopery
+antipopes
+antipopular
+antipopularization
+antipopulationist
+antipopulism
+anti-Populist
+antipornographic
+antipornography
+antiportable
+antiposition
+antipot
+antipoverty
+antipragmatic
+antipragmatical
+antipragmatically
+antipragmaticism
+antipragmatism
+antipragmatist
+antiprecipitin
+antipredeterminant
+anti-pre-existentiary
+antiprelate
+antiprelatic
+antiprelatism
+antiprelatist
+antipreparedness
+antiprestidigitation
+antipriest
+antipriestcraft
+antipriesthood
+antiprime
+antiprimer
+antipriming
+antiprinciple
+antiprism
+antiproductionist
+antiproductive
+antiproductively
+antiproductiveness
+antiproductivity
+antiprofiteering
+antiprogressive
+antiprohibition
+antiprohibitionist
+antiprojectivity
+antiprophet
+antiprostate
+antiprostatic
+antiprostitution
+antiprotease
+antiproteolysis
+Anti-protestant
+anti-Protestant
+anti-Protestantism
+antiproton
+antiprotons
+antiprotozoal
+antiprudential
+antipruritic
+antipsalmist
+antipsoric
+antipsychiatry
+antipsychotic
+antiptosis
+antipudic
+anti-Puritan
+antipuritan
+anti-Puritanism
+Antipus
+antiputrefaction
+antiputrefactive
+antiputrescent
+antiputrid
+antipyic
+antipyics
+antipyonin
+antipyresis
+antipyretic
+antipyretics
+antipyrin
+Antipyrine
+antipyrine
+antipyrotic
+antipyryl
+antiq
+antiq.
+antiqua
+antiquarian
+antiquarianism
+antiquarianize
+antiquarianly
+antiquarians
+antiquaries
+antiquarism
+antiquarium
+antiquartan
+antiquary
+antiquate
+antiquated
+antiquatedness
+antiquates
+antiquating
+antiquation
+antique
+antiqued
+antiquely
+antiqueness
+antiquer
+antiquers
+antiques
+antiquing
+antiquist
+antiquitarian
+antiquities
+antiquity
+antiquum
+antirabic
+antirabies
+antiracemate
+antiracer
+antirachitic
+antirachitically
+antiracial
+antiracially
+antiracing
+antiracism
+antiracketeering
+antiradiant
+antiradiating
+antiradiation
+antiradical
+antiradicalism
+antiradically
+antiradicals
+antirailwayist
+antirape
+antirational
+antirationalism
+antirationalist
+antirationalistic
+antirationality
+antirationally
+antirattler
+antireacting
+antireaction
+antireactionaries
+antireactionary
+antireactive
+antirealism
+antirealist
+antirealistic
+antirealistically
+antireality
+antirebating
+antirecession
+antirecruiting
+antired
+antiredeposition
+antireducer
+antireducing
+antireduction
+antireductive
+antireflexive
+antireform
+antireformer
+antireforming
+antireformist
+antireligion
+antireligionist
+antireligiosity
+antireligious
+antireligiously
+Antiremonstrant
+antiremonstrant
+antirennet
+antirennin
+antirent
+antirenter
+antirentism
+Anti-republican
+antirepublican
+antirepublicanism
+antireservationist
+antiresonance
+antiresonator
+antirestoration
+antireticular
+antirevisionist
+antirevolution
+antirevolutionaries
+antirevolutionary
+antirevolutionist
+antirheumatic
+antiricin
+antirickets
+antiriot
+antiritual
+antiritualism
+antiritualist
+antiritualistic
+antirobbery
+antirobin
+antiroll
+Anti-roman
+anti-Roman
+anti-roman
+antiromance
+Anti-romanist
+anti-Romanist
+antiromantic
+antiromanticism
+antiromanticist
+antiroyal
+antiroyalism
+antiroyalist
+Antirrhinum
+antirrhinum
+antirumor
+antirun
+Anti-ruskinian
+anti-Russia
+Anti-russian
+anti-Russian
+antirust
+antirusts
+antis
+Anti-sabbatarian
+antisabbatarian
+Anti-sabian
+antisacerdotal
+antisacerdotalist
+antisag
+antisaloon
+antisalooner
+Antisana
+antisavage
+Anti-saxonism
+antiscabious
+antiscale
+anti-Scandinavia
+antisceptic
+antisceptical
+antiscepticism
+antischolastic
+antischolastically
+antischolasticism
+antischool
+antiscia
+antiscians
+antiscience
+antiscientific
+antiscientifically
+antiscii
+antiscion
+antiscolic
+antiscorbutic
+antiscorbutical
+Anti-scriptural
+antiscriptural
+anti-Scripture
+Anti-scripturism
+antiscripturism
+Anti-scripturist
+anti-Scripturist
+antiscrofulous
+antisegregation
+antiseismic
+antiselene
+Anti-semite
+anti-Semite
+anti-semite
+antisemite
+Anti-semitic
+anti-Semitic
+antisemitic
+Anti-semitically
+Anti-semitism
+anti-Semitism
+antisemitism
+antisensitivity
+antisensitizer
+antisensitizing
+antisensuality
+antisensuous
+antisensuously
+antisensuousness
+antisepalous
+antisepsin
+antisepsis
+antiseptic
+antiseptical
+antiseptically
+antisepticise
+antisepticised
+antisepticising
+antisepticism
+antisepticist
+antisepticize
+antisepticized
+antisepticizing
+antiseptics
+antiseption
+antiseptize
+antisera
+Anti-serb
+anti-Serb
+antiserum
+antiserums
+antiserumsera
+antisex
+antisexist
+antisexual
+Anti-shelleyan
+Anti-shemite
+Anti-shemitic
+Anti-shemitism
+antiship
+antishipping
+antishoplifting
+Antisi
+antisialagogue
+antisialic
+antisiccative
+antisideric
+antisilverite
+antisimoniacal
+antisine
+antisiphon
+antisiphonal
+antiskeptic
+antiskeptical
+antiskepticism
+antiskid
+antiskidding
+Anti-slav
+anti-Slav
+antislavery
+antislaveryism
+anti-Slavic
+antislickens
+antislip
+Anti-slovene
+antismog
+antismoking
+antismuggling
+antismut
+antisnapper
+antisnob
+antisocial
+antisocialist
+antisocialistic
+antisocialistically
+antisociality
+antisocially
+Anti-socinian
+anti-Socrates
+anti-Socratic
+antisolar
+antisophism
+antisophist
+antisophistic
+antisophistication
+antisophistry
+antisoporific
+Anti-soviet
+anti-Soviet
+antispace
+antispadix
+anti-Spain
+Anti-spanish
+anti-Spanish
+antispasis
+antispasmodic
+antispasmodics
+antispast
+antispastic
+antispectroscopic
+antispeculation
+antispending
+antispermotoxin
+antispiritual
+antispiritualism
+antispiritualist
+antispiritualistic
+antispiritually
+antispirochetic
+antisplasher
+antisplenetic
+antisplitting
+antispreader
+antispreading
+antisquama
+antisquatting
+antistadholder
+antistadholderian
+antistalling
+antistaphylococcic
+antistat
+antistate
+antistater
+antistatic
+antistatism
+antistatist
+antisteapsin
+antisterility
+antistes
+Antisthenes
+antistimulant
+antistimulation
+antistock
+antistreptococcal
+antistreptococcic
+antistreptococcin
+antistreptococcus
+antistrike
+antistriker
+antistrophal
+antistrophe
+antistrophic
+antistrophically
+antistrophize
+antistrophon
+antistrumatic
+antistrumous
+antistudent
+antisubmarine
+antisubstance
+antisubversion
+antisubversive
+antisudoral
+antisudorific
+antisuffrage
+antisuffragist
+antisuicide
+antisun
+antisupernatural
+antisupernaturalism
+antisupernaturalist
+antisupernaturalistic
+antisurplician
+anti-Sweden
+anti-Swedish
+antisymmetric
+antisymmetrical
+antisymmetry
+antisyndicalism
+antisyndicalist
+antisyndication
+antisynod
+antisyphilitic
+antisyphillis
+antitabetic
+antitabloid
+antitangent
+antitank
+antitarnish
+antitarnishing
+antitartaric
+antitax
+antitaxation
+antitechnological
+antitechnology
+antiteetotalism
+antitegula
+antitemperance
+antiterrorism
+antiterrorist
+antitetanic
+antitetanolysin
+Anti-teuton
+anti-Teuton
+Anti-teutonic
+anti-Teutonic
+antithalian
+antitheft
+antitheism
+antitheist
+antitheistic
+antitheistical
+antitheistically
+antithenar
+antitheologian
+antitheological
+antitheologizing
+antitheology
+antithermic
+antithermin
+antitheses
+antithesis
+antithesism
+antithesize
+antithet
+antithetic
+antithetical
+antithetically
+antithetics
+antithrombic
+antithrombin
+antithyroid
+antitintinnabularian
+antitobacco
+antitobacconal
+antitobacconist
+antitonic
+antitorpedo
+antitotalitarian
+antitoxic
+antitoxin
+antitoxine
+antitoxins
+anti-trade
+antitrade
+antitrades
+antitradition
+antitraditional
+antitraditionalist
+antitraditionally
+antitragal
+antitragi
+antitragic
+antitragicus
+antitragus
+Anti-tribonian
+Anti-trinitarian
+anti-Trinitarian
+antitrinitarian
+anti-Trinitarianism
+antitrismus
+antitrochanter
+antitropal
+antitrope
+antitropic
+antitropical
+antitropous
+antitropy
+antitrust
+antitruster
+antitrypsin
+antitryptic
+antitubercular
+antituberculin
+antituberculosis
+antituberculotic
+antituberculous
+antitumor
+antitumoral
+Anti-turkish
+anti-Turkish
+antiturnpikeism
+antitussive
+antitwilight
+antitypal
+antitype
+antitypes
+antityphoid
+antitypic
+antitypical
+antitypically
+antitypous
+antitypy
+antityrosinase
+antiuating
+antiulcer
+antiunemployment
+antiunion
+antiunionist
+Anti-unitarian
+antiuniversity
+antiuratic
+antiurban
+antiurease
+antiusurious
+antiutilitarian
+antiutilitarianism
+antivaccination
+antivaccinationist
+antivaccinator
+antivaccinist
+antivandalism
+antivariolous
+antivenefic
+antivenene
+antivenereal
+antivenin
+antivenine
+antivenins
+Anti-venizelist
+antivenom
+antivenomous
+antivermicular
+antivibrating
+antivibrator
+antivibratory
+antivice
+antiviolence
+antiviral
+antivirotic
+antivirus
+antivitalist
+antivitalistic
+antivitamin
+antivivisection
+antivivisectionist
+antivivisectionists
+antivolition
+Anti-volstead
+Anti-volsteadian
+antiwar
+antiwarlike
+antiwaste
+antiwear
+antiwedge
+antiweed
+Anti-whig
+antiwhite
+antiwhitism
+antiwiretapping
+antiwit
+antiwoman
+antiworld
+anti-worlds
+Anti-wycliffist
+Anti-wycliffite
+antixerophthalmic
+antizealot
+Anti-zionism
+anti-Zionism
+Anti-zionist
+anti-Zionist
+antizoea
+Anti-zwinglian
+antizymic
+antizymotic
+antjar
+antler
+antlered
+antlerite
+antlerless
+Antlers
+antlers
+Antlia
+antlia
+Antliae
+antliate
+Antlid
+antlike
+antling
+antlion
+antlions
+antlophobia
+antluetic
+Antntonioni
+antocular
+antodontalgic
+antoeci
+antoecian
+antoecians
+Antofagasta
+Antoine
+Antoinetta
+Antoinette
+antoinette
+Anton
+Antonchico
+Antone
+Antonella
+Antonescu
+Antonet
+Antonetta
+Antoni
+Antonia
+Antonie
+Antonietta
+Antonin
+Antonina
+antoniniani
+antoninianus
+Antonino
+Antoninus
+Antonio
+antonio
+Antonito
+Antonius
+antonomasia
+antonomastic
+antonomastical
+antonomastically
+antonomasy
+Antonovich
+antonovics
+Antons
+Antony
+antony
+antonym
+antonymic
+antonymies
+antonymous
+antonyms
+antonymy
+Antony-over
+antorbital
+antozone
+antozonite
+ant-pipit
+antproof
+antra
+antral
+antralgia
+antre
+antrectomy
+antres
+Antrim
+antrin
+antritis
+antrocele
+antronasal
+antrophore
+antrophose
+antrorse
+antrorsely
+antroscope
+antroscopy
+Antrostomus
+antrotome
+antrotomy
+antrotympanic
+antrotympanitis
+antroversion
+antrovert
+antrum
+antrums
+antrustion
+antrustionship
+ants
+antship
+antshrike
+antsier
+antsiest
+antsigne
+Antsirane
+antsy
+antsy-pantsy
+ant-thrush
+antthrush
+ANTU
+Antu
+antu
+Antum
+Antung
+Antwerp
+antwerp
+Antwerpen
+antwise
+ANU
+Anu
+anubin
+anubing
+Anubis
+anucleate
+anucleated
+anukabiet
+Anukit
+anuloma
+Anunaki
+anunder
+Anunnaki
+Anura
+anura
+Anuradhapura
+Anurag
+anural
+anuran
+anurans
+anureses
+anuresis
+anuretic
+anuria
+anurias
+anuric
+anurous
+anury
+anus
+anuses
+anusim
+Anuska
+anusvara
+anutraminosa
+anvasser
+Anvers
+Anvik
+anvil
+anvil-drilling
+anviled
+anvil-faced
+anvil-facing
+anvil-headed
+anviling
+anvilled
+anvilling
+anvils
+anvilsmith
+anviltop
+anviltops
+anxieties
+anxietude
+anxiety
+anxiolytic
+anxious
+anxiously
+anxiousness
+Any
+any
+Anya
+Anyah
+Anyang
+anybodies
+anybody
+anybody'd
+anybodyd
+Anychia
+anyhow
+any-kyn
+anymore
+anyone
+anyplace
+Anystidae
+anything
+anythingarian
+anythingarianism
+anythings
+anytime
+anyway
+anyways
+anywhen
+anywhence
+anywhere
+anywhereness
+anywheres
+anywhither
+anywhy
+anywise
+anywither
+Anza
+Anzac
+anzac
+Anzanian
+Anzanite
+Anzengruber
+Anzio
+Anzovin
+ANZUS
+A/O
+AO
+Ao
+AOA
+aob
+AOCS
+Aoede
+aogiri
+Aoide
+Aoife
+A-OK
+Aoki
+AOL
+aoli
+Aomori
+aonach
+A-one
+Aonian
+aonian
+AOP
+AOPA
+AOQ
+aor
+Aorangi
+aorist
+aoristic
+aoristically
+aorists
+Aornis
+Aornum
+aorta
+aortae
+aortal
+aortarctia
+aortas
+aortectasia
+aortectasis
+aortic
+aorticorenal
+aortism
+aortitis
+aortoclasia
+aortoclasis
+aortographic
+aortographies
+aortography
+aortoiliac
+aortolith
+aortomalacia
+aortomalaxis
+aortopathy
+aortoptosia
+aortoptosis
+aortorrhaphy
+aortosclerosis
+aortostenosis
+aortotomy
+AOS
+aosmic
+AOSS
+Aosta
+Aotea
+Aotearoa
+Aotes
+Aotus
+AOU
+aouad
+aouads
+aoudad
+aoudads
+Aouellimiden
+Aoul
+AOW
+A&P
+A/P
+AP
+Ap
+a.p.
+ap
+ap-
+APA
+apa
+apabhramsa
+apace
+Apache
+apache
+Apaches
+apaches
+Apachette
+apachism
+apachite
+apadana
+apaesthesia
+apaesthetic
+apaesthetize
+apaestically
+apagoge
+apagoges
+apagogic
+apagogical
+apagogically
+apagogue
+apaid
+apair
+apaise
+Apalachee
+Apalachicola
+Apalachin
+apalit
+Apama
+apanage
+apanaged
+apanages
+apanaging
+apandry
+Apanteles
+Apantesis
+apanthropia
+apanthropy
+apar
+apar-
+Aparai
+aparaphysate
+aparavidya
+apardon
+aparejo
+aparejos
+Apargia
+aparithmesis
+Aparri
+apart
+apartado
+Apartheid
+apartheid
+apartheids
+aparthrosis
+apartment
+apartmental
+apartments
+apartness
+apasote
+apass
+apast
+apastra
+apastron
+apasttra
+apatan
+Apatela
+apatetic
+apathaton
+apatheia
+apathetic
+apathetical
+apathetically
+apathia
+apathic
+apathies
+apathism
+apathist
+apathistical
+apathize
+apathogenic
+Apathus
+apathy
+apatite
+apatites
+Apatornis
+Apatosaurus
+apatosaurus
+Apaturia
+apay
+Apayao
+APB
+APC
+APDA
+APDU
+APE
+ape
+apeak
+apectomy
+aped
+apedom
+apeek
+ape-headed
+apehood
+apeiron
+apeirophobia
+apel-
+Apeldoorn
+apelet
+apelike
+apeling
+Apelles
+apelles
+apellous
+ape-man
+apeman
+Apemantus
+ape-men
+Apemius
+Apemosyne
+apen-
+Apennine
+Apennines
+apennines
+apenteric
+Apepi
+apepsia
+apepsinia
+apepsy
+apeptic
+aper
+aper-
+aperch
+apercu
+apercus
+aperea
+aperient
+aperients
+aperies
+aperiodic
+aperiodically
+aperiodicity
+aperispermic
+aperistalsis
+aperitif
+aperitifs
+aperitive
+apers
+apersee
+apert
+apertion
+apertly
+apertness
+apertometer
+apertum
+apertural
+aperture
+apertured
+apertures
+Aperu
+aperu
+aperulosid
+apery
+apes
+apesthesia
+apesthetic
+apesthetize
+apet-
+Apetalae
+apetalies
+apetaloid
+apetalose
+apetalous
+apetalousness
+apetaly
+apex
+apexed
+apexes
+apexing
+Apfel
+Apfelstadt
+APG
+Apgar
+aph
+aph-
+aphacia
+aphacial
+aphacic
+aphaeresis
+aphaeretic
+aphagia
+aphagias
+aphakia
+aphakial
+aphakic
+Aphanapteryx
+Aphanes
+aphanesite
+Aphaniptera
+aphaniptera
+aphanipterous
+aphanisia
+aphanisis
+aphanite
+aphanites
+aphanitic
+aphanitism
+Aphanomyces
+aphanophyre
+aphanozygous
+Aphareus
+Apharsathacites
+aphasia
+aphasiac
+aphasiacs
+aphasias
+aphasic
+aphasics
+aphasiology
+Aphelandra
+Aphelenchus
+aphelia
+aphelian
+aphelilia
+aphelilions
+Aphelinus
+aphelion
+apheliotropic
+apheliotropically
+apheliotropism
+Aphelops
+aphemia
+aphemic
+aphengescope
+aphengoscope
+aphenoscope
+apheresis
+apheretic
+apheses
+aphesis
+Aphesius
+apheta
+aphetic
+aphetically
+aphetism
+aphetize
+aphicidal
+aphicide
+aphid
+Aphidas
+aphides
+aphidian
+aphidians
+aphidicide
+aphidicolous
+aphidid
+Aphididae
+Aphidiinae
+aphidious
+Aphidius
+aphidivorous
+aphid-lion
+aphidlion
+aphidolysin
+aphidophagous
+aphidozer
+aphids
+aphilanthropy
+Aphis
+aphis
+aphis-lion
+aphislion
+aphizog
+aphlaston
+aphlebia
+aphlogistic
+aphnology
+aphodal
+aphodi
+aphodian
+Aphodius
+aphodus
+apholate
+apholates
+aphonia
+aphonias
+aphonic
+aphonics
+aphonous
+aphony
+aphoria
+aphorise
+aphorised
+aphoriser
+aphorises
+aphorising
+aphorism
+aphorismatic
+aphorismer
+aphorismic
+aphorismical
+aphorismos
+aphorisms
+aphorist
+aphoristic
+aphoristical
+aphoristically
+aphorists
+aphorize
+aphorized
+aphorizer
+aphorizes
+aphorizing
+Aphoruridae
+aphotaxis
+aphotic
+aphototactic
+aphototaxis
+aphototropic
+aphototropism
+Aphra
+aphrasia
+aphrite
+aphrizite
+aphrodesiac
+aphrodisia
+aphrodisiac
+aphrodisiacal
+aphrodisiacs
+aphrodisian
+aphrodisiomania
+aphrodisiomaniac
+aphrodisiomaniacal
+Aphrodision
+Aphrodistic
+Aphrodite
+aphrodite
+Aphroditeum
+aphroditic
+Aphroditidae
+aphroditous
+Aphrogeneia
+aphrolite
+aphronia
+aphronitre
+aphrosiderite
+aphtha
+aphthae
+Aphthartodocetae
+Aphthartodocetic
+Aphthartodocetism
+aphthic
+aphthitalite
+aphthoid
+aphthong
+aphthongal
+aphthongia
+aphthonite
+aphthous
+aphydrotropic
+aphydrotropism
+aphyllies
+aphyllose
+aphyllous
+aphylly
+aphyric
+API
+Apia
+Apiaca
+Apiaceae
+apiaceous
+Apiales
+apian
+Apianus
+apiararies
+apiarian
+apiarians
+apiaries
+apiarist
+apiarists
+apiary
+apiator
+apicad
+apical
+apically
+apicals
+Apicella
+apices
+apicial
+Apician
+apician
+apicifixed
+apicilar
+apicillary
+apicitis
+apickaback
+apickback
+apickpack
+apico-alveolar
+apico-dental
+apicoectomy
+apicolysis
+APICS
+apicula
+apicular
+apiculate
+apiculated
+apiculation
+apiculi
+apicultural
+apiculture
+apiculturist
+apiculus
+Apidae
+apiece
+a-pieces
+apieces
+Apiezon
+apigenin
+apii
+apiin
+apikores
+apikoros
+apikorsim
+apilary
+apili
+apimania
+apimanias
+Apina
+Apinae
+Apinage
+a-pinch
+apinch
+aping
+apinoid
+apio
+Apioceridae
+apiocrinite
+apioid
+apioidal
+apiol
+apiole
+apiolin
+apiologies
+apiologist
+apiology
+apionol
+Apios
+apiose
+Apiosoma
+apiphobia
+Apis
+apis
+apish
+apishamore
+apishly
+apishness
+apism
+Apison
+apitong
+apitpat
+Apium
+apium
+apivorous
+APJ
+apjohnite
+Apl
+apl
+aplace
+aplacental
+Aplacentalia
+Aplacentaria
+Aplacophora
+aplacophoran
+aplacophorous
+aplanat
+aplanatic
+aplanatically
+aplanatism
+Aplanobacter
+aplanogamete
+aplanospore
+aplasia
+aplasias
+aplastic
+Aplectrum
+a-plenty
+aplenty
+Aplington
+aplite
+aplites
+aplitic
+aplobasalt
+aplodiorite
+Aplodontia
+Aplodontiidae
+aplomb
+aplombs
+aplome
+Aplopappus
+aploperistomatous
+aplostemonous
+aplotaxene
+aplotomy
+Apluda
+aplustra
+aplustre
+aplustria
+Aplysia
+APM
+apnea
+apneal
+apneas
+apneic
+apneumatic
+apneumatosis
+Apneumona
+apneumonous
+apneusis
+apneustic
+apnoea
+apnoeal
+apnoeas
+apnoeic
+APO
+Apo
+apo-
+apoaconitine
+apoapsides
+apoapsis
+apoatropine
+apobiotic
+apoblast
+Apoc
+Apoc.
+apocaffeine
+Apocalypse
+apocalypse
+apocalypses
+apocalypst
+apocalypt
+apocalyptic
+apocalyptical
+apocalyptically
+apocalypticism
+apocalyptism
+apocalyptist
+apocamphoric
+apocarp
+apocarpies
+apocarpous
+apocarps
+apocarpy
+apocatastasis
+apocatastatic
+apocatharsis
+apocathartic
+apocenter
+apocentre
+apocentric
+apocentricity
+apocha
+apochae
+apocholic
+apochromat
+apochromatic
+apochromatism
+apocinchonine
+apocodeine
+apocopate
+apocopated
+apocopating
+apocopation
+apocope
+apocopes
+apocopic
+Apocr
+apocrenic
+apocrine
+apocrisiary
+Apocrita
+apocrustic
+apocryph
+Apocrypha
+apocrypha
+apocryphal
+apocryphalist
+apocryphally
+apocryphalness
+apocryphate
+apocryphon
+Apocynaceae
+apocynaceous
+apocyneous
+apocynthion
+apocynthions
+Apocynum
+apocyte
+apod
+Apoda
+apodal
+apodan
+apodedeipna
+apodeictic
+apodeictical
+apodeictically
+apodeipna
+apodeipnon
+apodeixis
+apodema
+apodemal
+apodemas
+apodemata
+apodematal
+apodeme
+Apodes
+Apodia
+apodia
+apodiabolosis
+apodictic
+apodictical
+apodictically
+apodictive
+Apodidae
+apodioxis
+Apodis
+apodixis
+apodoses
+apodosis
+apodous
+apods
+apodyteria
+apodyterium
+apoembryony
+apoenzyme
+apofenchene
+apoferritin
+apogaeic
+apogaic
+apogalacteum
+apogamic
+apogamically
+apogamies
+apogamous
+apogamously
+apogamy
+apogeal
+apogean
+apogee
+apogees
+apogeic
+apogenous
+apogeny
+apogeotropic
+apogeotropically
+apogeotropism
+Apogon
+apogonid
+Apogonidae
+apograph
+apographal
+apographic
+apographical
+apoharmine
+apohyal
+Apoidea
+apoikia
+apoious
+apoise
+apojove
+apokatastasis
+apokatastatic
+apokrea
+apokreos
+apolar
+apolarity
+apolaustic
+A-pole
+apolegamic
+Apolista
+Apolistan
+apolitical
+apolitically
+Apollinaire
+Apollinarian
+apollinarian
+Apollinarianism
+Apollinaris
+Apolline
+apollinian
+Apollo
+apollo
+Apollon
+Apollonia
+Apollonian
+apollonian
+Apollonic
+apollonicon
+Apollonistic
+Apollonius
+Apollos
+apollos
+Apolloship
+Apollus
+Apollyon
+apollyon
+apolog
+apologal
+apologer
+apologete
+apologetic
+apologetical
+apologetically
+apologetics
+apologia
+apologiae
+apologias
+apological
+apologies
+apologise
+apologised
+apologiser
+apologising
+apologist
+apologists
+apologize
+apologized
+apologizer
+apologizers
+apologizes
+apologizing
+apologs
+apologue
+apologues
+apology
+apolousis
+apolune
+apolunes
+apolusis
+Apolysin
+apolysis
+apolytikion
+apomecometer
+apomecometry
+apometabolic
+apometabolism
+apometabolous
+apometaboly
+apomict
+apomictic
+apomictical
+apomictically
+apomicts
+apomixes
+apomixis
+apomorphia
+apomorphin
+apomorphine
+Apomyius
+aponeurology
+aponeurorrhaphy
+aponeuroses
+aponeurosis
+aponeurositis
+aponeurotic
+aponeurotome
+aponeurotomy
+aponia
+aponic
+Aponogeton
+Aponogetonaceae
+aponogetonaceous
+a-poop
+apoop
+apopemptic
+apopenptic
+apopetalous
+apophantic
+apophasis
+apophatic
+Apophis
+apophlegm
+apophlegmatic
+apophlegmatism
+apophonia
+apophonic
+apophonies
+apophony
+apophorometer
+apophthegm
+apophthegmatic
+apophthegmatical
+apophthegmatist
+apophyeeal
+apophyge
+apophyges
+apophylactic
+apophylaxis
+apophyllite
+apophyllous
+apophysary
+apophysate
+apophyseal
+apophyses
+apophysial
+apophysis
+apophysitis
+Apopka
+apoplasmodial
+apoplastogamous
+apoplectic
+apoplectical
+apoplectically
+apoplectiform
+apoplectoid
+apoplex
+apoplexies
+apoplexious
+apoplexy
+apopyle
+apoquinamine
+apoquinine
+aporetic
+aporetical
+aporhyolite
+aporia
+aporiae
+aporias
+Aporobranchia
+aporobranchian
+Aporobranchiata
+Aporocactus
+Aporosa
+aporose
+aporphin
+aporphine
+Aporrhaidae
+Aporrhais
+aporrhaoid
+aporrhea
+aporrhegma
+aporrhiegma
+aporrhoea
+aport
+aportlast
+aportoise
+aposafranine
+aposaturn
+aposaturnium
+aposelene
+aposematic
+aposematically
+aposepalous
+aposia
+aposiopeses
+aposiopesis
+aposiopestic
+aposiopetic
+apositia
+apositic
+aposoro
+aposporic
+apospories
+aposporogony
+aposporous
+apospory
+apostacies
+apostacize
+apostacy
+apostasies
+apostasis
+apostasy
+apostate
+apostates
+apostatic
+apostatical
+apostatically
+apostatise
+apostatised
+apostatising
+apostatism
+apostatize
+apostatized
+apostatizes
+apostatizing
+apostaxis
+apostem
+apostemate
+apostematic
+apostemation
+apostematous
+aposteme
+aposteriori
+aposthia
+aposthume
+apostil
+apostille
+apostils
+apostle
+apostlehood
+Apostles
+apostles
+apostleship
+apostleships
+apostoile
+apostolate
+apostoless
+apostoli
+Apostolian
+apostolian
+Apostolic
+apostolic
+apostolical
+apostolically
+apostolicalness
+Apostolici
+apostolicism
+apostolicity
+apostolize
+Apostolos
+apostrophal
+apostrophation
+apostrophe
+apostrophes
+apostrophi
+Apostrophia
+apostrophic
+apostrophied
+apostrophise
+apostrophised
+apostrophising
+apostrophize
+apostrophized
+apostrophizes
+apostrophizing
+apostrophus
+apostume
+Apotactic
+Apotactici
+apotactite
+apotelesm
+apotelesmatic
+apotelesmatical
+apothec
+apothecal
+apothecarcaries
+apothecaries
+apothecary
+apothecaryship
+apothece
+apotheces
+apothecia
+apothecial
+apothecium
+apothegm
+apothegmatic
+apothegmatical
+apothegmatically
+apothegmatist
+apothegmatize
+apothegms
+apothem
+apothems
+apotheose
+apotheoses
+apotheosis
+apotheosise
+apotheosised
+apotheosising
+apotheosize
+apotheosized
+apotheosizing
+apothesine
+apothesis
+apothgm
+apotihecal
+apotome
+apotracheal
+apotropaic
+apotropaically
+apotropaion
+apotropaism
+apotropous
+apoturmeric
+apotype
+apotypic
+apout
+apoxesis
+Apoxyomenos
+apozem
+apozema
+apozemical
+apozymase
+APP
+app
+app.
+appair
+appal
+Appalachia
+appalachia
+Appalachian
+appalachian
+Appalachians
+appalachians
+appale
+appall
+appalled
+appalling
+appallingly
+appallingness
+appallment
+appalls
+appalment
+Appaloosa
+appaloosa
+appaloosas
+appals
+appalto
+appanage
+appanaged
+appanages
+appanaging
+appanagist
+appar
+apparail
+apparance
+apparat
+apparatchik
+apparatchiki
+apparatchiks
+apparation
+apparats
+apparatus
+apparatuses
+apparel
+appareled
+appareling
+apparelled
+apparelling
+apparelment
+apparels
+apparence
+apparencies
+apparency
+apparens
+apparent
+apparentation
+apparentement
+apparentements
+apparently
+apparentness
+apparition
+apparitional
+apparitions
+apparitor
+appartement
+appassionata
+appassionatamente
+appassionate
+appassionato
+appast
+appaume
+appaumee
+appay
+APPC
+appd
+appeach
+appeacher
+appeachment
+appeal
+appealability
+appealable
+appealed
+appealer
+appealers
+appealing
+appealingly
+appealingness
+appeals
+appear
+appearance
+appearanced
+appearances
+appeared
+appearer
+appearers
+appearing
+appears
+appeasable
+appeasableness
+appeasably
+appease
+appeased
+appeasement
+appeasements
+appeaser
+appeasers
+appeases
+appeasing
+appeasingly
+appeasive
+Appel
+appel
+appellability
+appellable
+appellancy
+appellant
+appellants
+appellate
+appellation
+appellational
+appellations
+appellative
+appellatived
+appellatively
+appellativeness
+appellatory
+appellee
+appellees
+appellor
+appellors
+appels
+appenage
+append
+appendage
+appendaged
+appendages
+appendalgia
+appendance
+appendancy
+appendant
+appendectomies
+appendectomy
+appended
+appendence
+appendency
+appendent
+appender
+appenders
+appendical
+appendicalgia
+appendicate
+appendice
+appendiceal
+appendicectasis
+appendicectomies
+appendicectomy
+appendices
+appendicial
+appendicious
+appendicitis
+appendicle
+appendicocaecostomy
+appendico-enterostomy
+appendicostomy
+appendicular
+Appendicularia
+appendicularian
+Appendiculariidae
+Appendiculata
+appendiculate
+appendiculated
+appending
+appenditious
+appendix
+appendixed
+appendixes
+appendixing
+appendorontgenography
+appendotome
+appends
+appennage
+appense
+appentice
+Appenzell
+appenzell
+apperceive
+apperceived
+apperceiving
+apperception
+apperceptionism
+apperceptionist
+apperceptionistic
+apperceptive
+apperceptively
+appercipient
+appere
+apperil
+appersonation
+appersonification
+appert
+appertain
+appertained
+appertaining
+appertainment
+appertains
+appertinent
+appertise
+appestat
+appestats
+appet
+appete
+appetence
+appetencies
+appetency
+appetent
+appetently
+appetibility
+appetible
+appetibleness
+appetiser
+appetising
+appetisse
+appetit
+appetite
+appetites
+appetition
+appetitional
+appetitious
+appetitive
+appetitiveness
+appetitost
+appetize
+appetized
+appetizement
+appetizer
+appetizers
+appetizing
+appetizingly
+Appia
+Appian
+appinite
+Appius
+appl
+applanate
+applanation
+applaud
+applaudable
+applaudably
+applauded
+applauder
+applauders
+applauding
+applaudingly
+applauds
+applause
+applauses
+applausive
+applausively
+Apple
+apple
+appleberry
+appleblossom
+Appleby
+applecart
+apple-cheeked
+appled
+Appledorf
+appledrane
+appledrone
+apple-eating
+apple-faced
+apple-fallow
+Applegate
+applegrower
+applejack
+applejacks
+apple-john
+applejohn
+applemonger
+applenut
+apple-pie
+apple-polish
+apple-polisher
+apple-polishing
+appleringie
+appleringy
+appleroot
+apples
+applesauce
+apple-scented
+Appleseed
+apple-shaped
+applesnits
+apple-stealing
+Appleton
+apple-twig
+applewife
+applewoman
+applewood
+appliable
+appliableness
+appliably
+appliance
+appliances
+appliant
+applicabilities
+applicability
+applicable
+applicableness
+applicably
+applicancies
+applicancy
+applicant
+applicants
+applicate
+application
+applications
+applicative
+applicatively
+applicator
+applicatorily
+applicators
+applicatory
+applied
+appliedly
+applier
+appliers
+applies
+Appling
+appling
+applique
+appliqued
+appliqueing
+appliques
+applosion
+applosive
+applot
+applotment
+apply
+applying
+applyingly
+applyment
+appmt
+appoggiatura
+appoggiaturas
+appoggiature
+appoint
+appointable
+appointe
+appointed
+appointee
+appointees
+appointer
+appointers
+appointing
+appointive
+appointively
+appointment
+appointments
+appointor
+appoints
+Appolonia
+Appomatox
+Appomattoc
+Appomattox
+appomattox
+apport
+apportion
+apportionable
+apportionate
+apportioned
+apportioner
+apportioning
+apportionment
+apportionments
+apportions
+apposability
+apposable
+appose
+apposed
+apposer
+apposers
+apposes
+apposing
+apposiopestic
+apposite
+appositely
+appositeness
+apposition
+appositional
+appositionally
+appositions
+appositive
+appositively
+apppetible
+appraisable
+appraisal
+appraisals
+appraise
+appraised
+appraisement
+appraiser
+appraisers
+appraises
+appraising
+appraisingly
+appraisive
+apprecate
+appreciable
+appreciably
+appreciant
+appreciate
+appreciated
+appreciates
+appreciating
+appreciatingly
+appreciation
+appreciational
+appreciations
+appreciativ
+appreciative
+appreciatively
+appreciativeness
+appreciator
+appreciatorily
+appreciators
+appreciatory
+appredicate
+apprehend
+apprehendable
+apprehended
+apprehender
+apprehending
+apprehendingly
+apprehends
+apprehensibility
+apprehensible
+apprehensibly
+apprehension
+apprehensions
+apprehensive
+apprehensively
+apprehensiveness
+apprehensivenesses
+apprend
+apprense
+apprentice
+apprenticed
+apprenticehood
+apprenticement
+apprentices
+apprenticeship
+apprenticeships
+apprenticing
+appress
+appressed
+appressor
+appressoria
+appressorial
+appressorium
+apprest
+appreteur
+appreve
+apprise
+apprised
+appriser
+apprisers
+apprises
+apprising
+apprizal
+apprize
+apprized
+apprizement
+apprizer
+apprizers
+apprizes
+apprizing
+appro
+approach
+approachability
+approachabl
+approachable
+approachableness
+approached
+approacher
+approachers
+approaches
+approaching
+approachless
+approachment
+approbate
+approbated
+approbating
+approbation
+approbations
+approbative
+approbativeness
+approbator
+approbatory
+apprompt
+approof
+appropinquate
+appropinquation
+appropinquity
+appropre
+appropriable
+appropriament
+appropriate
+appropriated
+appropriately
+appropriateness
+appropriates
+appropriating
+appropriation
+Appropriations
+appropriations
+appropriative
+appropriativeness
+appropriator
+appropriators
+approvability
+approvable
+approvableness
+approvably
+approval
+approvals
+approvance
+approve
+approved
+approvedly
+approvedness
+approvement
+approver
+approvers
+approves
+approving
+approvingly
+approx
+approx.
+approximable
+approximal
+approximant
+approximants
+approximate
+approximated
+approximately
+approximates
+approximating
+approximation
+approximations
+approximative
+approximatively
+approximativeness
+approximator
+Apps
+appt
+apptd
+appui
+appulse
+appulses
+appulsion
+appulsive
+appulsively
+appunctuation
+appurtenance
+appurtenances
+appurtenant
+APR
+Apr
+Apr.
+apr
+APRA
+apractic
+apraxia
+apraxias
+apraxic
+aprendiz
+apres
+Apresoline
+apreynte
+apricate
+aprication
+aprickle
+apricot
+apricot-kernal
+apricots
+April
+april
+Aprile
+Aprilesque
+Aprilette
+April-gowk
+Apriline
+Aprilis
+apriori
+apriorism
+apriorist
+aprioristic
+aprioristically
+apriority
+apritif
+Aprocta
+aproctia
+aproctous
+apron
+aproned
+aproneer
+apronful
+aproning
+apronless
+apronlike
+aprons
+apron-squire
+apron-string
+apronstring
+apropos
+aprosexia
+aprosopia
+aprosopous
+aproterodont
+aprowl
+APS
+APSA
+Apsaras
+Apsarases
+APSE
+apse
+apselaphesia
+apselaphesis
+apses
+apsid
+apsidal
+apsidally
+apsides
+apsidiole
+apsinthion
+apsis
+Apsu
+apsychia
+apsychical
+Apsyrtus
+APT
+apt
+apt.
+Aptal
+aptate
+Aptenodytes
+apter
+Aptera
+apteral
+apteran
+apteria
+apterial
+apterium
+apteroid
+apterous
+Apteryges
+apterygial
+Apterygidae
+Apterygiformes
+Apterygogenea
+Apterygota
+apterygote
+apterygotous
+apteryla
+Apteryx
+apteryx
+apteryxes
+aptest
+Apthorp
+Aptian
+Aptiana
+aptitude
+aptitudes
+aptitudinal
+aptitudinally
+aptly
+aptness
+aptnesses
+Aptos
+aptote
+aptotic
+apts
+aptyalia
+aptyalism
+aptychus
+APU
+Apul
+Apuleius
+Apulia
+Apulian
+apulmonic
+apulse
+Apure
+Apurimac
+apurpose
+Apus
+apx
+apyonin
+apyrase
+apyrases
+apyrene
+apyretic
+apyrexia
+apyrexial
+apyrexy
+apyrotype
+apyrous
+AQ
+Aq
+aq
+Aqaba
+AQL
+aqua
+aquabelle
+aquabib
+aquacade
+aquacades
+aquacultural
+aquaculture
+aquadag
+aquaduct
+aquaducts
+aquae
+aquaemanale
+aquaemanalia
+aquafer
+aquafortis
+aquafortist
+aquage
+aquagreen
+aquake
+Aqua-Lung
+aqualung
+aqualunger
+aquamanale
+aquamanalia
+aquamanile
+aquamaniles
+aquamanilia
+aquamarine
+aquamarines
+aquameter
+aquanaut
+aquanauts
+aquaphobia
+aquaplane
+aquaplaned
+aquaplaner
+aquaplanes
+aquaplaning
+aquapuncture
+aquaregia
+aquarelle
+aquarelles
+aquarellist
+aquaria
+aquarial
+Aquarian
+aquarian
+aquarians
+Aquarid
+Aquarii
+aquariia
+aquariist
+aquariiums
+aquarist
+aquarists
+aquarium
+aquariums
+Aquarius
+aquarius
+a-quarter
+aquarter
+aquas
+Aquasco
+aquascope
+aquascutum
+Aquashicola
+aquashow
+aquate
+aquatic
+aquatical
+aquatically
+aquatics
+aquatile
+aquatint
+aquatinta
+aquatinted
+aquatinter
+aquatinting
+aquatintist
+aquatints
+aquation
+aquativeness
+aquatone
+aquatones
+aquavalent
+aquavit
+aqua-vitae
+aquavits
+Aquebogue
+aqueduct
+aqueducts
+aqueity
+aquench
+aqueo-
+aqueoglacial
+aqueoigneous
+aqueomercurial
+aqueous
+aqueously
+aqueousness
+aquerne
+Aqueus
+aquiclude
+aquicolous
+aquicultural
+aquiculture
+aquiculturist
+aquifer
+aquiferous
+aquifers
+Aquifoliaceae
+aquifoliaceous
+aquiform
+aquifuge
+Aquila
+aquila
+Aquilae
+Aquilaria
+aquilawood
+aquilege
+Aquilegia
+aquilegia
+Aquileia
+aquilia
+Aquilian
+Aquilid
+aquiline
+aquiline-nosed
+aquilinity
+aquilino
+Aquilla
+Aquilo
+aquilon
+Aquinas
+aquinas
+aquincubital
+aquincubitalism
+Aquinist
+aquintocubital
+aquintocubitalism
+aquiparous
+Aquitaine
+Aquitania
+Aquitanian
+a-quiver
+aquiver
+aquo
+aquocapsulitis
+aquocarbonic
+aquocellolitis
+aquo-ion
+Aquone
+aquopentamminecobaltic
+aquose
+aquosity
+aquotization
+aquotize
+-ar
+AR
+Ar
+Ar.
+a.r.
+ar
+ar-
+ar.
+ARA
+Ara
+ara
+Arab
+Arab.
+arab
+araba
+araban
+arabana
+Arabeila
+Arabel
+Arabela
+Arabele
+Arabella
+Arabelle
+arabesk
+arabesks
+Arabesque
+arabesque
+arabesquely
+arabesquerie
+arabesques
+Arabi
+Arabia
+arabia
+Arabian
+arabian
+Arabianize
+arabians
+Arabic
+arabic
+arabica
+Arabicism
+Arabicize
+arabicize
+Arabidopsis
+arability
+arabin
+arabine
+arabinic
+arabinose
+arabinosic
+arabinoside
+Arabis
+arabis
+Arabism
+Arabist
+arabist
+arabit
+arabite
+arabitol
+arabiyeh
+Arabize
+arabize
+arabized
+arabizes
+arabizing
+arable
+arables
+Arabo-byzantine
+Arabophil
+arabs
+Araby
+araby
+araca
+Aracaj
+Aracaju
+Aracana
+aracanga
+aracari
+Aracatuba
+arace
+Araceae
+araceous
+arach
+arache
+arachic
+arachide
+arachidic
+arachidonic
+arachin
+Arachis
+arachis
+arachnactis
+Arachne
+arachne
+arachnean
+arachnephobia
+arachnid
+Arachnida
+arachnidan
+arachnidial
+arachnidism
+arachnidium
+arachnids
+arachnism
+Arachnites
+arachnitis
+arachnoid
+arachnoidal
+Arachnoidea
+arachnoidea
+arachnoidean
+arachnoiditis
+arachnological
+arachnologist
+arachnology
+Arachnomorphae
+arachnophagous
+arachnopia
+Arad
+arad
+aradid
+Aradidae
+arado
+Arae
+araeometer
+araeostyle
+araeosystyle
+araeotic
+Arafat
+Arafura
+Aragallus
+Aragats
+arage
+Arago
+Aragon
+Aragonese
+Aragonian
+aragonite
+aragonitic
+aragonspath
+Araguaia
+araguane
+Araguari
+araguato
+Araguaya
+araignee
+arain
+Arains
+araire
+araise
+Arak
+arak
+Arakan
+Arakanese
+Arakawa
+arakawaite
+a-rake
+arake
+Araks
+araks
+Aralac
+Araldo
+Arales
+Aralia
+aralia
+Araliaceae
+araliaceous
+araliad
+Araliaephyllum
+aralie
+Araliophyllum
+aralkyl
+aralkylated
+Arallu
+Aralu
+Aram
+Aramaean
+aramaean
+Aramaic
+aramaic
+Aramaicize
+Aramaism
+Aramanta
+aramayoite
+Aramburu
+Aramean
+Aramen
+Aramenta
+aramid
+Aramidae
+aramids
+aramina
+Araminta
+ARAMIS
+Aramis
+Aramitess
+Aramu
+Aramus
+Aran
+Arand
+Aranda
+Arandas
+Aranea
+Araneae
+araneid
+Araneida
+araneidal
+araneidan
+araneids
+araneiform
+Araneiformes
+Araneiformia
+aranein
+Araneina
+Araneoidea
+araneologist
+araneology
+araneose
+araneous
+aranga
+arango
+arangoes
+Aranha
+arank
+Arany
+Aranyaka
+Aranyaprathet
+aranzada
+arapahite
+Arapaho
+arapaho
+Arapahoe
+Arapahoes
+Arapahos
+arapahos
+arapaima
+arapaimas
+Arapesh
+Arapeshes
+araphorostic
+araphostic
+araponga
+arapunga
+Araquaju
+arar
+Arara
+arara
+araracanga
+ararao
+Ararat
+ararauna
+arariba
+araroba
+ararobas
+araru
+Aras
+arase
+Arathorn
+arati
+aratinga
+aration
+aratory
+Aratus
+Araua
+Arauan
+Araucan
+Araucania
+Araucanian
+araucanian
+Araucano
+Araucaria
+araucaria
+Araucariaceae
+araucarian
+Araucarioxylon
+Araujia
+Arauna
+Arawa
+Arawak
+arawak
+Arawakan
+arawakan
+Arawakian
+Arawaks
+Arawn
+Araxa
+Araxes
+arayne
+arb
+arba
+Arbacia
+arbacia
+arbacin
+arbalest
+arbalester
+arbalestre
+arbalestrier
+arbalests
+arbalist
+arbalister
+arbalists
+arbalo
+arbalos
+Arbe
+Arbela
+Arbela-Gaugamela
+arbelest
+Arber
+arber
+Arbil
+arbinose
+arbiter
+arbiters
+arbith
+arbitrable
+arbitrage
+arbitrager
+arbitragers
+arbitrages
+arbitrageur
+arbitragist
+arbitral
+arbitrament
+arbitraments
+arbitraries
+arbitrarily
+arbitrariness
+arbitrarinesses
+arbitrary
+arbitrate
+arbitrated
+arbitrates
+arbitrating
+arbitration
+arbitrational
+arbitrationist
+arbitrations
+arbitrative
+arbitrator
+arbitrators
+arbitratorship
+arbitratrix
+arbitre
+arbitrement
+arbitrer
+arbitress
+arbitry
+arblast
+Arblay
+Arboles
+arboloco
+Arbon
+arbor
+arboraceous
+arboral
+arborary
+arborator
+arborea
+arboreal
+arboreally
+arborean
+arbored
+arboreous
+arborer
+arbores
+arborescence
+arborescent
+arborescently
+arboresque
+arboret
+arboreta
+arboretum
+arboretums
+arborical
+arboricole
+arboricoline
+arboricolous
+arboricultural
+arboriculture
+arboriculturist
+arboriform
+arborise
+arborist
+arborists
+arborization
+arborize
+arborized
+arborizes
+arborizing
+arboroid
+arborolater
+arborolatry
+arborous
+arbors
+arborvitae
+arborvitaes
+arborway
+arbory
+arbota
+arbour
+arboured
+arbours
+Arbovale
+arbovirus
+Arbroath
+arbs
+arbtrn
+Arbuckle
+arbuscle
+arbuscles
+arbuscula
+arbuscular
+arbuscule
+arbust
+arbusta
+arbusterin
+arbusterol
+arbustum
+arbutase
+arbute
+arbutean
+arbutes
+Arbuthnot
+arbutin
+arbutinase
+arbutus
+arbutuses
+Arbyrd
+ARC
+arc
+arca
+arcabucero
+Arcacea
+arcade
+arcaded
+arcades
+Arcadia
+arcadia
+Arcadian
+arcadian
+Arcadianism
+Arcadianly
+arcadians
+arcadias
+Arcadic
+arcading
+arcadings
+Arcady
+arcady
+arcae
+arcana
+arcanal
+arcane
+Arcangelo
+arcanist
+arcanite
+Arcanum
+arcanum
+arcanums
+Arcaro
+Arcas
+Arcata
+arcate
+arcato
+arcature
+arcatures
+arc-back
+arc-boutant
+arcboutant
+arccos
+arccosine
+Arce
+arced
+Arcella
+arcella
+arces
+Arcesilaus
+Arcesius
+Arceuthobium
+arceuthobium
+arcform
+-arch
+Arch
+Arch.
+arch
+arch-
+arch.
+archabomination
+archae
+archae-
+Archaean
+archaean
+archaecraniate
+archaeo-
+Archaeoceti
+Archaeocyathid
+Archaeocyathidae
+Archaeocyathus
+archaeocyte
+archaeogeology
+archaeographic
+archaeographical
+archaeography
+archaeohippus
+archaeol
+archaeol.
+archaeolater
+archaeolatry
+archaeolith
+archaeolithic
+archaeologer
+archaeologian
+archaeologic
+archaeological
+archaeologically
+archaeologies
+archaeologist
+archaeologists
+archaeology
+archaeomagnetism
+Archaeopithecus
+Archaeopteris
+Archaeopterygiformes
+Archaeopteryx
+archaeopteryx
+Archaeornis
+archaeornis
+Archaeornithes
+archaeostoma
+Archaeostomata
+archaeostomatous
+archaeotherium
+Archaeozoic
+archaeus
+archagitator
+archai
+Archaic
+archaic
+archaical
+archaically
+archaicism
+archaicness
+Archaimbaud
+archaise
+archaised
+archaiser
+archaises
+archaising
+archaism
+archaisms
+archaist
+archaistic
+archaists
+archaize
+archaized
+archaizer
+archaizes
+archaizing
+Archambault
+Ar-chang
+Archangel
+archangel
+archangelic
+Archangelica
+archangelical
+archangels
+archangelship
+archantagonist
+archanthropine
+archantiquary
+archapostate
+archapostle
+archarchitect
+archarios
+archartist
+Archbald
+archbanc
+archbancs
+archband
+archbeacon
+archbeadle
+archbishop
+archbishopess
+archbishopric
+archbishoprics
+archbishopry
+archbishops
+Archbold
+archbotcher
+archboutefeu
+Archbp
+arch-brahman
+archbuffoon
+archbuilder
+arch-butler
+arch-buttress
+Archcape
+archchampion
+arch-chanter
+archchaplain
+archcharlatan
+archcheater
+archchemic
+archchief
+arch-christendom
+arch-christianity
+archchronicler
+archcity
+archconfraternities
+archconfraternity
+archconsoler
+archconspirator
+archcorrupter
+archcorsair
+archcount
+archcozener
+archcriminal
+archcritic
+archcrown
+archcupbearer
+Archd
+archd
+archdapifer
+archdapifership
+archdeacon
+archdeaconate
+archdeaconess
+archdeaconries
+archdeaconry
+archdeacons
+archdeaconship
+archdean
+archdeanery
+archdeceiver
+archdefender
+archdemon
+archdepredator
+archdespot
+archdetective
+archdevil
+archdiocesan
+archdiocese
+archdioceses
+archdiplomatist
+archdissembler
+archdisturber
+archdivine
+archdogmatist
+archdolt
+archdruid
+archducal
+archduchess
+archduchesses
+archduchies
+archduchy
+archduke
+archdukedom
+archdukes
+archduxe
+arche
+archeal
+Archean
+archean
+archearl
+archebanc
+archebancs
+archebiosis
+archecclesiastic
+archecentric
+arched
+archegay
+Archegetes
+archegone
+archegonia
+archegonial
+Archegoniata
+Archegoniatae
+archegoniate
+archegoniophore
+archegonium
+archegony
+Archegosaurus
+archeion
+Archelaus
+Archelenis
+Archelochus
+archelogy
+Archelon
+archelon
+archemastry
+Archemorus
+archemperor
+Archencephala
+archencephalic
+archenemies
+arch-enemy
+archenemy
+archengineer
+archenia
+archenteric
+archenteron
+archeocyte
+archeol
+archeolithic
+archeologian
+archeologic
+archeological
+archeologically
+archeologies
+archeologist
+archeology
+archeopteryx
+archeostome
+Archeozoic
+archeozoic
+Archeptolemus
+Archer
+archer
+archeress
+archerfish
+archerfishes
+archeries
+archers
+archership
+archery
+Arches
+arches
+arches-court
+archespore
+archespores
+archesporia
+archesporial
+archesporium
+archespsporia
+archest
+archetto
+archettos
+archetypal
+archetypally
+archetype
+archetypes
+archetypic
+archetypical
+archetypically
+archetypist
+archeunuch
+archeus
+archexorcist
+archfelon
+Archfiend
+arch-fiend
+archfiend
+archfiends
+archfire
+arch-flamen
+archflamen
+archflatterer
+arch-foe
+archfoe
+archfool
+archform
+archfounder
+archfriend
+archgenethliac
+archgod
+archgomeral
+archgovernor
+archgunner
+archhead
+archheart
+archheresy
+arch-heretic
+archheretic
+archhost
+archhouse
+archhumbug
+archhypocrisy
+archhypocrite
+archi-
+Archiannelida
+Archias
+archiater
+Archibald
+Archibaldo
+archibenthal
+archibenthic
+archibenthos
+archiblast
+archiblastic
+archiblastoma
+archiblastula
+Archibold
+Archibuteo
+archical
+archicantor
+archicarp
+archicerebra
+archicerebrum
+Archichlamydeae
+archichlamydeous
+archicleistogamous
+archicleistogamy
+archicoele
+archicontinent
+archicyte
+archicytula
+Archidamus
+Archidiaceae
+archidiaconal
+archidiaconate
+archididascalian
+archididascalos
+Archidiskodon
+Archidium
+archidome
+archidoxis
+Archie
+archie
+archiepiscopacy
+archiepiscopal
+archiepiscopality
+archiepiscopally
+archiepiscopate
+archiereus
+archigaster
+archigastrula
+archigenesis
+archigonic
+archigonocyte
+archigony
+archiheretical
+archikaryon
+archil
+archilithic
+archilla
+Archilochian
+archilochian
+Archilochus
+archilowe
+archils
+archilute
+archimage
+Archimago
+archimagus
+archimandrite
+archimandrites
+Archimedean
+archimedean
+Archimedes
+archimedes
+archimime
+archimorphic
+archimorula
+archimperial
+archimperialism
+archimperialist
+archimperialistic
+archimpressionist
+Archimycetes
+archin
+archine
+archines
+archineuron
+archinfamy
+archinformer
+arching
+archings
+archipallial
+archipallium
+archipelagian
+archipelagic
+archipelago
+archipelagoes
+archipelagos
+Archipenko
+archiphoneme
+archipin
+archiplasm
+archiplasmic
+Archiplata
+archiprelatical
+archipresbyter
+archipterygial
+archipterygium
+archisperm
+Archispermae
+archisphere
+archispore
+archistome
+archisupreme
+archisymbolical
+archisynagogue
+archit
+archit.
+architect
+architective
+architectonic
+Architectonica
+architectonically
+architectonics
+architectress
+architects
+architectural
+architecturalist
+architecturally
+architecture
+architectures
+architecturesque
+Architeuthis
+architis
+architraval
+architrave
+architraved
+architraves
+architricline
+architypographer
+archival
+archivault
+archive
+archived
+archiver
+archivers
+archives
+archiving
+archivist
+archivists
+archivolt
+archizoic
+archjockey
+archking
+archknave
+Archle
+archleader
+archlecher
+archlet
+archleveler
+archlexicographer
+archliar
+archlute
+archly
+archmachine
+archmagician
+archmagirist
+archmarshal
+archmediocrity
+archmessenger
+archmilitarist
+archmime
+archminister
+archmock
+archmocker
+archmockery
+archmonarch
+archmonarchist
+archmonarchy
+archmugwump
+archmurderer
+archmystagogue
+archness
+archnesses
+archocele
+archocystosyrinx
+archology
+archon
+archons
+archonship
+archonships
+archont
+archontate
+Archontia
+archontic
+archoplasm
+archoplasma
+archoplasmic
+archoptoma
+archoptosis
+archorrhagia
+archorrhea
+archostegnosis
+archostenosis
+archosyrinx
+archoverseer
+archpall
+archpapist
+archpastor
+archpatriarch
+archpatron
+archphilosopher
+archphylarch
+archpiece
+archpilferer
+archpillar
+archpirate
+archplagiarist
+archplagiary
+archplayer
+archplotter
+archplunderer
+archplutocrat
+arch-poet
+archpoet
+archpolitician
+archpontiff
+archpractice
+arch-prelate
+archprelate
+archprelatic
+archprelatical
+arch-presbyter
+archpresbyter
+archpresbyterate
+archpresbytery
+archpretender
+archpriest
+archpriesthood
+archpriestship
+archprimate
+archprince
+archprophet
+arch-protestant
+archprotopope
+archprototype
+archpublican
+archpuritan
+archradical
+archrascal
+archreactionary
+archrebel
+archregent
+archrepresentative
+archrobber
+archrogue
+archruler
+archsacrificator
+archsacrificer
+archsaint
+archsatrap
+archscoundrel
+arch-sea
+archseducer
+archsee
+archsewer
+archshepherd
+archsin
+archsnob
+archspirit
+archspy
+archsteward
+archswindler
+archsynagogue
+archt
+archt.
+archtempter
+archthief
+arch-traitor
+archtraitor
+archtreasurer
+archtreasurership
+archturncoat
+archtyrant
+archurger
+archvagabond
+archvampire
+archvestryman
+arch-villain
+archvillain
+archvillainy
+archvisitor
+archwag
+archway
+archways
+archwench
+arch-whig
+archwife
+archwise
+archworker
+archworkmaster
+-archy
+Archy
+archy
+Archytas
+Arcidae
+Arcifera
+arciferous
+arcifinious
+arciform
+Arcimboldi
+arcing
+Arciniegas
+Arcite
+arcked
+arcking
+arclength
+arclike
+ARCM
+ARCNET
+ARCO
+Arco
+arco
+arcocentrous
+arcocentrum
+arcograph
+Arcola
+Arcos
+arcose
+arcosolia
+arcosoliulia
+arcosolium
+arc-over
+A.R.C.S.
+ARCS
+arcs
+arcs-boutants
+arc-shaped
+arcsin
+arcsine
+arcsines
+Arctalia
+Arctalian
+Arctamerican
+arctan
+arctangent
+arctation
+Arctia
+arctian
+Arctic
+arctic
+arctically
+arctician
+arcticize
+arcticized
+arcticizing
+arctico-altaic
+arcticologist
+arcticology
+arctics
+arcticward
+arcticwards
+arctiid
+Arctiidae
+Arctisca
+arctitude
+Arctium
+Arctocephalus
+Arctogaea
+Arctogaeal
+arctogaeal
+Arctogaean
+Arctogaeic
+Arctogea
+Arctogean
+Arctogeic
+arctoid
+Arctoidea
+arctoidean
+Arctomys
+Arctos
+Arctosis
+Arctostaphylos
+Arcturia
+Arcturian
+Arcturus
+arcturus
+arcual
+arcuale
+arcualia
+arcuate
+arcuated
+arcuately
+arcuation
+arcubalist
+arcubalister
+arcubos
+arcula
+arculite
+arcus
+arcuses
+-ard
+Ard
+Arda
+Ardara
+ardass
+ardassine
+Ardath
+Arde
+Ardea
+Ardeae
+ardeb
+ardebs
+Ardeche
+Ardeen
+Ardeha
+Ardehs
+ardeid
+Ardeidae
+Ardel
+Ardelia
+ardelio
+Ardelis
+Ardell
+Ardella
+ardella
+ardellae
+Ardelle
+Arden
+ardencies
+ardency
+Ardene
+Ardenia
+Ardennes
+ardennite
+ardent
+ardently
+ardentness
+Ardenvoir
+arder
+Ardeth
+Ardhamagadhi
+Ardhanari
+Ardie
+Ardi-ea
+ardilla
+Ardin
+Ardine
+Ardis
+ardish
+Ardisia
+ardisia
+Ardisiaceae
+Ardisj
+Ardith
+arditi
+ardito
+Ardme
+Ardmore
+Ardmored
+Ardoch
+ardoise
+Ardolino
+ardor
+ardors
+ardour
+ardours
+Ardra
+Ardrey
+ardri
+ardrigh
+Ardsley
+ardu
+arduinite
+arduous
+arduously
+arduousness
+arduousnesses
+ardure
+ardurous
+Ardussi
+Ardy
+Ardyce
+Ardys
+Ardyth
+ARE
+are
+area
+areach
+aread
+aready
+areae
+areal
+areality
+areally
+Arean
+arear
+areas
+areason
+areasoner
+areaway
+areaways
+areawide
+Areca
+areca
+Arecaceae
+arecaceous
+arecaidin
+arecaidine
+arecain
+arecaine
+Arecales
+arecas
+areche
+Arecibo
+arecolidin
+arecolidine
+arecolin
+arecoline
+Arecuna
+ared
+Aredale
+areek
+areel
+arefact
+arefaction
+arefy
+areg
+aregenerative
+aregeneratory
+areic
+Areithous
+areito
+Areius
+Arel
+Arela
+Arelia
+Arella
+Arelus
+aren
+ARENA
+arena
+arenaceo-
+arenaceous
+arenae
+Arenaria
+arenaria
+arenariae
+arenarious
+arenas
+arenation
+arend
+arendalite
+arendator
+Arends
+Arendt
+Arendtsville
+Arene
+areng
+Arenga
+Arenicola
+arenicole
+arenicolite
+arenicolor
+arenicolous
+Arenig
+arenilitic
+arenite
+arenites
+arenoid
+arenose
+arenosity
+arenoso-
+arenous
+Arensky
+aren't
+arent
+arenulous
+Arenzville
+areo-
+areocentric
+areographer
+areographic
+areographical
+areographically
+areography
+areola
+areolae
+areolar
+areolas
+areolate
+areolated
+areolation
+areole
+areoles
+areolet
+areologic
+areological
+areologically
+areologies
+areologist
+areology
+areometer
+areometric
+areometrical
+areometry
+Areopagist
+areopagist
+Areopagite
+areopagite
+Areopagitic
+areopagitic
+Areopagitica
+Areopagus
+areopagus
+areopagy
+areostyle
+areosystyle
+areotectonics
+Arequipa
+arere
+arerola
+areroscope
+Ares
+ares
+Areskutan
+arest
+Aret
+aret
+Areta
+aretaics
+aretalogy
+Arete
+arete
+aretes
+Aretha
+Arethusa
+arethusa
+arethusas
+Arethuse
+Aretina
+Aretinian
+Aretino
+Aretta
+Arette
+arette
+Aretus
+Areus
+arew
+Arezzini
+Arezzo
+ARF
+arf
+arfillite
+arfs
+arfvedsonite
+Arg
+Arg.
+arg
+Argades
+argaile
+argal
+argala
+argalas
+argali
+argalis
+Argall
+argals
+argan
+argand
+argans
+Argante
+Argas
+argasid
+Argasidae
+Argean
+argeers
+Argeiphontes
+argel
+Argelander
+argema
+Argemone
+argemone
+argemony
+argenol
+Argent
+argent
+Argenta
+argental
+argentamid
+argentamide
+argentamin
+argentamine
+argentan
+argentarii
+argentarius
+argentate
+argentation
+argenteous
+argenter
+Argenteuil
+argenteum
+Argentia
+argentic
+argenticyanide
+argentide
+argentiferous
+argentin
+Argentina
+argentina
+Argentine
+argentine
+Argentinean
+argentinean
+argentineans
+argentines
+Argentinian
+Argentinidae
+argentinitrate
+Argentinize
+Argentino
+argentino
+argention
+argentite
+argento-
+argentojarosite
+argentol
+argentometer
+argentometric
+argentometrically
+argentometry
+argenton
+argentoproteinum
+argentose
+argentous
+argentry
+argents
+argentum
+argentums
+argent-vive
+Arges
+Argestes
+argh
+arghan
+arghel
+arghool
+arghoul
+Argia
+Argid
+argify
+argil
+Argile
+argillaceo-
+argillaceous
+argillic
+argilliferous
+Argillite
+argillite
+argillitic
+argillo-
+argilloarenaceous
+argillocalcareous
+argillocalcite
+argilloferruginous
+argilloid
+argillomagnesian
+argillous
+argils
+argin
+arginase
+arginases
+argine
+arginine
+argininephosphoric
+arginines
+Argiope
+Argiopidae
+Argiopoidea
+Argiphontes
+Argive
+argive
+argle
+argle-bargie
+argle-bargle
+arglebargle
+arglebargled
+arglebargling
+argled
+argles
+argling
+Argo
+argo
+Argoan
+argol
+argolet
+argoletier
+Argolian
+Argolic
+Argolid
+Argolis
+argols
+argon
+Argonaut
+argonaut
+Argonauta
+Argonautic
+argonautic
+argonautid
+argonauts
+Argonia
+Argonne
+argonon
+argons
+Argos
+argos
+argosies
+argosine
+Argostolion
+argosy
+argot
+argotic
+argots
+Argovian
+Argovie
+arguable
+arguably
+argue
+argue-bargue
+argued
+Arguedas
+arguendo
+arguer
+arguers
+argues
+argufied
+argufier
+argufiers
+argufies
+argufy
+argufying
+arguing
+arguitively
+Argulus
+argument
+argumenta
+argumental
+argumentation
+argumentatious
+argumentative
+argumentatively
+argumentativeness
+argumentator
+argumentatory
+argumentive
+argumentMaths
+arguments
+argumentum
+Argus
+argus
+arguses
+Argus-eyed
+argus-eyed
+argusfish
+argusfishes
+Argusianus
+Arguslike
+Argusville
+arguta
+argutation
+argute
+argutely
+arguteness
+argy-bargied
+argy-bargies
+argy-bargy
+argy-bargying
+Argyle
+argyle
+argyles
+Argyll
+argyll
+argylls
+Argyllshire
+Argynnis
+argyr-
+Argyra
+argyranthemous
+argyranthous
+Argyraspides
+Argyres
+argyria
+argyric
+argyrite
+argyrocephalous
+argyrodite
+Argyrol
+Argyroneta
+Argyropelecus
+argyrose
+argyrosis
+Argyrosomus
+Argyrotoxus
+argyrythrose
+arh-
+arhar
+Arhat
+arhat
+arhats
+Arhatship
+arhatship
+Arhauaco
+Arhna
+arhythmia
+arhythmic
+arhythmical
+arhythmically
+Ari
+Aria
+aria
+Ariadaeus
+Ariadna
+Ariadne
+ariadne
+-arian
+Arian
+arian
+Ariana
+Ariane
+Arianie
+Arianism
+arianism
+arianist
+Arianistic
+Arianistical
+arianists
+Arianize
+Arianizer
+Arianna
+Arianne
+Arianrhod
+arias
+aribin
+aribine
+ariboflavinosis
+Aribold
+Aric
+Arica
+Arician
+aricin
+aricine
+Arick
+arid
+Aridatha
+Arided
+arider
+aridest
+aridge
+aridian
+aridities
+aridity
+aridly
+aridness
+aridnesses
+Arie
+Ariege
+ariegite
+Ariel
+ariel
+Ariela
+Ariella
+Arielle
+ariels
+arienzo
+Aries
+aries
+arietate
+arietation
+Arietid
+arietinous
+Arietis
+arietta
+ariettas
+ariette
+ariettes
+Ariew
+aright
+arightly
+arigue
+Ariidae
+Arikara
+ariki
+aril
+ariled
+arillary
+arillate
+arillated
+arilled
+arilli
+arilliform
+arillode
+arillodes
+arillodium
+arilloid
+arillus
+arils
+Arimasp
+Arimaspian
+Arimaspians
+Arimathaea
+Arimathaean
+Arimathea
+Arimathean
+Ariminum
+Arimo
+Arin
+Ario
+Ariocarpus
+Arioi
+Arioian
+ariolate
+ariole
+Arion
+ariose
+ariosi
+arioso
+ariosos
+Ariosto
+a-riot
+ariot
+-arious
+Ariovistus
+Aripeka
+a-ripple
+aripple
+ARIS
+Arisaema
+arisaid
+arisard
+Arisbe
+arise
+arised
+arisen
+ariser
+arises
+arish
+arising
+arisings
+Arispe
+Arissa
+arist
+Arista
+arista
+aristae
+Aristaeus
+Aristarch
+aristarch
+Aristarchian
+aristarchies
+Aristarchus
+aristarchy
+aristas
+aristate
+ariste
+Aristeas
+aristeia
+Aristes
+Aristida
+Aristide
+Aristides
+Aristillus
+Aristippus
+aristippus
+Aristo
+aristo
+aristo-
+aristocracies
+aristocracy
+aristocrat
+aristocratic
+aristocratical
+aristocratically
+aristocraticalness
+aristocraticism
+aristocraticness
+aristocratism
+aristocrats
+aristodemocracies
+aristodemocracy
+aristodemocratical
+Aristodemus
+aristogenesis
+aristogenetic
+aristogenic
+aristogenics
+aristoi
+Aristol
+Aristolochia
+aristolochia
+Aristolochiaceae
+aristolochiaceous
+Aristolochiales
+aristolochin
+aristolochine
+aristological
+aristologist
+aristology
+Aristomachus
+aristomonarchy
+Aristophanes
+Aristophanic
+aristorepublicanism
+aristos
+Aristotelean
+aristotelean
+Aristoteles
+Aristotelian
+aristotelian
+Aristotelianism
+Aristotelic
+Aristotelism
+Aristotle
+aristotle
+aristotype
+aristulate
+Arita
+arite
+arith
+arithmancy
+arithmetic
+arithmetical
+arithmetically
+arithmetician
+arithmeticians
+arithmetico-geometric
+arithmetico-geometrical
+arithmetics
+arithmetization
+arithmetizations
+arithmetize
+arithmetized
+arithmetizes
+arithmic
+arithmo-
+arithmocracy
+arithmocratic
+arithmogram
+arithmograph
+arithmography
+arithmomancy
+arithmomania
+arithmometer
+arithromania
+Ariton
+-arium
+Arius
+Arivaca
+Arivaipa
+Ariz
+Ariz.
+Arizona
+arizona
+Arizonan
+arizonan
+arizonans
+Arizonian
+arizonian
+arizonians
+arizonite
+Arjan
+Arjay
+Arjun
+arjun
+Arjuna
+Ark
+Ark.
+ark
+Arkab
+Arkabutla
+Arkadelphia
+Arkansan
+arkansan
+arkansans
+Arkansas
+arkansas
+Arkansaw
+Arkansawyer
+arkansawyer
+Arkansian
+arkansite
+Arkdale
+Arkhangelsk
+Arkie
+arkie
+Arkite
+arkite
+Arkoma
+arkose
+arkoses
+arkosic
+Arkport
+arks
+arksutite
+Arkville
+Arkwright
+arkwright
+Arlan
+Arlana
+Arlberg
+arle
+Arlee
+Arleen
+Arlen
+Arlena
+Arlene
+Arleng
+arlequinade
+Arles
+arles
+arless
+Arleta
+Arlette
+Arley
+Arleyne
+Arlie
+Arliene
+Arlin
+Arlina
+Arlinda
+Arline
+arling
+Arlington
+arlington
+Arlis
+Arliss
+Arlo
+Arlon
+arloup
+Arluene
+Arly
+Arlyn
+Arlyne
+Arlynne
+ARM
+ArM
+Arm
+Arm.
+arm
+Arma
+Armada
+armada
+armadas
+armadilla
+Armadillididae
+Armadillidium
+armadillo
+armadillos
+Armado
+Armageddon
+armageddon
+Armageddonist
+Armagh
+Armagnac
+armagnac
+armagnacs
+Armalda
+Armalla
+Armallas
+armament
+armamentaria
+armamentarium
+armamentary
+armaments
+Arman
+Armand
+Armanda
+Armando
+armangite
+armaria
+armarian
+armaries
+armariolum
+armarium
+armariumaria
+armary
+Armata
+Armatoles
+Armatoli
+armature
+armatured
+armatures
+armaturing
+Armavir
+armband
+armbands
+armbone
+Armbrecht
+Armbrust
+Armbruster
+arm-chair
+armchair
+armchaired
+armchairs
+Armco
+armed
+Armelda
+Armen
+Armenia
+armenia
+armeniaceous
+Armenian
+armenian
+armenians
+Armenic
+armenite
+Armenize
+Armenoid
+Armeno-turkish
+Armenti
+Armentieres
+armer
+Armeria
+Armeriaceae
+armers
+armet
+armets
+armful
+armfuls
+armgaunt
+arm-great
+armguard
+arm-headed
+arm-hole
+armhole
+armholes
+armhoop
+Armida
+armied
+armies
+armiferous
+armiger
+armigeral
+armigeri
+armigero
+armigeros
+armigerous
+armigers
+Armil
+armil
+Armilda
+armill
+Armilla
+armilla
+armillae
+Armillaria
+armillaria
+armillary
+Armillas
+armillas
+armillate
+armillated
+Armillda
+Armillia
+Armin
+Armina
+arm-in-arm
+armine
+arming
+armings
+Armington
+Arminian
+arminian
+Arminianism
+Arminianize
+Arminianizer
+Arminius
+armipotence
+armipotent
+armisonant
+armisonous
+armistice
+armistices
+armit
+Armitage
+armitas
+armless
+armlessly
+armlessness
+armlet
+armlets
+armlike
+arm-linked
+armload
+armloads
+armlock
+armlocks
+armoire
+armoires
+armomancy
+Armona
+Armond
+armoniac
+armonica
+armonicas
+Armonk
+armor
+Armoracia
+armor-bearer
+armorbearer
+armor-clad
+armored
+Armorel
+armorer
+armorers
+armorial
+armorially
+armorials
+Armoric
+Armorica
+armorica
+Armorican
+armorican
+Armorician
+armoried
+armories
+armoring
+armorist
+armorless
+armor-piercing
+armor-plate
+armor-plated
+armorplated
+armorproof
+armors
+armorwise
+armory
+Armouchiquois
+Armour
+armour
+armour-bearer
+armourbearer
+armour-clad
+armoured
+armourer
+armourers
+armouries
+armouring
+armour-piercing
+armour-plate
+armours
+armoury
+armozeen
+armozine
+armpad
+armpiece
+armpit
+armpits
+armplate
+armrack
+armrest
+armrests
+arms
+armscye
+armseye
+armsful
+arm-shaped
+armsize
+Armstrong
+armstrong
+Armstrong-Jones
+Armuchee
+armure
+armures
+army
+Armyn
+armyworm
+armyworms
+arn
+arna
+Arnaeus
+Arnaldo
+arnatta
+arnatto
+arnattos
+Arnaud
+Arnaudville
+Arnaut
+arnberry
+Arndt
+Arne
+Arneb
+Arnebia
+arnee
+Arnegard
+Arnel
+Arnelle
+arnement
+Arnett
+Arney
+Arnhem
+Arni
+arni
+arnica
+arnicas
+Arnie
+Arnim
+Arno
+Arnold
+arnold
+Arnoldist
+Arnoldo
+Arnoldsburg
+Arnoldson
+Arnoldsville
+Arnon
+Arnoseris
+Arnot
+arnotta
+arnotto
+arnottos
+Arnst
+ar'n't
+Arnuad
+Arnulf
+Arnulfo
+Arnusian
+arnut
+Arny
+ARO
+Aro
+a-roar
+aroar
+aroast
+Arock
+arock
+Aroda
+aroeira
+aroid
+aroideous
+Aroides
+aroids
+aroint
+arointed
+arointing
+aroints
+Arola
+arolia
+arolium
+arolla
+aroma
+aromacity
+aromadendrin
+aromal
+Aromas
+aromas
+aromata
+aromatic
+aromatical
+aromatically
+aromaticity
+aromaticness
+aromatics
+aromatise
+aromatised
+aromatiser
+aromatising
+aromatitae
+aromatite
+aromatites
+aromatization
+aromatize
+aromatized
+aromatizer
+aromatizing
+aromatophor
+aromatophore
+aromatous
+Aron
+Arona
+Arondel
+Arondell
+Aronia
+Aronoff
+Aronow
+Aronson
+a-room
+aroon
+Aroostook
+a-root
+aroph
+Aroras
+Arosaguntacook
+arose
+around
+around-the-clock
+arousable
+arousal
+arousals
+arouse
+aroused
+arousement
+arouser
+arousers
+arouses
+arousing
+a-row
+arow
+aroxyl
+aroynt
+aroynted
+aroynting
+aroynts
+ARP
+Arp
+ARPA
+ARPANET
+arpanet
+arpeggiando
+arpeggiated
+arpeggiation
+arpeggio
+arpeggioed
+arpeggios
+arpen
+arpens
+arpent
+arpenteur
+arpents
+Arpin
+ARQ
+arquated
+arquebus
+arquebuses
+arquebusier
+arquerite
+arquifoux
+Arquit
+arr
+arr.
+arracach
+arracacha
+Arracacia
+arrace
+arrach
+arrack
+arracks
+arrage
+Arragon
+arragonite
+arrah
+arraign
+arraignability
+arraignable
+arraignableness
+arraigned
+arraigner
+arraigning
+arraignment
+arraignments
+arraigns
+arrame
+Arran
+arrand
+arrange
+arrangeable
+arranged
+arrangement
+arrangements
+arranger
+arrangers
+arranges
+arranging
+arrant
+arrantly
+arrantness
+Arras
+arras
+arrased
+arrasene
+arrases
+arrastra
+arrastre
+arras-wise
+arratel
+Arratoon
+Arrau
+arrau
+array
+arrayal
+arrayals
+arrayan
+arrayed
+arrayer
+arrayers
+arraying
+arrayment
+arrays
+arrear
+arrearage
+arrearages
+arrear-guard
+arrears
+arrear-ward
+arrect
+arrectary
+arrector
+arrendation
+arrendator
+arrenotokous
+arrenotoky
+arrent
+arrentable
+arrentation
+Arrephoria
+Arrephoroi
+Arrephoros
+arreption
+arreptitious
+arrest
+arrestable
+arrestant
+arrestation
+arrested
+arrestee
+arrestees
+arrester
+arresters
+arresting
+arrestingly
+arrestive
+arrestment
+arrestor
+arrestors
+arrests
+arret
+arretez
+Arretine
+Arretium
+Arrey
+arrgt
+arrha
+arrhal
+arrhenal
+Arrhenatherum
+Arrhenius
+arrhenoid
+arrhenotokous
+arrhenotoky
+Arrhephoria
+arrhinia
+arrhizal
+arrhizous
+arrhythmia
+arrhythmias
+arrhythmic
+arrhythmical
+arrhythmically
+arrhythmous
+arrhythmy
+Arri
+arri
+Arria
+arriage
+Arriba
+arriba
+arribadas
+arricci
+arricciati
+arricciato
+arricciatos
+arriccio
+arriccioci
+arriccios
+arride
+arrided
+arridge
+arriding
+arrie
+arriere
+arriere-ban
+arriere-pensee
+arriero
+Arries
+Arriet
+Arrigny
+Arrigo
+arrimby
+Arrington
+Arrio
+arris
+arrises
+arrish
+arrisways
+arriswise
+arrivage
+arrival
+arrivals
+arrivance
+arrive
+arrived
+arrivederci
+arrivederla
+arriver
+arrivers
+arrives
+arriving
+arrivism
+arrivisme
+arrivist
+arriviste
+arrivistes
+ARRL
+arroba
+arrobas
+arrode
+arrogance
+arrogances
+arrogancy
+arrogant
+arrogantly
+arrogantness
+arrogate
+arrogated
+arrogates
+arrogating
+arrogatingly
+arrogation
+arrogations
+arrogative
+arrogator
+arrojadite
+Arron
+arrondi
+arrondissement
+arrondissements
+arrope
+arrosion
+arrosive
+arround
+arrouse
+arrow
+arrow-back
+arrow-bearing
+arrowbush
+arrowed
+arrow-grass
+arrow-head
+arrowhead
+arrowheaded
+arrowheads
+arrowing
+arrowleaf
+arrow-leaved
+arrowless
+arrowlet
+arrowlike
+arrowplate
+arrow-root
+arrowroot
+arrowroots
+arrows
+arrow-shaped
+arrow-slain
+Arrowsmith
+arrowsmith
+arrow-smitten
+arrowstone
+arrow-toothed
+arrowweed
+arrow-wood
+arrowwood
+arrowworm
+arrow-wounded
+arrowy
+arroya
+arroyo
+arroyos
+arroyuelo
+arroz
+arrtez
+Arruague
+Arry
+Arryish
+arrythmia
+arrythmic
+arrythmical
+arrythmically
+ARS
+ars
+ARSA
+Arsacid
+Arsacidan
+arsanilic
+ARSB
+arse
+arsedine
+arsefoot
+arsehole
+arsen-
+arsenal
+arsenals
+arsenate
+arsenates
+arsenation
+arseneted
+arsenetted
+arsenfast
+arsenferratose
+arsenhemol
+arseniasis
+arseniate
+arsenic
+arsenic-
+arsenical
+arsenicalism
+arsenicate
+arsenicated
+arsenicating
+arsenicism
+arsenicize
+arsenicked
+arsenicking
+arsenicophagy
+arsenics
+arsenide
+arsenides
+arseniferous
+arsenillo
+arsenio-
+arseniopleite
+arseniosiderite
+arsenious
+arsenism
+arsenite
+arsenites
+arsenium
+arseniuret
+arseniureted
+arseniuretted
+arsenization
+arseno
+arseno-
+arsenobenzene
+arsenobenzol
+arsenobismite
+arsenoferratin
+arsenofuran
+arsenohemol
+arsenolite
+arsenophagy
+arsenophen
+arsenophenol
+arsenophenylglycin
+arsenopyrite
+arsenostyracol
+arsenotherapy
+arsenotungstates
+arsenotungstic
+arsenous
+arsenoxide
+Arseny
+arsenyl
+arses
+arsesmart
+arsheen
+Arshile
+arshin
+arshine
+arshins
+arsine
+arsines
+arsinic
+arsino
+Arsinoe
+Arsinoitherium
+Arsinous
+Arsippe
+arsis
+arsle
+ARSM
+arsmetik
+arsmetrik
+arsmetrike
+arsmetry
+arsnicker
+arsoite
+arson
+arsonate
+arsonation
+arsonic
+arsonist
+arsonists
+arsonite
+arsonium
+arsono
+arsonous
+arsons
+arsonvalization
+arsphenamine
+Arst
+arsyl
+arsylene
+arsy-varsiness
+arsy-varsy
+arsy-versy
+arsyversy
+-art
+ART
+Art
+art
+art.
+Arta
+artaba
+artabe
+Artacia
+Artair
+artal
+Artamas
+Artamidae
+Artamus
+artar
+artarin
+artarine
+Artas
+Artaud
+ARTCC
+art-colored
+art-conscious
+artcraft
+Arte
+arte
+artefac
+artefact
+artefacts
+artel
+artels
+Artema
+Artemas
+Artemia
+artemia
+ARTEMIS
+Artemis
+artemis
+Artemisa
+Artemisia
+artemisia
+artemisic
+artemisin
+Artemision
+Artemisium
+artemon
+Artemovsk
+Artemus
+arter
+arteri-
+arteria
+arteriac
+arteriae
+arteriagra
+arterial
+arterialisation
+arterialise
+arterialised
+arterialising
+arterialization
+arterialize
+arterialized
+arterializing
+arterially
+arterials
+arteriarctia
+arteriasis
+arteriectasia
+arteriectasis
+arteriectomy
+arteriectopia
+arteried
+arteries
+arterin
+arterio-
+arterioarctia
+arteriocapillary
+arteriococcygeal
+arteriodialysis
+arteriodiastasis
+arteriofibrosis
+arteriogenesis
+arteriogram
+arteriograph
+arteriographic
+arteriography
+arteriolar
+arteriole
+arterioles
+arteriolith
+arteriology
+arterioloscleroses
+arteriolosclerosis
+arteriomalacia
+arteriometer
+arteriomotor
+arterionecrosis
+arteriopalmus
+arteriopathy
+arteriophlebotomy
+arterioplania
+arterioplasty
+arteriopressor
+arteriorenal
+arteriorrhagia
+arteriorrhaphy
+arteriorrhexis
+arterioscleroses
+arteriosclerosis
+arteriosclerotic
+arteriospasm
+arteriostenosis
+arteriostosis
+arteriostrepsis
+arteriosympathectomy
+arteriotome
+arteriotomies
+arteriotomy
+arteriotrepsis
+arterious
+arteriovenous
+arterioversion
+arterioverter
+arteritis
+artery
+arterying
+Artesia
+Artesian
+artesian
+artesonado
+artesonados
+Arteveld
+Artevelde
+artful
+artfully
+artfulness
+artfulnesses
+Artgum
+Artha
+artha
+Arthaud
+arthel
+arthemis
+Arther
+arthogram
+arthr-
+arthra
+arthragra
+arthral
+arthralgia
+arthralgic
+arthrectomies
+arthrectomy
+arthredema
+arthrempyesis
+arthresthesia
+arthritic
+arthritical
+arthritically
+arthriticine
+arthritics
+arthritides
+arthritis
+arthritism
+arthro-
+Arthrobacter
+arthrobacterium
+arthrobranch
+arthrobranchia
+arthrocace
+arthrocarcinoma
+arthrocele
+arthrochondritis
+arthroclasia
+arthrocleisis
+arthroclisis
+arthroderm
+arthrodesis
+arthrodia
+arthrodiae
+arthrodial
+arthrodic
+Arthrodira
+arthrodiran
+arthrodire
+arthrodirous
+Arthrodonteae
+arthrodymic
+arthrodynia
+arthrodynic
+arthroempyema
+arthroempyesis
+arthroendoscopy
+Arthrogastra
+arthrogastran
+arthrogenous
+arthrography
+arthrogryposis
+arthrolite
+arthrolith
+arthrolithiasis
+arthrology
+arthromeningitis
+arthromere
+arthromeric
+arthrometer
+arthrometry
+arthron
+arthroncus
+arthroneuralgia
+arthropathic
+arthropathology
+arthropathy
+arthrophlogosis
+arthrophyma
+arthroplastic
+arthroplasty
+arthropleura
+arthropleure
+arthropod
+Arthropoda
+arthropodal
+arthropodan
+arthropodous
+arthropods
+arthropody
+Arthropomata
+arthropomatous
+arthropterous
+arthropyosis
+arthrorheumatism
+arthrorrhagia
+arthrosclerosis
+arthroses
+arthrosia
+arthrosis
+arthrospore
+arthrosporic
+arthrosporous
+arthrosteitis
+arthrosterigma
+arthrostome
+arthrostomy
+Arthrostraca
+arthrosynovitis
+arthrosyrinx
+arthrotome
+arthrotomies
+arthrotomy
+arthrotrauma
+arthrotropic
+arthrotyphoid
+arthrous
+arthroxerosis
+Arthrozoa
+arthrozoan
+arthrozoic
+Arthur
+arthur
+Arthurdale
+Arthurian
+arthurian
+Arthuriana
+artiad
+artic
+artichoke
+artichokes
+article
+articled
+articles
+articling
+Articodactyla
+articulability
+articulable
+articulacy
+articulant
+articular
+articulare
+articularly
+articulars
+articulary
+Articulata
+articulata
+articulate
+articulated
+articulately
+articulateness
+articulatenesses
+articulates
+articulating
+articulation
+articulationes
+articulationist
+articulations
+articulative
+articulator
+articulatorily
+articulators
+articulatory
+articulite
+articulus
+Artie
+artier
+artiest
+artifact
+artifactitious
+artifacts
+artifactual
+artifactually
+artifex
+artifice
+artificer
+artificers
+artificership
+artifices
+artificial
+artificialism
+artificialities
+artificiality
+artificialize
+artificially
+artificialness
+artificialnesses
+artificious
+Artigas
+artilize
+artiller
+artilleries
+artillerist
+artillerists
+artillery
+artilleryman
+artillerymen
+artilleryship
+artily
+Artima
+Artimas
+Artina
+artiness
+artinesses
+artinite
+Artinskian
+artiodactyl
+Artiodactyla
+artiodactylous
+artiphyllous
+artisan
+artisanal
+artisanry
+artisans
+artisanship
+artist
+artistdom
+artiste
+artiste-peintre
+artistes
+artistess
+artistic
+artistical
+artistically
+artist-in-residence
+artistries
+artistry
+artists
+artize
+artless
+artlessly
+artlessness
+artlessnesses
+artlet
+art-like
+artlike
+artly
+art-minded
+artmobile
+Artocarpaceae
+artocarpad
+artocarpeous
+artocarpous
+Artocarpus
+Artois
+artolater
+artolatry
+artophagous
+artophophoria
+artophoria
+artophorion
+artotype
+artotypy
+Artotyrite
+artotyrite
+artou
+arts
+artsier
+artsiest
+arts-man
+artsman
+arts-master
+artsy
+Artsybashev
+artsy-craftsiness
+artsy-craftsy
+Artukovic
+Artur
+Arturo
+Artus
+artus
+artware
+artwork
+artworks
+Arty
+arty
+arty-craftiness
+arty-crafty
+Artzybasheff
+Artzybashev
+ARU
+aru
+Aruabea
+Aruac
+Aruba
+arugola
+arugolas
+arugula
+arugulas
+arui
+aruke
+Arulo
+Arum
+arum
+arumin
+arumlike
+arums
+Arun
+Aruncus
+Arundel
+Arundell
+arundiferous
+arundinaceous
+Arundinaria
+arundineous
+Arundo
+Aruns
+Arunta
+Aruntas
+arupa
+Aruru
+arusa
+Arusha
+arusha
+aruspex
+aruspice
+aruspices
+aruspicy
+arustle
+Arutiunian
+Aruwimi
+ARV
+Arv
+Arva
+Arvad
+Arvada
+Arval
+arval
+Arvales
+ArvArva
+arvejon
+arvel
+Arvell
+Arverni
+Arvicola
+arvicole
+Arvicolinae
+arvicoline
+arvicolous
+arviculture
+Arvid
+Arvida
+Arvie
+Arvilla
+Arvin
+Arvind
+Arvo
+arvo
+Arvol
+Arvonia
+Arvonio
+arvos
+Arvy
+arx
+-ary
+Ary
+ary
+Arya
+Aryaman
+Aryan
+aryan
+Aryanise
+Aryanised
+Aryanising
+Aryanism
+Aryanization
+Aryanize
+aryanize
+Aryanized
+Aryanizing
+aryans
+aryballi
+aryballoi
+aryballoid
+aryballos
+aryballus
+arybballi
+aryepiglottic
+aryepiglottidean
+aryl
+arylamine
+arylamino
+arylate
+arylated
+arylating
+arylation
+arylide
+aryls
+Aryn
+Aryo-dravidian
+Aryo-indian
+aryteno-
+aryteno-epiglottic
+arytenoepiglottic
+arytenoid
+arytenoidal
+arythmia
+arythmias
+arythmic
+arythmical
+arythmically
+Arzachel
+arzan
+Arzava
+Arzawa
+arzrunite
+arzun
+AS
+As
+as
+as-
+ASA
+Asa
+Asabi
+ASA/BS
+asaddle
+Asael
+asafetida
+asafoetida
+Asag
+Asahel
+Asahi
+Asahigawa
+Asahikawa
+ASAIGAC
+asak
+a-sale
+asale
+asamblea
+asana
+Asante
+Asantehene
+ASAP
+asap
+Asaph
+asaphia
+Asaphic
+asaphid
+Asaphidae
+Asaphus
+asaprol
+Asapurna
+Asar
+asarabacca
+Asaraceae
+Asare
+Asarh
+asarin
+asarite
+asaron
+asarone
+asarota
+asarotum
+asarta
+Asarum
+asarum
+asarums
+Asat
+asb
+Asben
+asbest
+asbestic
+asbestiform
+asbestine
+asbestinize
+asbestoid
+asbestoidal
+asbestos
+asbestos-coated
+asbestos-corrugated
+asbestos-covered
+asbestoses
+Asbestosis
+asbestosis
+asbestos-packed
+asbestos-protected
+asbestos-welded
+asbestous
+asbestus
+asbestuses
+Asbjornsen
+asbolan
+asbolane
+asbolin
+asboline
+asbolite
+Asbury
+ASC
+Asc
+asc-
+Ascabart
+Ascalabota
+Ascalabus
+Ascalaphus
+ascan
+Ascanian
+Ascanius
+ASCAP
+Ascapart
+ascape
+ascare
+ascared
+ascariasis
+ascaricidal
+ascaricide
+ascarid
+Ascaridae
+ascarides
+Ascaridia
+ascaridiasis
+ascaridol
+ascaridole
+ascarids
+Ascaris
+ascaris
+ascaron
+ASCC
+ascebc
+Ascella
+ascelli
+ascellus
+ascence
+ascend
+ascendable
+ascendance
+ascendancies
+ascendancy
+ascendant
+ascendantly
+ascendants
+ascended
+ascendence
+ascendency
+ascendent
+ascender
+ascenders
+ascendible
+ascending
+ascendingly
+ascends
+Ascenez
+ascenseur
+Ascension
+ascension
+ascensional
+ascensionist
+ascensions
+Ascensiontide
+ascensive
+ascensor
+ascent
+ascents
+ascertain
+ascertainability
+ascertainable
+ascertainableness
+ascertainably
+ascertained
+ascertainer
+ascertaining
+ascertainment
+ascertains
+ascescency
+ascescent
+asceses
+ascesis
+ascetic
+ascetical
+ascetically
+asceticism
+asceticisms
+ascetics
+Ascetta
+Asch
+Aschaffenburg
+aschaffite
+Ascham
+ascham
+Aschelminthes
+ascher
+Aschim
+aschistic
+asci
+ascian
+ascians
+ascicidia
+Ascidia
+ascidia
+Ascidiacea
+Ascidiae
+ascidian
+ascidians
+ascidiate
+ascidicolous
+ascidiferous
+ascidiform
+ascidiia
+ascidioid
+Ascidioida
+Ascidioidea
+Ascidiozoa
+ascidiozooid
+ascidium
+asciferous
+ascigerous
+ASCII
+ascii
+ascill
+ascitan
+ascitb
+ascite
+ascites
+ascitic
+ascitical
+ascititious
+asclent
+Asclepi
+Asclepiad
+asclepiad
+Asclepiadaceae
+asclepiadaceous
+Asclepiadae
+Asclepiade
+Asclepiadean
+asclepiadeous
+Asclepiadic
+Asclepian
+Asclepias
+asclepias
+asclepidin
+asclepidoid
+Asclepieion
+asclepin
+Asclepius
+asclepius
+Asco
+asco-
+ascocarp
+ascocarpous
+ascocarps
+Ascochyta
+ascogenous
+ascogone
+ascogonia
+ascogonial
+ascogonidia
+ascogonidium
+ascogonium
+ascolichen
+Ascolichenes
+ascoma
+ascomata
+ascomycetal
+ascomycete
+Ascomycetes
+ascomycetes
+ascomycetous
+ascon
+Ascones
+asconia
+asconoid
+A-scope
+ascophore
+ascophorous
+Ascophyllum
+ascorbate
+ascorbic
+ascospore
+ascosporic
+ascosporous
+Ascot
+ascot
+Ascothoracica
+ascots
+ASCQ
+ascribable
+ascribe
+ascribed
+ascribes
+ascribing
+ascript
+ascription
+ascriptions
+ascriptitii
+ascriptitious
+ascriptitius
+ascriptive
+ascrive
+ascry
+ascula
+asculae
+Ascupart
+Ascus
+ascus
+Ascutney
+ascyphous
+Ascyrum
+ASDIC
+asdic
+asdics
+ASDSP
+-ase
+Ase
+ase
+a-sea
+asea
+ASEAN
+asearch
+asecretory
+a-seethe
+aseethe
+aseismatic
+aseismic
+aseismicity
+aseitas
+a-seity
+aseity
+Asel
+aselar
+aselgeia
+asellate
+Aselli
+Asellidae
+Aselline
+aselline
+Asellus
+asellus
+asem
+asemasia
+asemia
+asemic
+Asenath
+Aseneth
+asepalous
+asepses
+asepsis
+aseptate
+aseptic
+aseptically
+asepticism
+asepticize
+asepticized
+asepticizing
+aseptify
+aseptol
+aseptolin
+Aser
+asexual
+asexualisation
+asexualise
+asexualised
+asexualising
+asexuality
+asexualization
+asexualize
+asexualized
+asexualizing
+asexually
+asexuals
+Aseyev
+asfast
+asfetida
+ASG
+asg
+Asgard
+asgard
+Asgardhr
+Asgarth
+asgd
+Asgeir
+Asgeirsson
+asgmt
+Ash
+ash
+Asha
+Ashab
+a-shake
+ashake
+ashame
+ashamed
+ashamedly
+ashamedness
+ashamnu
+Ashangos
+Ashantee
+Ashanti
+ashanti
+A-shaped
+Asharasi
+A-sharp
+Ashaway
+Ashbaugh
+ash-bellied
+ashberry
+Ashbey
+ash-blond
+ash-blue
+Ashburn
+Ashburnham
+Ashburton
+Ashby
+ashcake
+ashcan
+ashcans
+Ashchenaz
+ash-colored
+Ashcroft
+Ashdod
+Ashdown
+Ashe
+Asheboro
+ashed
+Ashelman
+Ashely
+ashen
+ashen-hued
+Asher
+asher
+Asherah
+asherah
+Asherahs
+asherahs
+asheries
+Asherim
+asherim
+Asherite
+Asherites
+Asherton
+ashery
+Ashes
+ashes
+ashet
+Asheville
+ashfall
+Ashfield
+Ashford
+ash-free
+ash-gray
+Ashia
+Ashien
+ashier
+ashiest
+Ashikaga
+Ashil
+ashily
+ashimmer
+a-shine
+ashine
+ashiness
+ashing
+a-shipboard
+ashipboard
+Ashippun
+Ashir
+a-shiver
+ashiver
+Ashjian
+Ashkenaz
+Ashkenazi
+ashkenazi
+Ashkenazic
+Ashkenazim
+ashkey
+Ashkhabad
+ashkoko
+Ashkum
+Ashla
+Ashlan
+Ashland
+ashlar
+ashlared
+ashlaring
+ashlars
+ash-leaved
+Ashlee
+Ashleigh
+Ashlen
+ashler
+ashlered
+ashlering
+ashlers
+ashless
+Ashley
+Ashli
+Ashlie
+Ashlin
+Ashling
+ashling
+ash-looking
+Ashluslay
+Ashly
+Ashman
+ashman
+Ashmead
+ashmen
+Ashmolean
+Ashmore
+Ashochimi
+Ashok
+ashore
+ashot
+ashpan
+ashpit
+ashplant
+ashplants
+ASHRAE
+Ashraf
+ashraf
+ashrafi
+ashram
+ashrama
+ashrams
+ash-staved
+ashstone
+Ashtabula
+ashthroat
+ash-throated
+Ashti
+Ashton
+Ashton-under-Lyne
+Ashtoreth
+ashtoreth
+ashtray
+ashtrays
+Ashuelot
+Ashur
+ashur
+Ashurbanipal
+ashvamedha
+Ashville
+ash-wednesday
+ashweed
+Ashwell
+ash-white
+Ashwin
+Ashwood
+ashwort
+ashy
+ASI
+Asia
+asia
+asialia
+Asian
+asian
+Asianic
+Asianism
+asians
+Asiarch
+asiarch
+Asiarchate
+Asiatic
+asiatic
+Asiatical
+Asiatically
+Asiatican
+Asiaticism
+asiaticism
+Asiaticization
+Asiaticize
+Asiatize
+ASIC
+aside
+asidehand
+asiden
+asideness
+asiderite
+asides
+asideu
+asiento
+asilid
+Asilidae
+Asilomar
+Asilus
+asimen
+Asimina
+a-simmer
+asimmer
+Asine
+asinego
+asinegoes
+asinine
+asininely
+asininities
+asininity
+ASIO
+Asio
+asiphonate
+asiphonogama
+Asir
+-asis
+asitia
+Asius
+ASK
+Ask
+ask
+askable
+askance
+askant
+askapart
+askar
+askarel
+Askari
+askari
+askaris
+asked
+Askelon
+asker
+askers
+askeses
+askesis
+askew
+askewgee
+askewness
+askile
+asking
+askingly
+askings
+askip
+Askja
+asklent
+Asklepios
+askoi
+askos
+Askov
+askoye
+Askr
+asks
+Askwith
+aslake
+Aslam
+aslant
+aslantwise
+aslaver
+asleep
+ASLEF
+aslop
+aslope
+a-slug
+aslumber
+ASM
+asmack
+asmalte
+Asmara
+ASME
+a-smear
+asmear
+asmile
+Asmodeus
+asmodeus
+asmoke
+asmolder
+Asmonaean
+Asmonean
+a-smoulder
+ASN
+ASN1
+Asni
+Asnieres
+asniffle
+a-snort
+asnort
+Aso
+a-soak
+asoak
+ASOC
+asocial
+asok
+Asoka
+asoka
+asomatophyte
+asomatous
+asonant
+asonia
+asop
+Asopus
+asor
+Asosan
+Asotin
+a-south
+asouth
+ASP
+Asp
+asp
+Aspa
+ASPAC
+aspace
+aspalathus
+Aspalax
+aspalax
+asparagic
+asparagin
+asparagine
+asparaginic
+asparaginous
+asparagus
+asparaguses
+asparagyl
+asparamic
+a-sparkle
+asparkle
+Aspartame
+aspartame
+aspartate
+aspartic
+aspartokinase
+aspartyl
+Aspasia
+Aspatia
+ASPCA
+aspca
+aspect
+aspectable
+aspectant
+aspection
+aspects
+aspectual
+ASPEN
+Aspen
+aspen
+aspens
+asper
+asperate
+asperated
+asperates
+asperating
+asperation
+aspergation
+asperge
+asperger
+Asperges
+asperges
+asperggilla
+asperggilli
+aspergil
+aspergill
+aspergilla
+Aspergillaceae
+Aspergillales
+aspergilli
+aspergilliform
+aspergillin
+aspergilloses
+aspergillosis
+aspergillum
+aspergillums
+aspergillus
+Asperifoliae
+asperifoliate
+asperifolious
+asperite
+asperities
+asperity
+asperly
+aspermatic
+aspermatism
+aspermatous
+aspermia
+aspermic
+Aspermont
+aspermous
+aspern
+asperness
+asperous
+asperously
+Aspers
+aspers
+asperse
+aspersed
+asperser
+aspersers
+asperses
+aspersing
+aspersion
+aspersions
+aspersive
+aspersively
+aspersoir
+aspersor
+aspersoria
+aspersorium
+aspersoriums
+aspersors
+aspersory
+Asperugo
+Asperula
+asperuloside
+asperulous
+Asphalius
+asphalt
+asphalt-base
+asphalted
+asphaltene
+asphalter
+asphaltic
+asphalting
+asphaltite
+asphaltlike
+asphalts
+asphaltum
+asphaltums
+asphaltus
+aspheric
+aspherical
+aspheterism
+aspheterize
+asphodel
+Asphodelaceae
+Asphodeline
+asphodels
+Asphodelus
+asphyctic
+asphyctous
+asphyxia
+asphyxial
+asphyxiant
+asphyxias
+asphyxiate
+asphyxiated
+asphyxiates
+asphyxiating
+asphyxiation
+asphyxiations
+asphyxiative
+asphyxiator
+asphyxied
+asphyxies
+asphyxy
+Aspia
+aspic
+aspics
+aspiculate
+aspiculous
+aspidate
+aspide
+aspidiaria
+aspidinol
+Aspidiotus
+Aspidiske
+Aspidistra
+aspidistra
+aspidistras
+aspidium
+Aspidobranchia
+Aspidobranchiata
+aspidobranchiate
+Aspidocephali
+Aspidochirota
+Aspidoganoidei
+aspidomancy
+Aspidosperma
+aspidospermine
+Aspinwall
+aspiquee
+aspirant
+aspirants
+aspirata
+aspiratae
+aspirate
+aspirated
+aspirates
+aspirating
+aspiration
+aspirations
+aspirator
+aspirators
+aspiratory
+aspire
+aspired
+aspiree
+aspirer
+aspirers
+aspires
+aspirin
+aspiring
+aspiringly
+aspiringness
+aspirins
+aspis
+aspises
+aspish
+asplanchnic
+Asplenieae
+asplenioid
+Asplenium
+asplenium
+asporogenic
+asporogenous
+asporous
+asport
+asportation
+asporulate
+a-spout
+aspout
+a-sprawl
+asprawl
+a-spread
+aspread
+Aspredinidae
+Aspredo
+asprete
+aspring
+a-sprout
+asprout
+asps
+aspy
+asquare
+a-squat
+asquat
+asqueal
+asquint
+a-squirm
+asquirm
+Asquith
+ASR
+asrama
+asramas
+ASRM
+Asroc
+ASRS
+ASS
+ass
+assacu
+Assad
+assafetida
+assafoetida
+assagai
+assagaied
+assagaiing
+assagais
+assahy
+assai
+assail
+assailability
+assailable
+assailableness
+assailant
+assailants
+assailed
+assailer
+assailers
+assailing
+assailment
+assails
+assais
+assalto
+Assam
+assam
+Assama
+assamar
+Assamese
+assamese
+Assamites
+assapan
+assapanic
+assapanick
+Assaracus
+Assaria
+assarion
+assart
+assary
+Assassin
+assassin
+assassinate
+assassinated
+assassinates
+assassinating
+assassination
+assassinations
+assassinative
+assassinator
+assassinatress
+assassinist
+assassins
+assate
+assation
+assaugement
+assault
+assaultable
+assaulted
+assaulter
+assaulters
+assaulting
+assaultive
+assaults
+assausive
+assaut
+Assawoman
+assay
+assayable
+assayed
+assayer
+assayers
+assaying
+assays
+assbaa
+ass-backwards
+ass-chewing
+asse
+asseal
+ass-ear
+assecuration
+assecurator
+assecure
+assecution
+assedat
+assedation
+assegai
+assegaied
+assegaiing
+assegaing
+assegais
+asseize
+asself
+assembl
+assemblable
+assemblage
+assemblages
+assemblagist
+assemblance
+assemble
+assembled
+assemblee
+assemblement
+assembler
+assemblers
+assembles
+assemblies
+assembling
+Assembly
+assembly
+assemblyman
+assemblymen
+assemblywoman
+assemblywomen
+Assen
+assent
+assentaneous
+assentation
+assentatious
+assentator
+assentatorily
+assentatory
+assented
+assenter
+assenters
+assentient
+assenting
+assentingly
+assentive
+assentiveness
+assentor
+assentors
+assents
+asseour
+Asser
+assert
+asserta
+assertable
+assertative
+asserted
+assertedly
+asserter
+asserters
+assertible
+asserting
+assertingly
+assertion
+assertional
+assertions
+assertive
+assertively
+assertiveness
+assertivenesses
+assertor
+assertorial
+assertorially
+assertoric
+assertorical
+assertorically
+assertorily
+assertors
+assertory
+assertress
+assertrix
+asserts
+assertum
+asserve
+asservilize
+asses
+assess
+assessable
+assessably
+assessed
+assessee
+assesses
+assessing
+assession
+assessionary
+assessment
+assessments
+assessor
+assessorial
+assessors
+assessorship
+assessory
+asset
+asseth
+assets
+asset-stripping
+assever
+asseverate
+asseverated
+asseverates
+asseverating
+asseveratingly
+asseveration
+asseverations
+asseverative
+asseveratively
+asseveratory
+assewer
+ass-head
+asshead
+ass-headed
+assheadedness
+asshole
+assholes
+Asshur
+assi
+assibilate
+assibilated
+assibilating
+assibilation
+Assidaean
+assidaean
+Assidean
+assident
+assidual
+assidually
+assiduate
+assiduities
+assiduity
+assiduous
+assiduously
+assiduousness
+assiduousnesses
+assiege
+assientist
+assiento
+assiette
+assify
+assign
+assignability
+assignable
+assignably
+assignat
+assignation
+assignations
+assignats
+assigned
+assignee
+assignees
+assigneeship
+assigner
+assigners
+assigning
+assignment
+assignments
+assignor
+assignors
+assigns
+assilag
+assimilability
+assimilable
+assimilate
+assimilated
+assimilates
+assimilating
+assimilation
+assimilationist
+assimilations
+assimilative
+assimilativeness
+assimilator
+assimilatory
+assimulate
+assinego
+Assiniboin
+Assiniboine
+Assiniboins
+assinuate
+assis
+assisa
+Assisan
+assise
+assish
+assishly
+assishness
+Assisi
+assisi
+assist
+assistance
+assistances
+assistant
+assistanted
+assistants
+assistantship
+assistantships
+assisted
+assistency
+assister
+assisters
+assistful
+assisting
+assistive
+assistless
+assistor
+assistors
+assists
+assith
+Assiut
+assize
+assized
+assizement
+assizer
+assizes
+assizing
+ass-kisser
+ass-kissing
+ass-licker
+ass-licking
+asslike
+assman
+Assmannshausen
+Assmannshauser
+assmanship
+Assn
+assn
+assn.
+assobre
+assoc
+assoc.
+associability
+associable
+associableness
+associate
+associated
+associatedness
+associates
+associateship
+associating
+association
+associational
+associationalism
+associationalist
+associationism
+associationist
+associationistic
+associations
+associative
+associatively
+associativeness
+associativity
+associator
+associators
+associatory
+associe
+assoil
+assoiled
+assoiling
+assoilment
+assoils
+assoilzie
+assoin
+assoluto
+assonance
+assonanced
+assonances
+assonant
+assonantal
+assonantic
+assonantly
+assonants
+assonate
+Assonet
+Assonia
+assoria
+assort
+assortative
+assortatively
+assorted
+assortedness
+assorter
+assorters
+assorting
+assortive
+assortment
+assortments
+assorts
+assot
+Assouan
+ASSR
+ass-reaming
+asssembler
+ass-ship
+asst
+asst.
+assuade
+assuagable
+assuage
+assuaged
+assuagement
+assuagements
+assuager
+assuages
+assuaging
+Assuan
+assuasive
+assubjugate
+assuefaction
+Assuerus
+assuetude
+assumable
+assumably
+assume
+assumed
+assumedly
+assument
+assumer
+assumers
+assumes
+assuming
+assumingly
+assumingness
+assummon
+assumpsit
+assumpt
+Assumption
+assumption
+Assumptionist
+assumptions
+assumptious
+assumptiousness
+assumptive
+assumptively
+assumptiveness
+Assur
+assurable
+assurance
+assurances
+assurant
+assurate
+Assurbanipal
+assurd
+assure
+assured
+assuredly
+assuredness
+assureds
+assurer
+assurers
+assures
+assurge
+assurgency
+assurgent
+assuring
+assuringly
+assuror
+assurors
+asswage
+asswaged
+asswages
+asswaging
+assyntite
+Assyr
+Assyr.
+Assyria
+assyria
+Assyrian
+assyrian
+Assyrianize
+assyrians
+Assyriological
+Assyriologist
+assyriologist
+Assyriologue
+Assyriology
+assyriology
+Assyro-Babylonian
+Assyro-babylonian
+Assyroid
+assyth
+assythment
+Assyut
+-ast
+AST
+ast
+Asta
+asta
+astable
+astacian
+Astacidae
+Astacus
+Astaire
+Astakiwi
+astalk
+a-starboard
+astarboard
+a-stare
+astare
+a-start
+astart
+Astarte
+astarte
+Astartian
+Astartidae
+astasia
+astasia-abasia
+astasias
+astate
+astatic
+astatically
+astaticism
+astatine
+astatines
+astatize
+astatized
+astatizer
+astatizing
+Astatula
+a-stay
+astay
+a-stays
+asteam
+asteatosis
+asteep
+asteer
+asteism
+astel
+astelic
+astely
+-aster
+aster
+Astera
+Asteraceae
+asteraceous
+Asterales
+Asterella
+astereognosis
+Asteria
+asteria
+asteriae
+asterial
+Asterias
+asterias
+asteriated
+Asteriidae
+asterikos
+asterin
+Asterina
+Asterinidae
+asterioid
+Asterion
+asterion
+Asterionella
+asteriscus
+asteriscuses
+asterisk
+asterisked
+asterisking
+asteriskless
+asteriskos
+asterisks
+asterism
+asterismal
+asterisms
+asterite
+Asterius
+asterixis
+astern
+asternal
+Asternata
+asternia
+Asterochiton
+Asterodia
+asteroid
+asteroidal
+Asteroidea
+asteroidean
+asteroids
+Asterolepidae
+Asterolepis
+Asteropaeus
+Asterope
+asterophyllite
+Asterophyllites
+Asterospondyli
+asterospondylic
+asterospondylous
+Asteroxylaceae
+Asteroxylon
+Asterozoa
+asters
+astert
+asterwort
+asthamatic
+asthenia
+asthenias
+asthenic
+asthenical
+asthenics
+asthenies
+asthenobiosis
+asthenobiotic
+asthenolith
+asthenology
+asthenope
+asthenophobia
+asthenopia
+asthenopic
+asthenosphere
+astheny
+asthma
+asthmas
+asthmatic
+asthmatical
+asthmatically
+asthmatics
+asthmatoid
+asthmogenic
+asthore
+asthorin
+Asti
+Astian
+astichous
+astigmat
+astigmatic
+astigmatical
+astigmatically
+astigmatism
+astigmatisms
+astigmatizer
+astigmatometer
+astigmatometry
+astigmatoscope
+astigmatoscopies
+astigmatoscopy
+astigmia
+astigmias
+astigmic
+astigmism
+astigmometer
+astigmometry
+astigmoscope
+Astilbe
+astilbe
+astint
+astipulate
+astipulation
+astir
+Astispumante
+astite
+ASTM
+ASTMS
+astogeny
+Astolat
+astomatal
+astomatous
+astomia
+astomous
+Aston
+astond
+astone
+astoned
+astonied
+astonies
+astonish
+astonished
+astonishedly
+astonisher
+astonishes
+astonishing
+astonishingly
+astonishingness
+astonishment
+astonishments
+astony
+astonying
+astoop
+Astor
+astor
+astore
+Astoria
+astound
+astoundable
+astounded
+astounding
+astoundingly
+astoundment
+astounds
+astr
+astr-
+astr.
+Astra
+Astrabacus
+Astrachan
+astrachan
+astracism
+a-straddle
+astraddle
+Astraea
+astraea
+Astraean
+astraean
+astraeid
+Astraeidae
+astraeiform
+Astraeus
+astragal
+astragalar
+astragalectomy
+astragali
+astragalocalcaneal
+astragalocentral
+astragalomancy
+astragalonavicular
+astragaloscaphoid
+astragalotibial
+astragals
+Astragalus
+astragalus
+Astrahan
+a-strain
+astrain
+astrakanite
+Astrakhan
+astrakhan
+astral
+astrally
+astrals
+a-strand
+astrand
+Astrangia
+Astrantia
+astraphobia
+astrapophobia
+Astrateia
+astray
+astre
+Astrea
+astream
+astrean
+Astred
+astrer
+Astri
+astrict
+astricted
+astricting
+astriction
+astrictive
+astrictively
+astrictiveness
+astricts
+Astrid
+astride
+astrier
+astriferous
+astrild
+astringe
+astringed
+astringence
+astringencies
+astringency
+astringent
+astringently
+astringents
+astringer
+astringes
+astringing
+astrion
+astrionics
+Astrix
+astro-
+astroalchemist
+astrobiological
+astrobiologically
+astrobiologies
+astrobiologist
+astrobiologists
+astrobiology
+astroblast
+astrobotany
+Astrocaryum
+astrochemist
+astrochemistry
+astrochronological
+astrocompass
+astrocyte
+astrocytic
+astrocytoma
+astrocytomas
+astrocytomata
+astrodiagnosis
+astrodome
+astrodynamic
+astrodynamics
+astrofel
+astrofell
+astrogate
+astrogated
+astrogating
+astrogation
+astrogational
+astrogator
+astrogeny
+astrogeologist
+astrogeology
+astroglia
+astrognosy
+astrogonic
+astrogony
+astrograph
+astrographer
+astrographic
+astrography
+astrohatch
+astroid
+astroite
+astrol
+astrol.
+astrolabe
+astrolabes
+astrolabical
+astrolater
+astrolatry
+astrolithology
+astrolog
+astrologaster
+astrologe
+astrologer
+astrologers
+astrologian
+astrologic
+astrological
+astrologically
+astrologies
+astrologist
+astrologistic
+astrologists
+astrologize
+astrologous
+astrology
+astromancer
+astromancy
+astromantic
+astromeda
+astrometeorological
+astrometeorologist
+astro-meteorology
+astrometeorology
+astrometer
+astrometric
+astrometrical
+astrometry
+astron
+astronaut
+Astronautarum
+astronautic
+astronautical
+astronautically
+astronautics
+Astronauts
+astronauts
+astronavigation
+astronavigator
+astronomer
+astronomers
+astronomic
+astronomical
+astronomically
+astronomics
+astronomien
+astronomize
+astronomy
+Astropecten
+Astropectinidae
+astrophel
+astrophil
+astrophobia
+astrophotographer
+astrophotographic
+astrophotography
+astrophotometer
+astrophotometrical
+astrophotometry
+astrophyllite
+astrophysical
+astrophysicist
+astrophysicists
+astrophysics
+Astrophyton
+astroscope
+Astroscopus
+astroscopy
+astrose
+astrospectral
+astrospectroscopic
+astrosphere
+astrospherecentrosomic
+astrotheology
+Astroturf
+astructive
+a-strut
+astrut
+Astto
+astucious
+astuciously
+astucity
+Astur
+Asturian
+Asturias
+astute
+astutely
+astuteness
+astutious
+Astyanax
+astyanax
+Astydamia
+astylar
+astyllen
+Astylospongia
+Astylosternus
+ASU
+asuang
+a-sudden
+asudden
+Asunci
+Asuncion
+asunder
+Asur
+Asura
+Asuri
+ASV
+Asvins
+ASW
+aswail
+Aswan
+a-swarm
+aswarm
+a-swash
+aswash
+a-sway
+asway
+a-sweat
+asweat
+aswell
+asweve
+a-swim
+aswim
+a-swing
+aswing
+aswirl
+aswithe
+a-swoon
+aswoon
+aswooned
+aswough
+As-yakh
+asyla
+asylabia
+asyle
+asyllabia
+asyllabic
+asyllabical
+asylum
+asylums
+asymbiotic
+asymbolia
+asymbolic
+asymbolical
+asymmetral
+asymmetranthous
+asymmetric
+asymmetrical
+asymmetrically
+asymmetries
+asymmetrocarpous
+Asymmetron
+asymmetry
+asymptomatic
+asymptomatically
+asymptote
+asymptotes
+asymptotic
+asymptotical
+asymptotically
+asymtote
+asymtotes
+asymtotic
+asymtotically
+asynapsis
+asynaptic
+asynartete
+asynartetic
+async
+asynchronism
+asynchronisms
+asynchronous
+asynchronously
+asynchrony
+asyndesis
+asyndeta
+asyndetic
+asyndetically
+asyndeton
+asyndetons
+asynergia
+asynergy
+asyngamic
+asyngamy
+Asynjur
+asyntactic
+asyntrophy
+asystematic
+asystole
+asystolic
+asystolism
+Asyut
+asyzygetic
+Asz
+AT
+At
+at
+at-
+at.
+ATA
+Ata
+atabal
+Atabalipa
+atabals
+atabeg
+atabek
+Atabrine
+atabrine
+Atabyrian
+Atacaman
+Atacamenan
+Atacamenian
+Atacameno
+atacamite
+ATACC
+atactic
+atactiform
+Ataentsic
+atafter
+ataghan
+ataghans
+Atahualpa
+Ataigal
+Ataiyal
+Atakapa
+Atakapas
+atake
+Atal
+Atalan
+Atalanta
+atalanta
+Atalante
+Atalanti
+atalantis
+Atalaya
+atalaya
+Atalayah
+atalayas
+Atalee
+Ataliah
+Atalie
+Atalissa
+Atalya
+ataman
+atamans
+atamasco
+atamascos
+atame
+Atamosco
+atangle
+atap
+ataps
+atar
+ataractic
+Atarax
+ataraxia
+ataraxias
+ataraxic
+ataraxics
+ataraxies
+ataraxy
+Atascadero
+Atascosa
+Atat
+atatschite
+Ataturk
+ataunt
+ataunto
+atavi
+atavic
+atavism
+atavisms
+atavist
+atavistic
+atavistically
+atavists
+atavus
+ataxaphasia
+ataxia
+ataxiagram
+ataxiagraph
+ataxiameter
+ataxiaphasia
+ataxias
+ataxic
+ataxics
+ataxies
+ataxinomic
+ataxite
+ataxonomic
+ataxophemia
+ataxy
+atazir
+ATB
+Atbara
+atbash
+ATC
+Atcheson
+Atchison
+atchison
+Atcliffe
+Atco
+ATDA
+ATDRS
+-ate
+ATE
+Ate
+ate
+ate-
+Ateba
+atebrin
+atechnic
+atechnical
+atechny
+-ated
+ated
+atees
+ateeter
+atef
+atef-crown
+ateknia
+atelectasis
+atelectatic
+ateleiosis
+atelene
+ateleological
+Ateles
+atelestite
+atelets
+atelic
+atelier
+ateliers
+ateliosis
+ateliotic
+Atellan
+atellan
+atelo
+atelo-
+atelocardia
+atelocephalous
+ateloglossia
+atelognathia
+atelomitic
+atelomyelia
+atelophobia
+atelopodia
+ateloprosopia
+atelorachidia
+atelostomia
+ately
+atemoya
+a-temporal
+atemporal
+Aten
+Atenism
+Atenist
+A-tent
+ater-
+Aterian
+aterian
+ates
+Ateste
+Atestine
+ateuchi
+ateuchus
+ATF
+Atfalati
+Atglen
+ATH
+Athabasca
+Athabascan
+Athabaska
+Athabaskan
+Athal
+athalamous
+Athalee
+Athalia
+Athaliah
+Athalie
+Athalla
+Athallia
+athalline
+Athamantid
+athamantin
+Athamas
+athamaunte
+athanasia
+Athanasian
+athanasian
+Athanasianism
+Athanasianist
+athanasies
+Athanasius
+athanasy
+athanor
+Athapascan
+Athapaskan
+athapaskan
+athar
+Atharvan
+Atharva-Veda
+athbash
+Athecae
+Athecata
+athecate
+atheism
+atheisms
+atheist
+atheistic
+atheistical
+atheistically
+atheisticalness
+atheisticness
+atheists
+atheize
+atheizer
+Athel
+athel
+Athelbert
+athelia
+atheling
+athelings
+Athelred
+Athelstan
+Athelstane
+athematic
+Athena
+athena
+Athenaea
+Athenaeum
+athenaeum
+athenaeums
+Athenaeus
+Athenagoras
+Athenai
+Athene
+athenee
+atheneum
+atheneums
+Athenian
+athenian
+Athenianly
+athenians
+Athenienne
+athenor
+Athens
+athens
+atheological
+atheologically
+atheology
+atheous
+Athericera
+athericeran
+athericerous
+atherine
+Atherinidae
+Atheriogaea
+Atheriogaean
+Atheris
+athermancy
+athermanous
+athermic
+athermous
+atherogenesis
+atherogenic
+atheroma
+atheromas
+atheromasia
+atheromata
+atheromatosis
+atheromatous
+atheroscleroses
+atherosclerosis
+atherosclerotic
+atherosclerotically
+Atherosperma
+Atherton
+Atherurus
+athetesis
+atheticize
+athetize
+athetized
+athetizing
+athetoid
+athetoids
+athetosic
+athetosis
+athetotic
+Athey
+Athie
+athing
+athink
+athirst
+Athiste
+athlete
+athletehood
+athletes
+athletic
+athletical
+athletically
+athleticism
+athletics
+athletism
+athletocracy
+athlothete
+athlothetes
+athodyd
+athodyds
+athogen
+Athol
+athold
+at-home
+at-homeish
+at-homeishness
+at-homeness
+athonite
+athort
+Athos
+athrepsia
+athreptic
+a-thrill
+athrill
+athrive
+a-throb
+athrob
+athrocyte
+athrocytosis
+athrogenic
+a-throng
+athrong
+athrough
+athumia
+athwart
+athwarthawse
+athwartship
+athwartships
+athwartwise
+athymia
+athymic
+athymy
+athyreosis
+athyria
+athyrid
+Athyridae
+Athyris
+Athyrium
+athyroid
+athyroidism
+athyrosis
+ATI
+Ati
+Atiana
+-atic
+Atik
+Atikokania
+Atila
+-atile
+atilt
+atimon
+atimy
+ating
+atinga
+atingle
+atinkle
+-ation
+atip
+a-tiptoe
+atiptoe
+ATIS
+atis
+-ative
+ATK
+Atka
+Atkins
+Atkinson
+Atlanta
+atlanta
+atlantad
+atlantal
+Atlante
+Atlantean
+atlantean
+atlantes
+Atlantic
+atlantic
+Atlantica
+Atlantid
+Atlantides
+Atlantis
+atlantis
+atlantite
+atlanto-
+atlantoaxial
+atlantodidymus
+atlantomastoid
+Atlanto-mediterranean
+atlantoodontoid
+Atlantosaurus
+atlantosaurus
+at-large
+ATLAS
+Atlas
+atlas
+Atlas-Agena
+Atlasburg
+Atlas-Centaur
+atlases
+Atlaslike
+Atlas-Score
+atlatl
+atlatls
+atle
+Atlee
+atlee
+Atli
+atli
+atlo-
+atloaxoid
+atloid
+atloidean
+atloidoaxoid
+atloido-occipital
+atlo-odontoid
+ATM
+At/m
+atm
+atm.
+atma
+Atman
+atman
+atmans
+atmas
+atmiatrics
+atmiatry
+atmid
+atmidalbumin
+atmidometer
+atmidometry
+atmo
+atmo-
+atmocausis
+atmocautery
+atmoclastic
+atmogenic
+atmograph
+atmologic
+atmological
+atmologist
+atmology
+atmolyses
+atmolysis
+atmolyzation
+atmolyze
+atmolyzer
+atmometer
+atmometric
+atmometry
+atmophile
+Atmore
+atmos
+atmosphere
+atmosphered
+atmosphereful
+atmosphereless
+atmospheres
+atmospheric
+atmospherical
+atmospherically
+atmospherics
+atmospherium
+atmospherology
+atmostea
+atmosteal
+atmosteon
+ATMS
+ATN
+Atnah
+ATO
+atocha
+atocia
+Atoka
+atokal
+atoke
+atokous
+atole
+atoll
+atolls
+a-tolyl
+atom
+atomatic
+atom-bomb
+atom-chipping
+atomechanics
+atomerg
+atomic
+atomical
+atomically
+atomician
+atomicism
+atomicity
+atomics
+atomies
+atomiferous
+atomisation
+atomise
+atomised
+atomises
+atomising
+atomism
+atomisms
+atomist
+atomistic
+atomistical
+atomistically
+atomistics
+atomists
+atomity
+atomization
+atomize
+atomized
+atomizer
+atomizers
+atomizes
+atomizing
+atomology
+atom-rocket
+ATOMS
+atoms
+atom-smashing
+atom-tagger
+atom-tagging
+atomy
+Aton
+atonable
+atonal
+atonalism
+atonalist
+atonalistic
+atonality
+atonally
+atone
+atoneable
+atoned
+atonement
+atonements
+atoneness
+atoner
+atoners
+atones
+atonia
+atonic
+atonicity
+atonics
+atonies
+atoning
+atoningly
+Atonsah
+atony
+atop
+atopen
+Atophan
+atophan
+atopic
+atopies
+atopite
+atopy
+-ator
+Atorai
+-atory
+Atossa
+atour
+atoxic
+Atoxyl
+atoxyl
+ATP
+ATP2
+ATPCO
+atpoints
+ATR
+atrabilaire
+atrabilar
+atrabilarian
+atrabilarious
+atrabile
+atrabiliar
+atrabiliarious
+atrabiliary
+atrabilious
+atrabiliousness
+atracheate
+Atractaspis
+Atragene
+atragene
+Atrahasis
+atrail
+atrament
+atramental
+atramentary
+atramentous
+atraumatic
+Atrax
+atrazine
+atrazines
+Atrebates
+atrede
+Atremata
+atremate
+atrematous
+a-tremble
+atremble
+atren
+atrenne
+atrepsy
+atreptic
+atresia
+atresias
+atresic
+atresy
+atretic
+Atreus
+atreus
+atria
+atrial
+atrible
+Atrice
+atrichia
+atrichic
+atrichosis
+atrichous
+atrickle
+Atridae
+Atridean
+atrienses
+atriensis
+atriocoelomic
+atrioporal
+atriopore
+atrioventricular
+a-trip
+atrip
+Atriplex
+atrium
+atriums
+atro-
+atroce
+atroceruleous
+atroceruleus
+atrocha
+atrochal
+atrochous
+atrocious
+atrociously
+atrociousness
+atrociousnesses
+atrocities
+atrocity
+atrocoeruleus
+atrolactic
+Atronna
+Atropa
+atropaceous
+atropal
+atropamine
+Atropatene
+atrophia
+atrophias
+atrophiated
+atrophic
+atrophied
+atrophies
+atrophoderma
+atrophous
+atrophy
+atrophying
+atropia
+atropic
+Atropidae
+atropin
+atropine
+atropines
+atropinism
+atropinization
+atropinize
+atropins
+atropism
+atropisms
+Atropos
+atropos
+atropous
+atrorubent
+atrosanguineous
+atroscine
+atrous
+ATRS
+a-try
+atry
+Atrypa
+atrypoid
+ATS
+atsara
+Atsugi
+AT&T
+ATT
+att
+att.
+Atta
+atta
+attababy
+attabal
+attaboy
+Attacapan
+attacca
+attacco
+attach
+attachable
+attachableness
+attache
+attached
+attachedly
+attacher
+attachers
+attaches
+attacheship
+attaching
+attachment
+attachments
+attack
+attackable
+attacked
+attacker
+attackers
+attacking
+attackingly
+attackman
+attacks
+attacolite
+Attacus
+attacus
+attagal
+attagen
+attaghan
+attagirl
+Attah
+attain
+attainabilities
+attainability
+attainable
+attainableness
+attainably
+attainder
+attainders
+attained
+attainer
+attainers
+attaining
+attainment
+attainments
+attainor
+attains
+attaint
+attainted
+attainting
+attaintment
+attaints
+attainture
+attal
+Attalanta
+Attalea
+attaleh
+Attalid
+Attalie
+Attalla
+attame
+attapulgite
+Attapulgus
+attar
+attargul
+attars
+attask
+attaste
+attatched
+attatches
+ATTC
+ATTCOM
+atte
+atteal
+attemper
+attemperament
+attemperance
+attemperate
+attemperately
+attemperation
+attemperator
+attempered
+attempering
+attempers
+attempre
+attempt
+attemptability
+attemptable
+attempted
+attempter
+attempters
+attempting
+attemptive
+attemptless
+attempts
+Attenborough
+attend
+attendance
+attendances
+attendancy
+attendant
+attendantly
+attendants
+attended
+attendee
+attendees
+attender
+attenders
+attending
+attendingly
+attendings
+attendment
+attendress
+attends
+attensity
+attent
+attentat
+attentate
+attention
+attentional
+attentionality
+attention-getting
+attentions
+attentive
+attentively
+attentiveness
+attentivenesses
+attently
+attenuable
+attenuant
+attenuate
+attenuated
+attenuates
+attenuating
+attenuation
+attenuations
+attenuative
+attenuator
+attenuators
+Attenweiler
+atter
+Atterbury
+attercop
+attercrop
+atterminal
+attermine
+attermined
+atterminement
+attern
+atterr
+atterrate
+attery
+attest
+attestable
+attestant
+attestation
+attestations
+attestative
+attestator
+attested
+attester
+attesters
+attesting
+attestive
+attestor
+attestors
+attests
+Atthia
+Attic
+attic
+Attica
+Attical
+attice
+Atticise
+Atticised
+Atticising
+Atticism
+atticism
+atticisms
+Atticist
+atticist
+atticists
+Atticize
+atticize
+Atticized
+atticized
+Atticizing
+atticizing
+atticomastoid
+attics
+attid
+Attidae
+attidae
+Attila
+attila
+attinge
+attingence
+attingency
+attingent
+attirail
+attire
+attired
+attirement
+attirer
+attires
+attiring
+ATTIS
+Attis
+attitude
+attitudes
+attitudinal
+attitudinarian
+attitudinarianism
+attitudinise
+attitudinised
+attitudiniser
+attitudinising
+attitudinize
+attitudinized
+attitudinizer
+attitudinizes
+attitudinizing
+attitudist
+Attius
+Attiwendaronk
+attle
+Attleboro
+Attlee
+attn
+attntrp
+atto-
+attollent
+attomy
+attorn
+attornare
+attorned
+attorney
+attorney-at-law
+attorneydom
+attorney-generalship
+attorney-in-fact
+attorneyism
+attorneys
+attorneys-at-law
+attorneyship
+attorneys-in-fact
+attorning
+attornment
+attorns
+attouchement
+attour
+attourne
+attract
+attractability
+attractable
+attractableness
+attractance
+attractancy
+attractant
+attractants
+attracted
+attracted-disk
+attracter
+attractile
+attracting
+attractingly
+attraction
+attractionally
+attractions
+attractive
+attractively
+attractiveness
+attractivenesses
+attractivity
+attractor
+attractors
+attracts
+attrahent
+attrap
+attrectation
+attrib
+attrib.
+attributable
+attributal
+attribute
+attributed
+attributer
+attributes
+attributing
+attribution
+attributional
+attributions
+attributive
+attributively
+attributiveness
+attributives
+attributor
+attrist
+attrite
+attrited
+attriteness
+attriting
+attrition
+attritional
+attritive
+attritus
+attriutively
+attroopment
+attroupement
+attry
+Attu
+attune
+attuned
+attunely
+attunement
+attunes
+attuning
+atturn
+Attwood
+atty
+atty.
+atua
+Atuami
+Atul
+atule
+Atum
+a-tumble
+atumble
+atune
+ATV
+atveen
+a-twain
+atwain
+Atwater
+At/Wb
+atweel
+atween
+Atwekk
+atwin
+atwind
+atwirl
+a-twist
+atwist
+atwitch
+atwite
+a-twitter
+atwitter
+atwixt
+a-two
+atwo
+Atwood
+Atworth
+Atymnius
+atypic
+atypical
+atypicality
+atypically
+atypy
+Atys
+A.U.
+AU
+Au
+AUA
+auantic
+aubade
+aubades
+aubain
+aubaine
+Aubanel
+Aubarta
+Aube
+aube
+aubepine
+Auber
+Auberbach
+Auberge
+auberge
+auberges
+aubergine
+aubergiste
+aubergistes
+Auberon
+Auberry
+Aubert
+Auberta
+Aubervilliers
+Aubigny
+Aubin
+aubin
+Aubine
+Aubree
+Aubreir
+aubretia
+aubretias
+Aubrette
+Aubrey
+Aubrie
+aubrieta
+aubrietas
+Aubrietia
+aubrietia
+aubrite
+Aubry
+Auburn
+auburn
+Auburndale
+auburn-haired
+auburns
+Auburntown
+Auburta
+Aubusson
+aubusson
+Aubyn
+A.U.C.
+AUC
+Auca
+auca
+Aucan
+Aucaner
+Aucanian
+Auchenia
+auchenia
+auchenium
+Auchincloss
+Auchinleck
+auchlet
+aucht
+Auckland
+auckland
+auctary
+auction
+auctionary
+auctioned
+auctioneer
+auctioneers
+auctioning
+auctions
+auctor
+auctorial
+auctorizate
+auctors
+Aucuba
+aucuba
+aucubas
+aucupate
+aud
+aud.
+audace
+audacious
+audaciously
+audaciousness
+audacities
+audacity
+audad
+audads
+Audaean
+Aude
+Auden
+Audette
+Audhumbla
+Audhumla
+Audi
+Audian
+Audibertia
+audibility
+audible
+audibleness
+audibles
+audibly
+Audie
+audience
+audience-proof
+audiencer
+audiences
+audiencia
+audiencier
+audient
+audients
+audile
+audiles
+auding
+audings
+audio
+audio-
+audioemission
+audio-frequency
+audiogenic
+audiogram
+audiograms
+audiological
+audiologies
+audiologist
+audiologists
+audiology
+audiometer
+audiometers
+audiometric
+audiometrically
+audiometries
+audiometrist
+audiometry
+Audion
+audion
+audiophile
+audiophiles
+audios
+audiotape
+audiotapes
+audiotypist
+audio-visual
+audiovisual
+audio-visually
+audiovisuals
+audiphone
+audit
+auditable
+audited
+auditing
+audition
+auditioned
+auditioning
+auditions
+auditive
+auditives
+auditor
+auditor-general
+auditoria
+auditorial
+auditorially
+auditories
+auditorily
+auditorium
+auditoriums
+auditors
+auditors-general
+auditorship
+auditory
+auditotoria
+auditress
+audits
+auditual
+audivise
+audiviser
+audivision
+AUDIX
+Audley
+Audly
+Audra
+Audras
+Audre
+Audres
+Audrey
+Audri
+Audrie
+Audris
+Audrit
+Audry
+Audrye
+Audsley
+Audubon
+audubon
+Audubonistic
+Audun
+Audwen
+Audwin
+Audy
+Auer
+Auerbach
+Aueto
+AUEW
+auf
+aufait
+aufgabe
+Aufklarung
+aufklarung
+Aufklrung
+Aufmann
+auftakt
+Aug
+Aug.
+aug
+aug.
+auganite
+Auge
+auge
+Augean
+augean
+Augeas
+augelite
+Augelot
+augen
+augend
+augends
+augen-gabbro
+augen-gneiss
+auger
+augerer
+auger-nose
+augers
+auger-type
+auget
+augh
+aught
+aughtlins
+aughts
+Augie
+Augier
+augite
+augite-porphyrite
+augite-porphyry
+augites
+augitic
+augitite
+augitophyre
+augment
+augmentable
+augmentation
+augmentationer
+augmentations
+augmentative
+augmentatively
+augmented
+augmentedly
+augmenter
+augmenters
+augmenting
+augmentive
+augmentor
+augments
+Augres
+augrim
+Augsburg
+augur
+augural
+augurate
+auguration
+augure
+augured
+augurer
+augurers
+augurial
+auguries
+auguring
+augurous
+augurs
+augurship
+augury
+August
+august
+Augusta
+augusta
+augustal
+Augustales
+Augustan
+augustan
+Auguste
+auguste
+auguster
+augustest
+Augusti
+Augustin
+augustin
+Augustina
+Augustine
+augustine
+Augustinian
+augustinian
+Augustinianism
+Augustinism
+augustly
+augustness
+Augusto
+Augustus
+Augy
+auh
+auhuhu
+AUI
+Auk
+auk
+auklet
+auklets
+auks
+auksinai
+auksinas
+auksinu
+aul
+aula
+aulacocarpous
+Aulacodus
+Aulacomniaceae
+Aulacomnium
+aulae
+Aulander
+Aulard
+aularian
+aulas
+auld
+aulder
+auldest
+auld-farran
+auld-farrand
+auld-farrant
+auldfarrantlike
+auld-warld
+Aulea
+auletai
+aulete
+auletes
+auletic
+auletrides
+auletris
+aulic
+aulical
+aulicism
+Auliffe
+Aulis
+aullay
+auln-
+auloi
+aulophobia
+aulophyte
+aulos
+Aulostoma
+Aulostomatidae
+Aulostomi
+aulostomid
+Aulostomidae
+Aulostomus
+Ault
+Aultman
+aulu
+AUM
+Aum
+aum
+aumaga
+aumail
+aumakua
+aumbries
+aumbry
+aumery
+aumil
+aumildar
+aummbulatory
+aumoniere
+aumous
+aumrie
+Aumsville
+Aun
+aunc-
+auncel
+Aundrea
+aune
+Aunjetitz
+Aunson
+aunt
+aunter
+aunters
+aunthood
+aunthoods
+auntie
+aunties
+auntish
+auntlier
+auntliest
+auntlike
+auntly
+auntre
+auntrous
+aunts
+auntsary
+auntship
+aunty
+AUP
+aupaka
+aur-
+AURA
+Aura
+aura
+aurae
+Aural
+aural
+aurally
+auramin
+auramine
+aurang
+Aurangzeb
+aurantia
+Aurantiaceae
+aurantiaceous
+Aurantium
+aurantium
+aurar
+auras
+aurata
+aurate
+aurated
+Aurea
+aureal
+aureate
+aureately
+aureateness
+aureation
+aurei
+aureity
+Aurel
+Aurelea
+Aurelia
+aurelia
+Aurelian
+aurelian
+Aurelie
+Aurelio
+Aurelius
+aurene
+Aureocasidium
+aureola
+aureolae
+aureolas
+aureole
+aureoled
+aureoles
+aureolin
+aureoline
+aureoling
+Aureomycin
+aureomycin
+aureous
+aureously
+Aures
+aures
+auresca
+aureus
+Auria
+auribromide
+Auric
+auric
+aurichalcite
+aurichalcum
+aurichloride
+aurichlorohydric
+auricle
+auricled
+auricles
+auricomous
+Auricula
+auricula
+auriculae
+auricular
+auriculare
+auriculares
+Auricularia
+auricularia
+Auriculariaceae
+auriculariae
+Auriculariales
+auricularian
+auricularias
+auricularis
+auricularly
+auriculars
+auriculas
+auriculate
+auriculated
+auriculately
+Auriculidae
+auriculo
+auriculocranial
+auriculoid
+auriculo-infraorbital
+auriculo-occipital
+auriculoparietal
+auriculotemporal
+auriculoventricular
+auriculovertical
+auricyanhydric
+auricyanic
+auricyanide
+auride
+Aurie
+auriferous
+aurifex
+aurific
+aurification
+aurified
+auriflamme
+auriform
+aurify
+aurifying
+Auriga
+auriga
+Aurigae
+aurigal
+aurigation
+aurigerous
+Aurigid
+Aurignac
+Aurignacian
+aurignacian
+aurigo
+aurigraphy
+auri-iodide
+aurilave
+Aurilia
+aurin
+aurinasal
+aurine
+Auriol
+auriphone
+auriphrygia
+auriphrygiate
+auripigment
+auripuncture
+aurir
+auris
+auriscalp
+auriscalpia
+auriscalpium
+auriscope
+auriscopic
+auriscopically
+auriscopy
+aurist
+aurists
+Aurita
+aurite
+aurited
+aurivorous
+Aurlie
+auro-
+auroauric
+aurobromide
+auroch
+aurochloride
+aurochs
+aurochses
+aurocyanide
+aurodiamine
+auronal
+Auroora
+aurophobia
+aurophore
+Aurora
+aurora
+aurorae
+auroral
+aurorally
+auroras
+Aurore
+aurore
+aurorean
+Aurorian
+aurorium
+aurotellurite
+aurothiosulphate
+aurothiosulphuric
+aurous
+aurrescu
+Aurthur
+aurulent
+Aurum
+aurum
+aurums
+aurung
+Aurungzeb
+aurure
+auryl
+AUS
+Aus
+Aus.
+Ausable
+Auschwitz
+auscult
+auscultascope
+auscultate
+auscultated
+auscultates
+auscultating
+auscultation
+auscultations
+auscultative
+auscultator
+auscultatory
+Auscultoscope
+auscultoscope
+Ause
+ausform
+ausformed
+ausforming
+ausforms
+ausgespielt
+Ausgleich
+Ausgleiche
+Aushar
+Auslander
+auslander
+auslaut
+auslaute
+Auslese
+Ausones
+Ausonian
+Ausonius
+auspex
+auspicate
+auspicated
+auspicating
+auspice
+auspices
+auspicial
+auspicious
+auspiciously
+auspiciousness
+auspicy
+Aussie
+aussie
+aussies
+Aust
+Aust.
+Austafrican
+austausch
+Austell
+austemper
+Austen
+austenite
+austenitic
+austenitize
+austenitized
+austenitizing
+Auster
+auster
+austere
+austerely
+austereness
+austerer
+austerest
+austerities
+austerity
+Austerlitz
+austerus
+Austin
+austin
+Austina
+Austinburg
+Austine
+Austinville
+Auston
+austr-
+Austral
+Austral.
+austral
+Australanthropus
+Australasia
+Australasian
+australasian
+Australe
+australene
+Austral-english
+Australia
+australia
+Australian
+australian
+Australiana
+Australianism
+Australianize
+Australian-oak
+australians
+Australic
+Australioid
+Australis
+australis
+australite
+Australoid
+australoid
+Australopithecinae
+Australopithecine
+australopithecine
+Australopithecus
+Australorp
+australorp
+australs
+Austrasia
+Austrasian
+Austreng
+Austria
+austria
+Austria-Hungary
+Austrian
+austrian
+Austrianize
+austrians
+Austric
+austrine
+austringer
+austrium
+Austro-
+Austro-Asiatic
+Austroasiatic
+austroasiatic
+Austro-columbia
+Austro-columbian
+Austrogaea
+Austrogaean
+Austro-Hungarian
+Austro-hungarian
+Austro-malayan
+austromancy
+Austronesia
+Austronesian
+austronesian
+Austrophil
+Austrophile
+Austrophilism
+Austroriparian
+Austro-swiss
+Austwell
+ausu
+ausubo
+ausubos
+aut-
+autacoid
+autacoidal
+autacoids
+autaesthesy
+autallotriomorphic
+autantitypy
+autarch
+autarchic
+autarchical
+autarchically
+autarchies
+autarchist
+Autarchoglossa
+autarchy
+autarkic
+autarkical
+autarkically
+autarkies
+autarkik
+autarkikal
+autarkist
+autarky
+Autaugaville
+aute
+autechoscope
+autecious
+auteciously
+auteciousness
+autecism
+autecisms
+autecologic
+autecological
+autecologically
+autecologist
+autecology
+autecy
+autem
+autere
+Auteuil
+auteur
+auteurism
+auteurs
+autexousy
+auth
+auth.
+authentic
+authentical
+authentically
+authenticalness
+authenticatable
+authenticate
+authenticated
+authenticates
+authenticating
+authentication
+authentications
+authenticator
+authenticators
+authenticities
+authenticity
+authenticly
+authenticness
+authigene
+authigenetic
+authigenic
+authigenous
+Authon
+author
+authorcraft
+author-created
+authored
+author-entry
+authoress
+authoresses
+authorhood
+authorial
+authorially
+authoring
+authorisable
+authorisation
+authorise
+authorised
+authoriser
+authorish
+authorising
+authorism
+authoritarian
+authoritarianism
+authoritarianisms
+authoritarians
+authoritative
+authoritatively
+authoritativeness
+authorities
+authority
+authorizable
+authorization
+authorizations
+authorize
+authorized
+authorizer
+authorizers
+authorizes
+authorizing
+authorless
+authorling
+authorly
+author-publisher
+author-ridden
+authors
+authorship
+authorships
+authotype
+autism
+autisms
+autist
+autistic
+auto
+auto-
+auto.
+autoabstract
+autoactivation
+autoactive
+autoaddress
+autoagglutinating
+autoagglutination
+autoagglutinin
+auto-alarm
+autoalarm
+autoalkylation
+autoallogamous
+autoallogamy
+autoanalysis
+autoanalytic
+autoantibody
+autoanticomplement
+autoantitoxin
+autoasphyxiation
+autoaspiration
+autoassimilation
+auto-audible
+Autobahn
+autobahn
+autobahnen
+autobahns
+autobasidia
+Autobasidiomycetes
+autobasidiomycetous
+autobasidium
+Autobasisii
+autobiographal
+autobiographer
+autobiographers
+autobiographic
+autobiographical
+autobiographically
+autobiographies
+autobiographist
+autobiography
+autobiology
+autoblast
+autoboat
+autoboating
+autobolide
+autobus
+autobuses
+autobusses
+autocab
+autocade
+autocades
+autocall
+autocamp
+autocamper
+autocamping
+autocar
+autocarist
+autocarp
+autocarpian
+autocarpic
+autocarpous
+autocatalepsy
+autocatalyses
+autocatalysis
+autocatalytic
+autocatalytically
+autocatalyze
+autocatharsis
+autocatheterism
+autocephalia
+autocephalic
+autocephality
+autocephalous
+autocephaly
+autoceptive
+autochanger
+autochemical
+autocholecystectomy
+autochrome
+autochromy
+autochronograph
+autochthon
+autochthonal
+autochthones
+autochthonic
+autochthonism
+autochthonous
+autochthonously
+autochthonousness
+autochthons
+autochthony
+autochton
+autocide
+autocinesis
+autoclasis
+autoclastic
+autoclave
+autoclaved
+autoclaves
+autoclaving
+autocoder
+autocoenobium
+autocoherer
+autocoid
+autocoids
+autocollimate
+autocollimation
+autocollimator
+autocollimators
+autocolony
+autocombustible
+autocombustion
+autocomplexes
+autocondensation
+autoconduction
+autoconvection
+autoconverter
+autocopist
+autocoprophagous
+autocorrelate
+autocorrelation
+autocorrosion
+autocosm
+autocracies
+autocracy
+autocrat
+autocratic
+autocratical
+autocratically
+autocraticalness
+autocrator
+autocratoric
+autocratorical
+autocratrix
+autocrats
+autocratship
+autocremation
+autocriticism
+autocross
+autocue
+autocycle
+autocystoplasty
+autocytolysis
+autocytolytic
+auto-da-f
+auto-da-fe
+auto-dafe
+autodecomposition
+autodecrement
+autodecremented
+autodecrements
+autodepolymerization
+autodermic
+autodestruction
+autodetector
+autodiagnosis
+autodiagnostic
+autodiagrammatic
+autodial
+autodialed
+autodialer
+autodialers
+autodialing
+autodialled
+autodialling
+autodials
+autodidact
+autodidactic
+autodidactically
+autodidacts
+autodifferentiation
+autodiffusion
+autodigestion
+autodigestive
+AUTODIN
+autodrainage
+autodrome
+autodynamic
+autodyne
+autodynes
+autoecholalia
+autoecic
+autoecious
+autoeciously
+autoeciousness
+autoecism
+autoecous
+autoecy
+autoed
+autoeducation
+autoeducative
+autoelectrolysis
+autoelectrolytic
+autoelectronic
+autoelevation
+autoepigraph
+autoepilation
+autoerotic
+autoerotically
+autoeroticism
+autoerotism
+autoette
+autoexcitation
+autofecundation
+autofermentation
+autofluorescence
+autoformation
+autofrettage
+autogamic
+autogamies
+autogamous
+autogamy
+autogauge
+autogeneal
+autogeneses
+autogenesis
+autogenetic
+autogenetically
+autogenic
+autogenies
+autogenous
+autogenously
+autogenuous
+autogeny
+Autogiro
+autogiro
+autogiros
+autognosis
+autognostic
+autograft
+autografting
+autogram
+autograph
+autographal
+autographed
+autographer
+autographic
+autographical
+autographically
+autographing
+autographism
+autographist
+autographometer
+autographs
+autography
+autogravure
+autogyro
+autogyros
+Autoharp
+autoharp
+autoheader
+autohemic
+autohemolysin
+autohemolysis
+autohemolytic
+autohemorrhage
+autohemotherapy
+autoheterodyne
+autoheterosis
+autohexaploid
+autohybridization
+autohypnosis
+autohypnotic
+autohypnotically
+autohypnotism
+autohypnotization
+autoicous
+autoignition
+autoimmune
+autoimmunities
+autoimmunity
+autoimmunization
+autoimmunize
+autoimmunized
+autoimmunizing
+autoincrement
+autoincremented
+autoincrements
+autoindex
+autoindexing
+autoinduction
+autoinductive
+auto-infection
+autoinfection
+autoinfusion
+autoing
+autoinhibited
+auto-inoculability
+auto-inoculable
+autoinoculable
+auto-inoculation
+autoinoculation
+autointellectual
+autointoxicant
+autointoxication
+autoionization
+autoirrigation
+autoist
+autojigger
+autojuggernaut
+autokinesis
+autokinesy
+autokinetic
+autokrator
+autolaryngoscope
+autolaryngoscopic
+autolaryngoscopy
+autolater
+autolatry
+autolavage
+autolesion
+autolimnetic
+autolith
+autolithograph
+autolithographer
+autolithographic
+autolithography
+autoloader
+autoloaders
+autoloading
+autological
+autologist
+autologous
+autology
+autoluminescence
+autoluminescent
+Autolycus
+autolysate
+autolysate-precipitate
+autolyse
+autolysin
+autolysis
+autolytic
+Autolytus
+autolyzate
+autolyze
+autolyzed
+autolyzes
+autolyzing
+automa
+automacy
+automaker
+automan
+automania
+automanipulation
+automanipulative
+automanual
+automat
+automata
+automatable
+automate
+automateable
+automated
+automates
+automatic
+automatical
+automatically
+automaticity
+automatics
+automatictacessing
+automating
+automation
+automations
+automatism
+automatist
+automative
+automatization
+automatize
+automatized
+automatizes
+automatizing
+automatograph
+automaton
+automatonlike
+automatons
+automatonta
+automatontons
+automatous
+automats
+automechanical
+automechanism
+Automedon
+automelon
+automen
+autometamorphosis
+autometric
+autometry
+automobile
+automobiled
+automobiles
+automobiling
+automobilism
+automobilist
+automobilistic
+automobilists
+automobility
+automolite
+automonstration
+automorph
+automorphic
+automorphically
+automorphic-granular
+automorphism
+automotive
+automotor
+automower
+autompne
+automysophobia
+autonavigator
+autonavigators
+autonegation
+autonephrectomy
+autonephrotoxin
+autonetics
+autoneurotoxin
+autonitridation
+Autonoe
+autonoetic
+autonomasy
+autonomic
+autonomical
+autonomically
+autonomies
+autonomist
+autonomize
+autonomous
+autonomously
+autonomousness
+autonomy
+autonym
+auto-objective
+auto-observation
+auto-omnibus
+auto-ophthalmoscope
+auto-ophthalmoscopy
+auto-oxidation
+autooxidation
+auto-oxidize
+autoparasitism
+autopathic
+autopathography
+autopathy
+autopelagic
+autopepsia
+autophagi
+autophagia
+autophagous
+autophagy
+autophobia
+autophoby
+autophon
+autophone
+autophonoscope
+autophonous
+autophony
+autophotoelectric
+autophotograph
+autophotometry
+autophthalmoscope
+autophyllogeny
+autophyte
+autophytic
+autophytically
+autophytograph
+autophytography
+autopilot
+autopilots
+autopista
+autoplagiarism
+autoplasmotherapy
+autoplast
+autoplastic
+autoplastically
+autoplasties
+autoplasty
+autopneumatic
+autopoint
+autopoisonous
+autopolar
+autopolo
+autopoloist
+autopolyploid
+autopolyploidy
+autopore
+autoportrait
+autoportraiture
+Autopositive
+autopositive
+autopotamic
+autopotent
+autoprogressive
+autoproteolysis
+autoprothesis
+autopsic
+autopsical
+autopsied
+autopsies
+autopsist
+autopsy
+autopsychic
+autopsychoanalysis
+autopsychology
+autopsychorhythmia
+autopsychosis
+autopsying
+autoptic
+autoptical
+autoptically
+autopticity
+autoput
+autopyotherapy
+autor
+autoracemization
+autoradiogram
+autoradiograph
+autoradiographic
+autoradiography
+autorail
+autoreduction
+autoreflection
+autoregenerator
+autoregressive
+autoregulation
+autoregulative
+autoregulatory
+autoreinfusion
+autoretardation
+autorhythmic
+autorhythmus
+auto-rickshaw
+auto-rifle
+autoriser
+autorotate
+autorotation
+autorotational
+autoroute
+autorrhaphy
+autos
+Autosauri
+Autosauria
+autoschediasm
+autoschediastic
+autoschediastical
+autoschediastically
+autoschediaze
+autoscience
+autoscope
+autoscopic
+autoscopy
+autosender
+autosensitization
+autosensitized
+autosepticemia
+autoserotherapy
+autoserum
+autosexing
+autosight
+autosign
+autosite
+autositic
+autoskeleton
+autosled
+autoslip
+autosomal
+autosomally
+autosomatognosis
+autosomatognostic
+autosome
+autosomes
+autosoteric
+autosoterism
+autospore
+autosporic
+autospray
+autostability
+autostage
+autostandardization
+autostarter
+autostethoscope
+autostoper
+autostrada
+autostradas
+autostylic
+autostylism
+autostyly
+autosuggest
+autosuggestibility
+autosuggestible
+autosuggestion
+autosuggestionist
+autosuggestions
+autosuggestive
+autosuppression
+autosymbiontic
+autosymbolic
+autosymbolical
+autosymbolically
+autosymnoia
+Autosyn
+autosyn
+autosyndesis
+autota
+autotelegraph
+autotelic
+autotelism
+autotetraploid
+autotetraploidy
+autothaumaturgist
+autotheater
+autotheism
+autotheist
+autotherapeutic
+autotherapy
+autothermy
+autotimer
+autotomic
+autotomies
+autotomise
+autotomised
+autotomising
+autotomize
+autotomized
+autotomizing
+autotomous
+autotomy
+autotoxaemia
+autotoxemia
+autotoxic
+autotoxication
+autotoxicity
+autotoxicosis
+autotoxin
+autotoxis
+autotractor
+autotransformer
+autotransfusion
+autotransplant
+autotransplantation
+autotrepanation
+autotriploid
+autotriploidy
+autotroph
+autotrophic
+autotrophically
+autotrophy
+autotropic
+autotropically
+autotropism
+autotruck
+autotuberculin
+autoturning
+autotype
+autotypes
+autotyphization
+autotypic
+autotypies
+autotypography
+autotypy
+autourine
+autovaccination
+autovaccine
+autovalet
+autovalve
+autovivisection
+AUTOVON
+autoxeny
+autoxidation
+autoxidation-reduction
+autoxidator
+autoxidizability
+autoxidizable
+autoxidize
+autoxidizer
+autozooid
+Autrain
+Autrans
+autre
+autrefois
+Autrey
+Autry
+Autryville
+Autum
+Autumn
+autumn
+autumnal
+autumnally
+autumn-brown
+Autumni
+autumnian
+autumnity
+autumns
+autumn-spring
+Autun
+Autunian
+autunite
+autunites
+auturgy
+Auvergne
+Auvil
+Auwers
+AUX
+aux
+aux.
+auxamylase
+auxanogram
+auxanology
+auxanometer
+auxeses
+auxesis
+auxetic
+auxetical
+auxetically
+auxetics
+AUXF
+Auxier
+auxil
+auxiliar
+auxiliaries
+auxiliarly
+auxiliary
+auxiliate
+auxiliation
+auxiliator
+auxiliatory
+auxilium
+auxillary
+auxilytic
+auximone
+auxin
+auxinic
+auxinically
+auxins
+Auxo
+auxoaction
+auxoamylase
+auxoblast
+auxobody
+auxocardia
+auxochrome
+auxochromic
+auxochromism
+auxochromous
+auxocyte
+auxoflore
+auxofluor
+auxograph
+auxographic
+auxohormone
+auxology
+auxometer
+auxospore
+auxosubstance
+auxotonic
+auxotox
+auxotroph
+auxotrophic
+auxotrophy
+Auxvasse
+Auzout
+A.V.
+A/V
+AV
+Av
+a-v
+av
+av-
+av.
+Ava
+ava
+avadana
+avadavat
+avadavats
+avadhuta
+avahi
+avail
+availabile
+availabilities
+availability
+available
+availableness
+availably
+availed
+availer
+availers
+availing
+availingly
+availment
+avails
+aval
+avalanche
+avalanched
+avalanches
+avalanching
+avale
+avalent
+Avallon
+Avalokita
+Avalokitesvara
+Avalon
+avalon
+avalvular
+Avan
+avance
+Avanguardisti
+avania
+avanious
+Avant
+avant
+avant-
+avantage
+avant-courier
+avanters
+avant-garde
+avantgarde
+avant-gardism
+avant-gardist
+Avanti
+avantlay
+avant-propos
+avanturine
+avanyu
+Avar
+Avaradrano
+avaram
+avaremotemo
+Avaria
+Avarian
+avarice
+avarices
+avaricious
+avariciously
+avariciousness
+Avarish
+avaritia
+Avars
+avascular
+avast
+avatar
+avatara
+avatars
+avaunt
+Avawam
+AVC
+AVD
+avdp
+avdp.
+Ave
+Ave.
+ave
+Avebury
+Aveiro
+Avelin
+Avelina
+Aveline
+avell
+Avella
+avellan
+avellane
+Avellaneda
+avellaneous
+avellano
+Avellino
+avelonge
+aveloz
+Avena
+avenaceous
+avenage
+Avenal
+avenalin
+avenant
+avenary
+Avenel
+avener
+avenery
+avenge
+avenged
+avengeful
+avengement
+avenger
+avengeress
+avengers
+avenges
+avenging
+avengingly
+avenida
+aveniform
+avenin
+avenine
+avenolith
+avenous
+avens
+avenses
+aventail
+aventails
+aventayle
+Aventine
+aventine
+aventre
+aventure
+aventurin
+aventurine
+avenue
+avenues
+aveny
+aver
+aver-
+Avera
+avera
+average
+averaged
+averagely
+averageness
+averager
+averages
+averaging
+averah
+Averell
+Averi
+averia
+Averil
+averil
+Averill
+averin
+Averir
+averish
+averment
+averments
+avern
+Avernal
+avernal
+Averno
+Avernus
+avernus
+averrable
+averral
+averred
+averrer
+Averrhoa
+Averrhoism
+Averrhoist
+Averrhoistic
+averring
+Averroes
+Averroism
+Averroist
+averroist
+Averroistic
+averruncate
+averruncation
+averruncator
+avers
+aversant
+aversation
+averse
+aversely
+averseness
+aversion
+aversions
+aversive
+avert
+avertable
+averted
+avertedly
+averter
+avertible
+avertiment
+Avertin
+avertin
+averting
+avertive
+averts
+Avery
+Averyl
+Aves
+aves
+Avesta
+avesta
+Avestan
+avestan
+avestruz
+aveugle
+Aveyron
+avg
+avg.
+avgas
+avgases
+avgasses
+Avi
+aviador
+avian
+avianization
+avianize
+avianized
+avianizes
+avianizing
+avians
+aviararies
+aviaries
+aviarist
+aviarists
+aviary
+aviate
+aviated
+aviates
+aviatic
+aviating
+aviation
+aviational
+aviations
+aviator
+aviatorial
+aviatoriality
+aviators
+aviatory
+aviatress
+aviatrice
+aviatrices
+aviatrix
+aviatrixes
+Avice
+Avicebron
+Avicenna
+Avicennia
+Avicenniaceae
+Avicennism
+avichi
+avicide
+avick
+avicolous
+Avictor
+Avicula
+avicular
+Avicularia
+avicularia
+avicularian
+Aviculariidae
+Avicularimorphae
+avicularium
+Aviculidae
+aviculture
+aviculturist
+avid
+avidin
+avidins
+avidious
+avidiously
+avidities
+avidity
+avidly
+avidness
+avidnesses
+avidous
+avidya
+Avie
+avie
+Aviemore
+aview
+avifauna
+avifaunae
+avifaunal
+avifaunally
+avifaunas
+avifaunistic
+avigate
+avigation
+avigator
+avigators
+Avigdor
+Avignon
+Avignonese
+avijja
+Avikom
+Avila
+avilaria
+avile
+avilement
+Avilion
+avilion
+Avilla
+avine
+Avinger
+aviolite
+avion
+avion-canon
+avionic
+avionics
+avions
+avirulence
+avirulent
+Avis
+avis
+Avisco
+avision
+aviso
+avisos
+Aviston
+avital
+avitaminoses
+avitaminosis
+avitaminotic
+avitic
+Avitzur
+Aviv
+Aviva
+Avivah
+avives
+avizandum
+AVLIS
+Avlona
+AVM
+avn
+avn.
+Avner
+Avo
+avo
+Avoca
+avocado
+avocadoes
+avocados
+avocat
+avocate
+avocation
+avocational
+avocationally
+avocations
+avocative
+avocatory
+avocet
+avocets
+avodire
+avodires
+avogadrite
+Avogadro
+avogadro
+avogram
+avoid
+avoidable
+avoidably
+avoidance
+avoidances
+avoidant
+avoided
+avoider
+avoiders
+avoiding
+avoidless
+avoidment
+avoids
+avoidupois
+avoidupoises
+avoir
+avoir.
+avoirdupois
+avoke
+avolate
+avolation
+avolitional
+Avon
+Avondale
+avondbloem
+Avonmore
+Avonne
+avos
+avoset
+avosets
+avouch
+avouchable
+avouched
+avoucher
+avouchers
+avouches
+avouching
+avouchment
+avoue
+avour
+avoure
+avourneen
+avouter
+avoutry
+avow
+avowable
+avowableness
+avowably
+avowal
+avowals
+avowance
+avowant
+avowe
+avowed
+avowedly
+avowedness
+avower
+avowers
+avowing
+avowries
+avowry
+avows
+avowter
+avoy
+avoyer
+avoyership
+Avra
+Avraham
+Avram
+Avril
+Avrit
+Avrom
+Avron
+Avruch
+Avshar
+avulse
+avulsed
+avulses
+avulsing
+avulsion
+avulsions
+avuncular
+avunculate
+avunculize
+avyayibhava
+avys
+AW
+a.w.
+aw
+aw-
+awa
+Awabakal
+awabi
+AWACS
+awacs
+Awad
+Awadhi
+awaft
+awag
+await
+awaited
+awaiter
+awaiters
+awaiting
+Awaitlala
+awaits
+awakable
+awake
+awakeable
+awaked
+awaken
+awakenable
+awakened
+awakener
+awakeners
+awakening
+awakeningly
+awakenings
+awakenment
+awakens
+awakes
+awaking
+awakings
+awald
+awalim
+awalt
+Awan
+awane
+awanting
+awanyu
+awapuhi
+A-war
+award
+awardable
+awarded
+awardee
+awardees
+awarder
+awarders
+awarding
+awardment
+awards
+aware
+awaredom
+awareness
+awarn
+awarrant
+awaruite
+awash
+awaste
+awat
+awatch
+awater
+awave
+away
+away-going
+awayness
+awaynesses
+aways
+AWB
+awber
+awd
+awe
+AWEA
+A-weapons
+awearied
+aweary
+a-weather
+aweather
+awe-awakening
+awe-band
+aweband
+awe-bound
+awe-commanding
+awe-compelling
+awed
+awedly
+awedness
+awee
+a-week
+aweek
+aweel
+awe-filled
+aweigh
+aweing
+awe-inspired
+awe-inspiring
+awe-inspiringly
+aweless
+awelessness
+Awellimiden
+Awendaw
+awes
+awesome
+awesomely
+awesomeness
+a-west
+awest
+awe-stricken
+awestricken
+awe-strike
+awestrike
+awe-struck
+awestruck
+aweto
+awfu
+awful
+awful-eyed
+awful-gleaming
+awfuller
+awfullest
+awful-looking
+awfully
+awfulness
+awful-voiced
+AWG
+awhape
+awheel
+a-wheels
+awheft
+a-whet
+awhet
+awhile
+a-whiles
+a-whir
+awhir
+a-whirl
+awhirl
+awide
+awiggle
+awikiwiki
+awin
+a-wing
+awing
+awingly
+a-wink
+awink
+awiwi
+AWK
+awk
+awkly
+awkward
+awkwarder
+awkwardest
+awkwardish
+awkwardly
+awkwardness
+awkwardnesses
+AWL
+awl
+awless
+awlessness
+awl-fruited
+awl-leaved
+awls
+awl-shaped
+awlwort
+awlworts
+awm
+awmbrie
+awmous
+awn
+awned
+awner
+awning
+awninged
+awnings
+awnless
+awnlike
+awns
+awny
+a-wobble
+awoke
+awoken
+A.W.O.L.
+AWOL
+Awol
+awol
+Awolowo
+awols
+awonder
+a-work
+awork
+aworry
+aworth
+a-wrack
+a-wreak
+awreak
+awreck
+awrist
+awrong
+awry
+Awshar
+AWST
+AWU
+awunctive
+Ax
+ax
+ax.
+Axa
+ax-adz
+AXAF
+axal
+axanthopsia
+axbreaker
+Axe
+axe
+axe-breaker
+axebreaker
+axed
+Axel
+axel
+axels
+axeman
+axemaster
+axemen
+axenic
+axenically
+axer
+axerophthol
+axers
+axes
+axfetch
+axhammer
+axhammered
+axhead
+axial
+axial-flow
+axialities
+axiality
+axially
+axiate
+axiation
+Axifera
+axiferous
+axiform
+axifugal
+axil
+axile
+axilemma
+axilemmas
+axilemmata
+axilla
+axillae
+axillant
+axillar
+axillaries
+axillars
+axillary
+axillas
+axils
+axin
+axine
+axing
+axiniform
+axinite
+axinomancy
+axiolite
+axiolitic
+axiological
+axiologically
+axiologies
+axiologist
+axiology
+axiom
+axiomatic
+axiomatical
+axiomatically
+axiomatization
+axiomatizations
+axiomatize
+axiomatized
+axiomatizes
+axiomatizing
+axioms
+axion
+axiopisty
+Axiopoenus
+Axis
+axis
+axised
+axises
+axisymmetric
+axisymmetrical
+axisymmetrically
+axisymmetry
+axite
+axites
+axle
+axle-bending
+axle-boring
+axle-centering
+axled
+axle-forging
+axles
+axlesmith
+axle-tooth
+axle-tree
+axletree
+axletrees
+axlike
+axmaker
+axmaking
+axman
+axmanship
+axmaster
+axmen
+Axminster
+axminster
+axodendrite
+axofugal
+axogamy
+axoid
+axoidean
+axolemma
+axolotl
+axolotls
+axolysis
+axometer
+axometric
+axometry
+axon
+axonal
+axone
+axonemal
+axoneme
+axonemes
+axones
+axoneure
+axoneuron
+Axonia
+axonic
+Axonolipa
+axonolipous
+axonometric
+axonometry
+Axonophora
+axonophorous
+Axonopus
+axonost
+axons
+axopetal
+axophyte
+axoplasm
+axoplasmic
+axoplasms
+axopodia
+axopodium
+axospermous
+axostyle
+axotomous
+axseed
+axseeds
+ax-shaped
+Axson
+axstone
+Axtel
+Axtell
+Axton
+axtree
+Axum
+Axumite
+axunge
+axweed
+axwise
+axwort
+AY
+Ay
+ay
+ay-
+ayacahuite
+Ayacucho
+ayah
+ayahausca
+ayahs
+ayahuasca
+Ayahuca
+Ayala
+ayapana
+ayatollah
+ayatollahs
+Aycliffe
+Aydelotte
+Ayden
+Aydendron
+Aydin
+Aydlett
+aye
+a-year
+aye-aye
+aye-ceaseless
+aye-during
+aye-dwelling
+ayegreen
+aye-lasting
+aye-living
+a-yelp
+ayelp
+ayen
+ayenbite
+ayens
+ayenst
+Ayer
+ayer-ayer
+aye-remaining
+aye-renewed
+aye-restless
+aye-rolling
+Ayers
+aye-running
+ayes
+Ayesha
+aye-sought
+aye-troubled
+aye-turning
+aye-varied
+aye-welcome
+ay-green
+AYH
+ayield
+ayin
+Ayina
+ayins
+Aylesbury
+ayless
+aylet
+Aylett
+ayllu
+Aylmar
+Aylmer
+Aylsworth
+Aylward
+Aym
+Aymara
+aymara
+Aymaran
+Aymaras
+Ayme
+ayme
+Aymer
+Aymoro
+Ayn
+Aynat
+ayne
+Aynor
+Ayntab
+Ayo
+ayond
+ayont
+ayous
+Ayr
+ayre
+Ayres
+Ayrshire
+ayrshire
+ays
+Aythya
+ayu
+Ayubite
+ayudante
+Ayudhya
+ayuntamiento
+ayuntamientos
+Ayurveda
+ayurveda
+ayurvedas
+Ayurvedic
+Ayuthea
+Ayuthia
+Ayutthaya
+ayuyu
+aywhere
+Ayyubid
+AZ
+az
+az-
+aza-
+azadirachta
+azadrachta
+azafran
+azafrin
+Azal
+Azalea
+azalea
+Azaleah
+azaleamum
+azaleas
+Azalia
+Azan
+azan
+Azana
+Azande
+azans
+Azar
+Azarcon
+Azaria
+Azariah
+azarole
+Azarria
+azaserine
+azathioprine
+Azazel
+azazel
+Azbine
+azedarac
+azedarach
+Azeglio
+Azeito
+azelaic
+azelate
+Azelea
+Azelfafage
+azeotrope
+azeotropic
+azeotropism
+azeotropy
+Azerbaidzhan
+Azerbaijan
+Azerbaijanese
+Azerbaijani
+Azerbaijanian
+Azerbaijanis
+Azeria
+Azha
+Azide
+azide
+azides
+azido
+aziethane
+Azikiwe
+Azilian
+Azilian-tardenoisian
+azilut
+Azimech
+azimene
+azimethylene
+azimide
+azimin
+azimine
+azimino
+aziminobenzene
+azimuth
+azimuthal
+azimuthally
+azimuths
+azine
+azines
+azinphosmethyl
+aziola
+Aziza
+azlactone
+Azle
+azlon
+azlons
+Aznavour
+azo
+azo-
+azobacter
+azobenzene
+azobenzil
+azobenzoic
+azobenzol
+azoblack
+azoch
+azocochineal
+azocoralline
+azocorinth
+azocyanide
+azocyclic
+azodicarboxylic
+azodiphenyl
+azodisulphonic
+azoeosin
+azoerythrin
+Azof
+azofication
+azofier
+azoflavine
+azoformamide
+azoformic
+azofy
+azogallein
+azogreen
+azogrenadine
+azohumic
+azoic
+azoimide
+azoisobutyronitrile
+azole
+azoles
+azolitmin
+Azolla
+azomethine
+azon
+azonal
+azonaphthalene
+azonic
+azonium
+azons
+azoology
+azo-orange
+azo-orchil
+azo-orseilline
+azoospermia
+azoparaffin
+azophen
+azophenetole
+azophenine
+azophenol
+azophenyl
+azophenylene
+Azophi
+azophosphin
+azophosphore
+azoprotein
+Azor
+Azores
+azores
+Azorian
+Azorin
+azorite
+azorubine
+azosulphine
+azosulphonic
+azotaemia
+azotate
+azote
+azotea
+azoted
+azotemia
+azotemias
+azotemic
+azotenesis
+azotes
+azotetrazole
+azoth
+azothionium
+azoths
+azotic
+azotin
+azotine
+azotise
+azotised
+azotises
+azotising
+azotite
+azotize
+azotized
+azotizes
+azotizing
+Azotobacter
+azotobacter
+Azotobacterieae
+azotoluene
+azotometer
+azotorrhea
+azotorrhoea
+Azotos
+azotous
+azoturia
+azoturias
+Azov
+azovernine
+azox
+azoxazole
+azoxime
+azoxine
+azoxonium
+azoxy
+azoxyanisole
+azoxybenzene
+azoxybenzoic
+azoxynaphthalene
+azoxyphenetole
+azoxytoluidine
+Azpurua
+Azrael
+azrael
+Azral
+Azriel
+Aztec
+aztec
+Azteca
+azteca
+Aztecan
+aztecan
+aztecs
+azthionium
+Azuela
+Azuero
+azulejo
+azulejos
+azulene
+azuline
+azulite
+azulmic
+azumbre
+azure
+azurean
+azure-blazoned
+azure-blue
+azure-canopied
+azure-circled
+azure-colored
+azured
+azure-domed
+azure-eyed
+azure-footed
+azure-inlaid
+azure-mantled
+azureness
+azureous
+azure-penciled
+azure-plumed
+azures
+azure-tinted
+azure-vaulted
+azure-veined
+azurine
+azurite
+azurites
+azurmalachite
+azurous
+azury
+Azusa
+azygo-
+Azygobranchia
+Azygobranchiata
+azygobranchiate
+azygomatous
+azygos
+azygoses
+azygosperm
+azygospore
+azygote
+azygous
+azyme
+azymite
+azymous
+B
+B-
+b
+B911
+B.A.
+BA
+Ba
+ba
+B.A.A.
+BAA
+baa
+baaed
+baahling
+baaing
+Baal
+baal
+Baalath
+Baalbeer
+Baalbek
+Baal-berith
+Baalim
+baalim
+Baalish
+Baalism
+baalism
+baalisms
+Baalist
+Baalistic
+Baalite
+Baalitical
+Baalize
+Baalized
+Baalizing
+Baalman
+baals
+Baalshem
+baar
+baas
+baases
+baaskaap
+baaskaaps
+baaskap
+Baastan
+Bab
+bab
+Baba
+baba
+babacoote
+babai
+babajaga
+baba-koto
+babakoto
+Babar
+Babara
+babas
+babasco
+babassu
+babassus
+babasu
+babaylan
+babaylanes
+Babb
+Babbage
+babbage
+Babbette
+Babbie
+babbie
+babbishly
+babbit
+babbit-metal
+Babbitry
+Babbitt
+babbitt
+babbitted
+babbitter
+Babbittess
+Babbittian
+babbitting
+Babbittish
+Babbittism
+Babbittry
+babbittry
+babbitts
+babblative
+babble
+babbled
+babblement
+babbler
+babblers
+babbles
+babblesome
+babbling
+babblingly
+babblings
+babblish
+babblishly
+babbly
+babbool
+babbools
+Babby
+babby
+Babcock
+babcock
+Babe
+babe
+babe-faced
+babehood
+Babel
+babel
+Babeldom
+babelet
+Babelic
+babelike
+Babelisation
+Babelise
+Babelised
+Babelish
+Babelising
+Babelism
+Babelization
+Babelize
+Babelized
+Babelizing
+babels
+Baber
+babery
+babes
+babeship
+Babesia
+babesia
+babesias
+babesiasis
+babesiosis
+Babette
+Babeuf
+Babhan
+Babi
+Babiana
+babiche
+babiches
+babied
+babies
+babies'-breath
+Babiism
+babillard
+Babine
+babingtonite
+babion
+babirousa
+babiroussa
+babirusa
+babirusas
+babirussa
+babis
+babish
+babished
+babishly
+babishness
+Babism
+Babist
+Babita
+Babite
+Babits
+babka
+babkas
+bablah
+bable
+babloh
+baboen
+Babol
+Babongo
+baboo
+baboodom
+babooism
+babool
+babools
+baboon
+baboonery
+baboonish
+baboonroot
+baboons
+baboos
+baboosh
+baboot
+babouche
+Babouvism
+Babouvist
+babracot
+babroot
+Babs
+Babson
+babu
+Babua
+babudom
+babuina
+babuism
+babul
+babuls
+Babuma
+Babungera
+Babur
+baburd
+babus
+babushka
+babushkas
+baby
+baby-blue-eyes
+Baby-bouncer
+baby-browed
+baby-doll
+babydom
+baby-face
+baby-faced
+baby-featured
+babyfied
+babyhood
+babyhoods
+babyhouse
+babying
+babyish
+babyishly
+babyishness
+babyism
+baby-kissing
+babylike
+Babylon
+babylon
+Babylonia
+babylonia
+Babylonian
+babylonian
+babylonians
+Babylonic
+Babylonish
+babylonish
+Babylonism
+Babylonite
+Babylonize
+babyolatry
+baby-sat
+babysat
+baby's-breath
+babyship
+baby-sit
+babysit
+baby-sitter
+babysitter
+baby-sitting
+babysitting
+baby-sized
+baby-snatching
+baby's-slippers
+baby-tears
+Baby-walker
+Bac
+bac
+bacaba
+bacach
+bacalao
+bacalaos
+bacao
+Bacardi
+Bacau
+bacauan
+bacbakiri
+BAcc
+bacca
+baccaceous
+baccae
+baccalaurean
+baccalaureat
+baccalaureate
+baccalaureates
+baccalaureus
+baccar
+baccara
+baccaras
+baccarat
+baccarats
+baccare
+baccate
+baccated
+Bacchae
+bacchae
+bacchanal
+Bacchanalia
+bacchanalia
+bacchanalian
+bacchanalianism
+bacchanalianly
+Bacchanalias
+bacchanalias
+bacchanalism
+bacchanalization
+bacchanalize
+bacchanals
+bacchant
+bacchante
+bacchantes
+bacchantic
+bacchants
+bacchar
+baccharis
+baccharoid
+baccheion
+Bacchelli
+bacchiac
+bacchian
+Bacchic
+bacchic
+Bacchical
+Bacchides
+bacchii
+bacchiuchii
+bacchius
+Bacchus
+bacchus
+Bacchuslike
+Bacchylides
+baccies
+bacciferous
+bacciform
+baccilla
+baccilli
+baccillla
+baccillum
+Baccio
+baccivorous
+baccy
+BACH
+Bach
+bach
+Bacharach
+bacharach
+Bache
+bache
+bached
+bachel
+Bacheller
+bachelor
+bachelor-at-arms
+bachelordom
+bachelorette
+bachelorhood
+bachelorhoods
+bachelorism
+bachelorize
+bachelorlike
+bachelorly
+bachelors
+bachelors-at-arms
+bachelor's-button
+bachelor's-buttons
+bachelorship
+bachelorwise
+bachelry
+baches
+Bachichi
+baching
+Bachman
+bacilary
+bacile
+Bacillaceae
+bacillar
+Bacillariaceae
+bacillariaceous
+Bacillariales
+Bacillarieae
+Bacillariophyta
+bacillary
+bacillemia
+bacilli
+bacillian
+bacillicidal
+bacillicide
+bacillicidic
+bacilliculture
+bacilliform
+bacilligenic
+bacilliparous
+bacillite
+bacillogenic
+bacillogenous
+bacillophobia
+bacillosis
+bacilluria
+bacillus
+bacin
+Bacis
+bacitracin
+back
+back-
+backache
+backaches
+backaching
+backachy
+back-acting
+backadation
+backage
+back-alley
+back-and-forth
+back-angle
+backare
+backarrow
+backarrows
+backband
+backbar
+backbear
+backbearing
+backbeat
+backbeats
+back-bencher
+backbencher
+backbenchers
+backbend
+backbends
+backberand
+back-berend
+backberend
+backbit
+backbite
+backbiter
+backbiters
+backbites
+back-biting
+backbiting
+backbitingly
+backbitten
+back-blocker
+backblocks
+backblow
+back-blowing
+back-board
+backboard
+backboards
+backbone
+backboned
+backboneless
+backbonelessness
+backbones
+backbrand
+backbreaker
+back-breaking
+backbreaking
+back-breathing
+back-broken
+back-burner
+backcap
+backcast
+backcasts
+backchain
+backchat
+backchats
+back-check
+back-cloth
+backcloth
+back-cloths
+backcomb
+back-coming
+back-connected
+back-country
+backcountry
+backcourt
+backcourtman
+backcross
+backdate
+backdated
+backdates
+backdating
+back-door
+backdoor
+backdown
+back-drawing
+back-drawn
+backdrop
+backdrops
+backed
+backed-off
+backen
+back-end
+backened
+backening
+Backer
+backer
+backers
+backers-up
+backer-up
+backet
+back-face
+back-facing
+backfall
+back-fanged
+backfatter
+backfield
+backfields
+backfill
+backfilled
+backfiller
+back-filleted
+backfilling
+backfills
+back-fire
+backfire
+backfired
+backfires
+backfiring
+backflap
+backflash
+backflip
+backflow
+back-flowing
+backflowing
+back-flung
+back-focused
+backfold
+back-formation
+backframe
+backfriend
+backfurrow
+backgame
+backgammon
+backgammons
+back-geared
+backgeared
+back-glancing
+back-going
+background
+backgrounds
+back-hand
+backhand
+back-handed
+backhanded
+backhandedly
+backhandedness
+back-hander
+backhander
+backhanding
+backhands
+backhatch
+backhaul
+backhauled
+backhauling
+backhauls
+Backhaus
+backheel
+backhoe
+backhoes
+backhooker
+backhouse
+backhouses
+backie
+backiebird
+backing
+backing-off
+backings
+backjaw
+backjoint
+backland
+backlands
+back-lash
+backlash
+backlashed
+backlasher
+backlashers
+backlashes
+backlashing
+back-leaning
+Backler
+backless
+backlet
+backliding
+back-light
+back-lighted
+back-lighting
+backlighting
+backlings
+backlins
+back-list
+backlist
+backlists
+back-lit
+backlit
+back-log
+backlog
+backlogged
+backlogging
+backlogs
+back-looking
+backlotter
+back-lying
+back-making
+backmost
+back-number
+backoff
+backorder
+backout
+backouts
+backpack
+backpacked
+backpacker
+backpackers
+backpacking
+backpacks
+back-paddle
+back-paint
+back-palm
+back-pedal
+backpedal
+back-pedaled
+backpedaled
+back-pedaling
+backpedaling
+back-pedalled
+back-pedalling
+back-piece
+backpiece
+backplane
+backplanes
+back-plaster
+back-plate
+backplate
+backpointer
+backpointers
+back-pulling
+back-putty
+back-racket
+back-raking
+backrest
+backrests
+backrope
+backropes
+backrun
+backrush
+backrushes
+Backs
+backs
+backsaw
+backsaws
+backscatter
+backscattered
+backscattering
+backscatters
+backscraper
+back-scratcher
+backscratcher
+back-scratching
+backscratching
+backseat
+backseats
+back-set
+backset
+backsets
+backsetting
+back-settler
+backsettler
+back-sey
+backsey
+backsheesh
+backshift
+backshish
+backside
+backsides
+backsight
+backsite
+back-slang
+back-slanging
+backslap
+backslapped
+backslapper
+backslappers
+back-slapping
+backslapping
+backslaps
+backslash
+backslashes
+backslid
+backslidden
+backslide
+backslided
+backslider
+backsliders
+backslides
+backsliding
+backslidingness
+backspace
+backspaced
+backspacefile
+backspacer
+backspaces
+backspacing
+backspang
+backspear
+backspeer
+backspeir
+backspier
+backspierer
+back-spiker
+backspin
+backspins
+backsplice
+backspliced
+backsplicing
+backspread
+backspringing
+backstab
+backstabbed
+backstabber
+backstabbing
+back-staff
+backstaff
+backstage
+backstair
+backstairs
+backstamp
+back-starting
+backstay
+backstays
+Backstein
+back-stepping
+backster
+backstick
+back-stitch
+backstitch
+backstitched
+backstitches
+backstitching
+backstone
+backstop
+back-stope
+backstopped
+backstopping
+backstops
+backstrap
+back-strapped
+backstrapped
+backstreet
+back-streeter
+backstretch
+backstretches
+backstring
+backstrip
+back-stroke
+backstroke
+backstroked
+backstrokes
+backstroking
+backstromite
+back-surging
+backswept
+backswimmer
+backswing
+back-sword
+backsword
+backswording
+backswordman
+backswordmen
+backswordsman
+backtack
+back-talk
+backtalk
+back-tan
+backtender
+backtenter
+back-titrate
+back-titration
+back-to-back
+back-to-front
+backtrace
+backtrack
+backtracked
+backtracker
+backtrackers
+backtracking
+backtracks
+backtrail
+back-trailer
+backtrick
+back-trip
+back-up
+backup
+backups
+Backus
+backus
+backveld
+backvelder
+backwall
+back-ward
+backward
+backwardation
+backwardly
+backwardness
+backwardnesses
+backwards
+backwash
+backwashed
+backwasher
+backwashes
+backwashing
+backwater
+backwatered
+backwaters
+back-way
+backway
+backwind
+backwinded
+backwinding
+backwood
+backwoods
+backwoodser
+backwoodsiness
+backwoodsman
+backwoodsmen
+backwoodsy
+backword
+backworm
+backwort
+backwrap
+backwraps
+backy
+backyard
+backyarder
+backyards
+baclava
+Bacliff
+baclin
+Baco
+Bacolod
+Bacon
+bacon
+bacon-and-eggs
+baconer
+Baconian
+baconian
+Baconianism
+Baconic
+Baconism
+Baconist
+baconize
+bacons
+Baconton
+baconweed
+bacony
+Bacopa
+Bacova
+bacquet
+bact
+bact.
+bacteraemia
+bacteremia
+bacteremic
+bacteri-
+bacteria
+Bacteriaceae
+bacteriaceous
+bacteriaemia
+bacterial
+bacterially
+bacterian
+bacteric
+bactericholia
+bactericidal
+bactericidally
+bactericide
+bactericides
+bactericidin
+bacterid
+bacteriemia
+bacteriform
+bacterin
+bacterins
+bacterio-
+bacterioagglutinin
+bacterioblast
+bacteriochlorophyll
+bacteriocidal
+bacteriocin
+bacteriocyte
+bacteriodiagnosis
+bacteriofluorescin
+bacteriogenic
+bacteriogenous
+bacteriohemolysin
+bacterioid
+bacterioidal
+bacteriol
+bacteriol.
+bacteriologic
+bacteriological
+bacteriologically
+bacteriologies
+bacteriologist
+bacteriologists
+bacteriology
+bacteriolysin
+bacteriolysis
+bacteriolytic
+bacteriolyze
+bacterio-opsonic
+bacterio-opsonin
+bacteriopathology
+bacteriophage
+bacteriophages
+bacteriophagia
+bacteriophagic
+bacteriophagous
+bacteriophagy
+bacteriophobia
+bacterioprecipitin
+bacterioprotein
+bacteriopsonic
+bacteriopsonin
+bacteriopurpurin
+bacteriorhodopsin
+bacterioscopic
+bacterioscopical
+bacterioscopically
+bacterioscopist
+bacterioscopy
+bacteriosis
+bacteriosolvent
+bacteriostasis
+bacteriostat
+bacteriostatic
+bacteriostatically
+bacteriotherapeutic
+bacteriotherapy
+bacteriotoxic
+bacteriotoxin
+bacteriotropic
+bacteriotropin
+bacteriotrypsin
+bacterious
+bacteririum
+bacteritic
+bacterium
+bacteriuria
+bacterization
+bacterize
+bacterized
+bacterizing
+bacteroid
+bacteroidal
+Bacteroideae
+Bacteroides
+bacteroides
+bactetiophage
+Bactra
+Bactria
+Bactrian
+Bactris
+Bactrites
+bactriticone
+bactritoid
+bacubert
+bacula
+bacule
+baculere
+baculi
+baculiferous
+baculiform
+baculine
+baculite
+Baculites
+baculitic
+baculiticone
+baculoid
+baculo-metry
+baculum
+baculums
+baculus
+bacury
+bad
+Badacsonyi
+Badaga
+Badajoz
+Badakhshan
+Badalona
+badan
+Badarian
+badarrah
+badass
+badassed
+badasses
+badaud
+Badawi
+Badaxe
+badaxe
+Badb
+badchan
+baddeleyite
+badder
+badderlocks
+baddest
+baddie
+baddies
+baddish
+baddishly
+baddishness
+baddock
+baddy
+bade
+Baden
+Baden-Baden
+badenite
+Baden-Powell
+Baden-Wtemberg
+badge
+badged
+badgeless
+badgeman
+badgemen
+Badger
+badger
+badgerbrush
+badgered
+badgerer
+badgering
+badgeringly
+badger-legged
+badgerlike
+badgerly
+badgers
+badgerweed
+badges
+badging
+badgir
+badhan
+bad-headed
+bad-hearted
+bad-humored
+badiaga
+badian
+badigeon
+Badin
+badinage
+badinaged
+badinages
+badinaging
+badiner
+badinerie
+badineur
+badious
+badju
+badland
+badlands
+badling
+bad-looking
+badly
+badman
+badmash
+badmen
+BAdmEng
+bad-minded
+badminton
+badmintons
+bad-mouth
+badmouth
+badmouthed
+badmouthing
+badmouths
+badness
+badnesses
+Badoeng
+Badoglio
+Badon
+Badr
+badrans
+bads
+bad-smelling
+bad-tempered
+Baduhenna
+BAE
+bae
+bae-
+Baecher
+BAEd
+Baeda
+Baedeker
+baedeker
+Baedekerian
+baedekers
+Baekeland
+Bael
+bael
+Baelbeer
+Baer
+Baeria
+Baerl
+Baerman
+Baese
+baetuli
+baetulus
+baetyl
+baetylic
+baetylus
+baetzner
+Baeyer
+Baez
+bafaro
+baff
+baffed
+baffeta
+baffies
+Baffin
+baffing
+baffle
+baffled
+bafflement
+bafflements
+baffleplate
+baffler
+bafflers
+baffles
+baffling
+bafflingly
+bafflingness
+baffs
+baffy
+BAFO
+baft
+bafta
+baftah
+Bafyot
+BAg
+bag
+baga
+Baganda
+bagani
+bagass
+bagasse
+bagasses
+bagataway
+bagatelle
+bagatelles
+Bagatha
+bagatine
+bagattini
+bagattino
+Bagaudae
+bag-bearing
+bag-bedded
+bag-bundling
+bag-cheeked
+bag-closing
+bag-cutting
+Bagdad
+Bagdi
+BAgE
+Bagehot
+bagel
+bagels
+bag-filling
+bag-flower
+bag-folding
+bagful
+bagfuls
+baggage
+baggageman
+baggagemaster
+baggager
+baggages
+baggage-smasher
+baggala
+bagganet
+Baggara
+bagge
+bagged
+Bagger
+bagger
+baggers
+Baggett
+baggie
+baggier
+baggies
+baggiest
+baggily
+bagginess
+bagging
+baggings
+baggit
+Baggott
+Baggs
+baggy
+baggyrinkle
+baggywrinkle
+bagh
+Baghdad
+baghdad
+Bagheera
+Bagheli
+baghla
+Baghlan
+baghouse
+bagie
+Baginda
+bagio
+bagios
+Bagirmi
+bagle
+bagleaves
+Bagley
+baglike
+bagmaker
+bagmaking
+bagman
+bagmen
+bagne
+Bagnes
+bagnes
+bagnet
+bagnette
+bagnio
+bagnios
+bagnut
+bago
+Bagobo
+bagonet
+bagong
+bagoong
+bagpipe
+bagpiped
+bagpiper
+bagpipers
+bagpipes
+bagpiping
+bagplant
+bagpod
+bag-printing
+bagpudding
+Bagpuize
+BAgr
+Bagram
+bagrationite
+bagre
+bag-reef
+bagreef
+Bagritski
+bagroom
+bags
+BAgSc
+bag-sewing
+bagsful
+bag-shaped
+bagtikan
+baguet
+baguets
+baguette
+baguettes
+Baguio
+baguio
+baguios
+bagwash
+Bagwell
+bag-wig
+bagwig
+bagwigged
+bagwigs
+bagwoman
+bagwomen
+bagwork
+bagworm
+bagworms
+bagwyn
+bah
+bahada
+bahadur
+bahadurs
+Baha'i
+Bahai
+bahai
+Bahaism
+Bahaist
+Baham
+Bahama
+Bahamas
+bahamas
+Bahamian
+bahamian
+bahamians
+bahan
+bahar
+Baha'ullah
+Bahaullah
+Bahawalpur
+bahawder
+bahay
+bahera
+Bahia
+bahiaite
+Bahima
+bahisti
+Bahmani
+Bahmanid
+Bahner
+bahnung
+baho
+bahoe
+bahoo
+Bahr
+Bahrain
+Bahrein
+baht
+bahts
+Bahuma
+bahur
+bahut
+bahuts
+Bahutu
+bahuvrihi
+bahuvrihis
+Bai
+bai
+Baiae
+Baianism
+baidak
+baidar
+baidarka
+baidarkas
+Baidya
+Baiel
+Baiera
+baiginet
+baign
+baignet
+baigneuse
+baigneuses
+baignoire
+Baikal
+baikalite
+baikerinite
+baikerite
+baikie
+Baikonur
+Bail
+bail
+bailable
+bailage
+Bailar
+bail-dock
+baile
+bailed
+bailee
+bailees
+bailer
+bailers
+Bailey
+bailey
+baileys
+Baileyton
+Baileyville
+bailiaries
+bailiary
+Bailie
+bailie
+bailieries
+bailiery
+bailies
+bailieship
+bailiff
+bailiffry
+bailiffs
+bailiffship
+bailiffwick
+bailing
+bailiwick
+bailiwicks
+Baillaud
+bailli
+bailliage
+Baillie
+baillie
+Baillieu
+baillone
+Baillonella
+Bailly
+bailment
+bailments
+bailo
+bailor
+bailors
+bail-out
+bailout
+bailouts
+bailpiece
+bails
+bailsman
+bailsmen
+bailwood
+Baily
+Bain
+bain
+Bainbridge
+Bainbrudge
+bainie
+Baining
+bainite
+bain-marie
+Bains
+bains-marie
+Bainter
+Bainville
+baioc
+baiocchi
+baiocco
+bairagi
+Bairam
+bairam
+Baird
+Bairdford
+bairdi
+bairn
+bairnie
+bairnish
+bairnishness
+bairnlier
+bairnliest
+bairnliness
+bairnly
+bairns
+Bairnsfather
+bairnteam
+bairnteem
+bairntime
+bairnwort
+Bairoil
+Bais
+Baisakh
+Baisden
+baisemain
+Baiss
+baister
+bait
+baited
+baiter
+baiters
+baitfish
+baith
+baiting
+baits
+baittle
+baitylos
+baiza
+baizas
+baize
+baized
+baizes
+baizing
+Baja
+baja
+bajada
+Bajadero
+Bajaj
+Bajan
+bajan
+Bajardo
+bajarigar
+Bajau
+Bajer
+bajocco
+bajochi
+Bajocian
+bajoire
+bajonado
+BAJour
+bajra
+bajree
+bajri
+bajulate
+bajury
+Bak
+baka
+Bakairi
+bakal
+Bakalai
+Bakalei
+Bakatan
+bake
+bakeapple
+bakeboard
+baked
+baked-apple
+bakehead
+bakehouse
+bakehouses
+Bakelite
+bakelite
+bakelize
+Bakeman
+bake-meat
+bakemeat
+bakemeats
+Bakemeier
+baken
+bake-off
+bakeout
+bakeoven
+bakepan
+Baker
+baker
+bakerdom
+bakeress
+bakeries
+bakerite
+baker-knee
+baker-kneed
+baker-leg
+baker-legged
+bakerless
+bakerlike
+bakerly
+Bakerman
+bakers
+Bakersfield
+bakersfield
+bakership
+Bakerstown
+Bakersville
+Bakerton
+bakery
+Bakes
+bakes
+bakeshop
+bakeshops
+bakestone
+bakeware
+Bakewell
+Bakhmut
+Bakhtiari
+bakie
+baking
+bakingly
+bakings
+Bakke
+Bakki
+baklava
+baklavas
+baklawa
+baklawas
+bakli
+Bakongo
+bakra
+Bakshaish
+baksheesh
+baksheeshes
+bakshi
+bakshis
+bakshish
+bakshished
+bakshishes
+bakshishing
+Bakst
+baktun
+Baku
+baku
+Bakuba
+bakula
+Bakunda
+Bakunin
+Bakuninism
+Bakuninist
+bakupari
+Bakutu
+Bakwiri
+BAL
+Bal
+bal
+bal.
+Bala
+Balaam
+balaam
+Balaamite
+Balaamitical
+balabos
+Balac
+balachan
+balachong
+Balaclava
+balaclava
+balada
+baladine
+Balaena
+Balaenicipites
+balaenid
+Balaenidae
+balaenoid
+Balaenoidea
+balaenoidean
+Balaenoptera
+Balaenopteridae
+balafo
+balagan
+balaghat
+balaghaut
+balai
+Balaic
+Balak
+Balakirev
+Balaklava
+balalaika
+balalaikas
+Balan
+Balance
+balance
+balanceable
+balanced
+balancedness
+balancelle
+balanceman
+balancement
+balancer
+balancers
+balances
+balancewise
+Balanchine
+balancing
+balander
+balandra
+balandrana
+balaneutics
+Balanga
+balangay
+balanic
+balanid
+Balanidae
+balaniferous
+balanism
+balanite
+Balanites
+balanitis
+balanoblennorrhea
+balanocele
+Balanoglossida
+Balanoglossus
+balanoid
+Balanophora
+Balanophoraceae
+balanophoraceous
+balanophore
+balanophorin
+balanoplasty
+balanoposthitis
+balanopreputial
+Balanops
+balanops
+Balanopsidaceae
+Balanopsidales
+balanorrhagia
+balant
+Balanta
+Balante
+balantidial
+balantidiasis
+balantidic
+balantidiosis
+Balantidium
+Balanus
+Balao
+balao
+balaos
+balaphon
+Balarama
+balarao
+Balas
+balas
+balases
+balat
+balata
+balatas
+balate
+Balaton
+balatong
+balatron
+balatronic
+balatte
+balau
+balausta
+balaustine
+balaustre
+Balawa
+Balawu
+balayeuse
+Balbinder
+Balbo
+Balboa
+balboa
+balboas
+balbriggan
+Balbuena
+Balbur
+balbusard
+balbutiate
+balbutient
+balbuties
+Balcer
+Balch
+balche
+Balcke
+balcon
+balcone
+balconet
+balconette
+balconied
+balconies
+balcony
+Bald
+bald
+baldacchini
+baldacchino
+baldachin
+baldachined
+baldachini
+baldachino
+baldachinos
+baldachins
+Baldad
+baldakin
+baldaquin
+Baldassare
+baldberry
+baldcrown
+balded
+balden
+Balder
+balder
+balder-brae
+balderdash
+balderdashes
+balder-herb
+baldest
+bald-faced
+baldfaced
+baldhead
+bald-headed
+baldheaded
+bald-headedness
+baldheads
+baldicoot
+Baldie
+baldies
+balding
+baldish
+baldling
+baldly
+baldmoney
+baldmoneys
+baldness
+baldnesses
+Baldomero
+baldoquin
+baldpate
+bald-pated
+baldpated
+bald-patedness
+baldpatedness
+baldpates
+Baldr
+baldrib
+baldric
+baldrick
+baldricked
+baldricks
+baldrics
+baldricwise
+Baldridge
+balds
+balducta
+balductum
+Balduin
+Baldur
+Baldwin
+Baldwinsville
+Baldwinville
+Baldwyn
+baldy
+Bale
+bale
+baleare
+Baleares
+Balearian
+Balearic
+Balearica
+balebos
+baled
+baleen
+baleens
+bale-fire
+balefire
+balefires
+baleful
+balefully
+balefulness
+balei
+baleise
+baleless
+Balenciaga
+Baler
+baler
+balers
+bales
+balestra
+balete
+Balewa
+balewort
+baleys
+Balf
+Balfore
+Balfour
+Bali
+bali
+balian
+balibago
+balibuntal
+balibuntl
+Balija
+Balikpapan
+Balilla
+balimbing
+baline
+Balinese
+balinese
+baling
+balinger
+balinghasay
+Baliol
+balisaur
+balisaurs
+balisier
+balistarii
+balistarius
+balister
+Balistes
+balistid
+Balistidae
+balistraria
+balita
+balitao
+baliti
+Balius
+balize
+balk
+Balkan
+balkan
+Balkanic
+Balkanise
+Balkanised
+Balkanising
+Balkanism
+Balkanite
+Balkanization
+balkanization
+Balkanize
+balkanize
+Balkanized
+balkanized
+Balkanizing
+balkanizing
+balkans
+Balkar
+balked
+balker
+balkers
+Balkh
+Balkhash
+balkier
+balkiest
+balkily
+Balkin
+balkiness
+balking
+balkingly
+Balkis
+balkish
+balkline
+balklines
+Balko
+balks
+balky
+Ball
+ball
+Balla
+ballad
+ballade
+balladeer
+balladeers
+ballader
+balladeroyal
+ballades
+balladic
+balladical
+balladier
+balladise
+balladised
+balladising
+balladism
+balladist
+balladize
+balladized
+balladizing
+balladlike
+balladling
+balladmonger
+balladmongering
+balladries
+balladromic
+balladry
+ballads
+balladwise
+ballahoo
+ballahou
+ballam
+ballan
+Ballance
+ballant
+Ballantine
+ballarag
+Ballarat
+Ballard
+ballard
+ballas
+ballast
+ballastage
+ballast-cleaning
+ballast-crushing
+ballasted
+ballaster
+ballastic
+ballasting
+ballast-loading
+ballasts
+ballat
+ballata
+ballate
+ballaton
+ballatoon
+ball-bearing
+ballbuster
+ball-carrier
+ballcarrier
+balldom
+balldress
+balled
+balled-up
+Ballengee
+Ballentine
+baller
+ballerina
+ballerinas
+ballerine
+ballers
+ballet
+balletic
+balletically
+balletomane
+balletomanes
+balletomania
+ballets
+ballett
+ballfield
+ball-flower
+ballflower
+ballgame
+ballgames
+ballgown
+ballgowns
+Ballhausplatz
+ballhawk
+ballhawks
+ball-hooter
+ballhooter
+balli
+balliage
+Ballico
+ballies
+Balliett
+Balling
+balling
+Ballinger
+Ballington
+Balliol
+ballised
+ballism
+ballismus
+ballist
+ballista
+ballistae
+ballistic
+ballistically
+ballistician
+ballisticians
+ballistics
+Ballistite
+ballistite
+ballistocardiogram
+ballistocardiograph
+ballistocardiographic
+ballistocardiography
+ballistophobia
+ballium
+ball-jasper
+Ballman
+ballmine
+ballo
+ballock
+ballocks
+balloen
+ballogan
+ballon
+ballone
+ballones
+ballonet
+ballonets
+ballonette
+ballonne
+ballonnes
+ballons
+ballon-sonde
+balloon
+balloonation
+balloon-berries
+balloon-berry
+ballooned
+ballooner
+ballooners
+balloonery
+balloonet
+balloonfish
+balloonfishes
+balloonflower
+balloonful
+ballooning
+balloonish
+balloonist
+balloonists
+balloonlike
+balloons
+ballot
+Ballota
+ballotade
+ballotage
+ballote
+balloted
+balloter
+balloters
+balloting
+ballotist
+ballots
+ballottable
+ballottement
+ballottine
+ballottines
+Ballou
+Ballouville
+ballow
+ball-park
+ballpark
+ballparks
+ball-planting
+Ballplatz
+ballplayer
+ballplayers
+ball-point
+ballpoint
+ballpoints
+ballproof
+ballroom
+ballrooms
+balls
+ball-shaped
+ballsier
+ballsiest
+ballstock
+balls-up
+ballsy
+ball-thrombus
+ballup
+ballute
+ballutes
+ballweed
+Ballwin
+Bally
+bally
+ballyhack
+ballyhoo
+ballyhooed
+ballyhooer
+ballyhooing
+ballyhoos
+Ballyllumford
+ballyrag
+ballyragged
+ballyragging
+ballyrags
+ballywack
+ballywrack
+balm
+balmacaan
+Balmain
+balm-apple
+Balmarcodes
+Balmat
+Balmawhapple
+balm-breathing
+balm-cricket
+balmier
+balmiest
+balmily
+balminess
+balminesses
+balm-leaved
+balmlike
+balmonies
+Balmont
+balmony
+Balmoral
+balmoral
+balmorals
+Balmorhea
+balms
+balm-shed
+Balmunc
+Balmung
+Balmuth
+balmy
+balnea
+balneae
+balneal
+balneary
+balneation
+balneatory
+balneographer
+balneography
+balneologic
+balneological
+balneologist
+balneology
+balneophysiology
+balneotechnics
+balneotherapeutics
+balneotherapia
+balneotherapy
+balneum
+Balnibarbi
+Baloch
+Balochi
+Balochis
+Baloghia
+Balolo
+balon
+balonea
+baloney
+baloneys
+baloo
+Balopticon
+balopticon
+Balor
+Baloskion
+Baloskionaceae
+balotade
+Balough
+balourdise
+balow
+BALPA
+balr
+bals
+balsa
+Balsam
+balsam
+balsamaceous
+balsamation
+Balsamea
+Balsameaceae
+balsameaceous
+balsamed
+balsamer
+balsamic
+balsamical
+balsamically
+balsamiferous
+balsamina
+Balsaminaceae
+balsaminaceous
+balsamine
+balsaming
+balsamitic
+balsamiticness
+balsamize
+balsamo
+Balsamodendron
+Balsamorrhiza
+balsamous
+balsamroot
+balsams
+balsamum
+balsamweed
+balsamy
+balsas
+balsawood
+Balshem
+Balt
+Balt.
+Balta
+Baltassar
+baltei
+balter
+baltetei
+balteus
+Balthasar
+Balthazar
+baltheus
+Balti
+Baltic
+baltic
+Baltimore
+baltimore
+Baltimorean
+baltimorite
+Baltis
+Balto-slav
+Balto-Slavic
+Balto-slavic
+balto-slavic
+Balto-Slavonic
+Balto-slavonic
+balu
+Baluba
+Baluch
+Baluchi
+baluchi
+Baluchis
+Baluchistan
+baluchithere
+baluchitheria
+Baluchitherium
+baluchitherium
+Baluga
+BALUN
+balun
+Balunda
+balushai
+baluster
+balustered
+balusters
+balustrade
+balustraded
+balustrades
+balustrading
+balut
+balwarra
+balza
+Balzac
+Balzacian
+balzarine
+BAM
+bam
+BAMAF
+bamah
+Bamako
+Bamalip
+Bamangwato
+bambacciata
+bamban
+Bambara
+Bamberg
+Bamberger
+Bambi
+Bambie
+bambini
+bambino
+bambinos
+bambocciade
+bambochade
+bamboche
+bamboo
+bamboos
+bamboozle
+bamboozled
+bamboozlement
+bamboozler
+bamboozlers
+bamboozles
+bamboozling
+Bambos
+bamboula
+Bambuba
+bambuco
+bambuk
+Bambusa
+bambusa
+Bambuseae
+Bambute
+Bamby
+Bamford
+Bamian
+Bamileke
+bammed
+bamming
+bamoth
+bams
+BAMusEd
+Ban
+ban
+Bana
+banaba
+Banach
+banago
+banagos
+banak
+banakite
+banal
+banalities
+banality
+banalize
+banally
+banalness
+banana
+Bananaland
+Bananalander
+bananaquit
+bananas
+Banande
+bananist
+bananivorous
+Banaras
+Banares
+Banat
+banat
+Banate
+banate
+banatite
+banausic
+Banba
+Banbury
+banbury
+banc
+banca
+bancal
+bancales
+bancha
+banchi
+Banco
+banco
+bancos
+Bancroft
+BANCS
+bancus
+band
+Banda
+banda
+bandage
+bandaged
+bandager
+bandagers
+bandages
+bandaging
+bandagist
+Band-Aid
+band-aid
+bandaid
+bandaite
+bandaka
+bandala
+bandalore
+Bandana
+bandana
+bandanaed
+bandanas
+bandanna
+bandannaed
+bandannas
+bandar
+Bandaranaike
+Bandar-log
+bandar-log
+bandarlog
+bandbox
+bandboxes
+bandboxical
+bandboxy
+bandcase
+bandcutter
+bande
+bandeau
+bandeaus
+bandeaux
+banded
+Bandeen
+bandel
+bandelet
+bandelette
+Bandello
+bandeng
+Bander
+bander
+Bandera
+banderilla
+banderillas
+banderillero
+banderilleros
+banderlog
+Banderma
+banderol
+banderole
+banderoled
+banderoles
+banderoling
+banderols
+banders
+bandersnatch
+bandfile
+bandfiled
+bandfiling
+bandfish
+band-gala
+bandgap
+bandh
+bandhava
+bandhook
+Bandhor
+bandhu
+bandi
+bandicoot
+bandicoots
+bandicoy
+bandido
+bandidos
+bandie
+bandied
+bandies
+bandikai
+Bandinelli
+bandiness
+banding
+bandit
+banditism
+banditries
+banditry
+bandits
+banditti
+Bandjarmasin
+Bandjermasin
+Bandkeramik
+bandle
+bandleader
+Bandler
+bandless
+bandlessly
+bandlessness
+bandlet
+bandlimit
+bandlimited
+bandlimiting
+bandlimits
+bandman
+bandmaster
+bandmasters
+bando
+bandobust
+Bandoeng
+bandog
+bandogs
+bandoleer
+bandoleered
+bandoleers
+bandolerismo
+bandolero
+bandoleros
+bandolier
+bandoliered
+bandoline
+Bandon
+bandon
+bandonion
+Bandor
+bandora
+bandoras
+bandore
+bandores
+bandos
+bandpass
+bandrol
+bands
+bandsaw
+bandsawed
+band-sawing
+bandsawing
+bandsawn
+band-sawyer
+band-shaped
+bandsman
+bandsmen
+bandspreading
+bandstand
+bandstands
+bandster
+bandstop
+bandstring
+band-tailed
+Bandundu
+Bandung
+Bandur
+bandura
+bandurria
+bandurrias
+Bandusia
+Bandusian
+bandwagon
+bandwagons
+bandwidth
+bandwidths
+bandwork
+bandworm
+bandy
+bandyball
+bandy-bandy
+bandying
+bandy-legged
+bandylegged
+bandyman
+Bandytown
+bane
+baneberries
+baneberry
+Banebrudge
+Banecroft
+baned
+baneful
+banefully
+banefulness
+Banerjea
+Banerjee
+banes
+banewort
+Banff
+Banffshire
+Bang
+bang
+banga
+Bangala
+bangalay
+Bangall
+Bangalore
+bangalow
+Bangash
+bang-bang
+bangboard
+bange
+banged
+banged-up
+banger
+bangers
+banghy
+Bangia
+Bangiaceae
+bangiaceous
+Bangiales
+banging
+Bangka
+Bangkok
+bangkok
+bangkoks
+Bangladesh
+bangladesh
+bangle
+bangled
+bangles
+bangling
+Bangor
+bangos
+Bangs
+bangs
+bangster
+bang-tail
+bangtail
+bangtailed
+bangtails
+Bangui
+bang-up
+bangup
+Bangwaketsi
+Bangweulu
+bangy
+bani
+bania
+banian
+banians
+Banias
+banig
+banilad
+baning
+banish
+banished
+banisher
+banishers
+banishes
+banishing
+banishment
+banishments
+banister
+banister-back
+banisterine
+banisters
+Baniva
+baniwa
+baniya
+banjara
+Banjermasin
+banjo
+banjoes
+banjoist
+banjoists
+banjo-picker
+banjore
+banjorine
+banjos
+banjo-uke
+banjo-ukulele
+banjo-zither
+banjuke
+Banjul
+banjulele
+Bank
+bank
+Banka
+bankable
+Bankalachi
+bank-bill
+bank-book
+bankbook
+bankbooks
+bankcard
+bankcards
+banked
+banker
+bankera
+bankerdom
+bankeress
+banker-mark
+banker-out
+bankers
+banket
+bank-full
+bankfull
+Bankhead
+bank-high
+Banking
+banking
+banking-house
+bankings
+bankman
+bankmen
+bank-note
+banknote
+banknotes
+bankrider
+bank-riding
+bankroll
+bankrolled
+bankroller
+bankrolling
+bankrolls
+bankrupcy
+bankrupt
+bankruptcies
+bankruptcy
+bankrupted
+bankrupting
+bankruptism
+bankruptlike
+bankruptly
+bankrupts
+bankruptship
+bankrupture
+Banks
+banks
+bankshall
+Banksia
+banksia
+Banksian
+banksias
+Bankside
+bank-side
+bankside
+bank-sided
+banksides
+banksman
+banksmen
+Bankston
+bankweed
+bank-wound
+Banky
+banky
+banlieu
+banlieue
+Banlon
+Bann
+Banna
+bannack
+Bannasch
+bannat
+banned
+Banner
+banner
+bannered
+bannerer
+banneret
+bannerets
+bannerette
+banner-fashioned
+bannerfish
+bannerless
+bannerlike
+bannerline
+Bannerman
+bannerman
+bannermen
+bannerol
+bannerole
+bannerols
+banners
+banner-shaped
+bannerwise
+bannet
+bannets
+bannimus
+Banning
+banning
+Bannister
+bannister
+bannisters
+bannition
+Bannock
+bannock
+Bannockburn
+bannocks
+Bannon
+banns
+bannut
+Banon
+banovina
+banque
+Banquer
+banquet
+Banquete
+banqueted
+banqueteer
+banqueteering
+banqueter
+banqueters
+banqueting
+banquetings
+banquets
+banquette
+banquettes
+Banquo
+banquo
+bans
+bansalague
+bansela
+banshee
+banshees
+banshie
+banshies
+Banstead
+banstickle
+bant
+Bantam
+bantam
+bantamize
+bantams
+bantamweight
+bantamweights
+bantay
+bantayan
+banteng
+banter
+bantered
+banterer
+banterers
+bantering
+banteringly
+banters
+bantery
+Banthine
+banties
+bantin
+Banting
+banting
+Bantingism
+bantingize
+bantings
+bantling
+bantlings
+Bantoid
+Bantry
+Bantu
+bantu
+Bantus
+bantus
+Bantustan
+banty
+banus
+banuyo
+Banville
+Banwell
+banxring
+banya
+Banyai
+banyan
+banyans
+Banyoro
+Banyuls
+banzai
+banzais
+BAO
+baobab
+baobabs
+BAOR
+Bap
+bap
+BAPCO
+BAPCT
+Baphia
+Baphomet
+baphomet
+Baphometic
+bapistery
+BAppArts
+Bapt
+bapt
+Baptanodon
+baptise
+baptised
+baptises
+Baptisia
+baptisia
+baptisias
+baptising
+baptism
+baptismal
+baptismally
+baptisms
+Baptist
+baptist
+Baptista
+Baptiste
+baptisteries
+baptistery
+Baptistic
+baptistic
+Baptistown
+baptistries
+baptistry
+baptists
+baptizable
+baptize
+baptized
+baptizee
+baptizement
+baptizer
+baptizers
+baptizes
+baptizing
+Baptlsta
+Baptornis
+BAR
+BAr
+Bar
+bar
+bar-
+bar.
+Bara
+bara
+barabara
+Barabas
+Barabbas
+barabbas
+Baraboo
+barabora
+Barabra
+Barac
+Baraca
+Barack
+Baracoa
+barad
+baradari
+Baraga
+baragnosis
+baragouin
+baragouinish
+Barahona
+baraita
+Baraithas
+Barajas
+barajillo
+Barak
+baraka
+Baralipton
+baralipton
+Baram
+Baramika
+baramin
+bar-and-grill
+barandos
+barangay
+barani
+Baranov
+Barany
+bara-picklet
+bararesque
+bararite
+Baras
+Barashit
+barasingha
+barat
+Barataria
+barathea
+baratheas
+barathra
+barathron
+barathrum
+barato
+baratte
+barauna
+Baray
+Barayon
+baraza
+Barb
+barb
+barba
+Barbabas
+Barbabra
+barbacan
+Barbacoa
+Barbacoan
+barbacou
+Barbadian
+barbadoes
+Barbados
+barbados
+barbal
+barbaloin
+barbar
+Barbara
+barbara
+Barbara-Anne
+Barbaraanne
+barbaralalia
+Barbarea
+Barbaresco
+Barbarese
+Barbaresi
+barbaresque
+Barbarian
+barbarian
+barbarianism
+barbarianize
+barbarianized
+barbarianizing
+barbarians
+barbaric
+barbarical
+barbarically
+barbarious
+barbariousness
+barbarisation
+barbarise
+barbarised
+barbarising
+barbarism
+barbarisms
+barbarities
+barbarity
+barbarization
+barbarize
+barbarized
+barbarizes
+barbarizing
+Barbarossa
+barbarous
+barbarously
+barbarousness
+Barbary
+barbary
+barbas
+barbasco
+barbascoes
+barbascos
+barbastel
+barbastelle
+barbate
+barbated
+barbatimao
+Barbe
+barbe
+Barbeau
+barbeau
+barbecue
+barbecued
+barbecueing
+barbecuer
+barbecues
+barbecuing
+barbed
+barbedness
+Barbee
+barbeiro
+barbel
+barbeled
+barbell
+barbellate
+barbells
+barbellula
+barbellulae
+barbellulate
+barbels
+barbeque
+barbequed
+barbequing
+Barber
+barber
+Barbera
+barbera
+barbered
+barberess
+barberfish
+barbering
+barberish
+barberite
+barbermonger
+barbero
+barberries
+barberry
+barbers
+barbershop
+barbershops
+barber-surgeon
+Barberton
+Barberville
+barbery
+barbes
+barbet
+barbets
+Barbette
+barbette
+barbettes
+Barbey
+Barbeyaceae
+Barbi
+Barbica
+barbican
+barbicanage
+barbicans
+barbicel
+barbicels
+Barbie
+barbierite
+barbigerous
+barbing
+barbion
+Barbirolli
+barbita
+barbital
+barbitalism
+barbitals
+barbiton
+barbitone
+barbitos
+barbituism
+barbiturate
+barbiturates
+barbituric
+barbiturism
+Barbizon
+barble
+barbless
+barblet
+barbola
+barbone
+barbotine
+barbotte
+barbouillage
+Barbour
+Barboursville
+Barbourville
+barboy
+Barboza
+Barbra
+barbre
+barbs
+barbu
+Barbuda
+barbudo
+barbudos
+Barbula
+barbula
+barbulate
+barbule
+barbules
+barbulyie
+Barbur
+Barbusse
+barbut
+barbute
+Barbuto
+barbuts
+barbwire
+barbwires
+Barby
+Barca
+Barcan
+barcarole
+barcaroles
+barcarolle
+barcas
+Barce
+barcella
+Barcellona
+Barcelona
+barcelona
+barcelonas
+Barceloneta
+B.Arch.
+BArch
+barchan
+barchans
+BArchE
+barche
+Barclay
+Barco
+barcolongo
+barcone
+Barcoo
+Barcot
+Barcroft
+Barcus
+Bard
+bard
+bardane
+bardash
+bardcraft
+Barde
+barde
+barded
+bardee
+Bardeen
+bardel
+bardelle
+Barden
+bardes
+Bardesanism
+Bardesanist
+Bardesanite
+bardess
+Bardia
+bardic
+bardie
+bardier
+bardiest
+bardiglio
+bardily
+bardiness
+barding
+bardings
+bardish
+bardism
+bardlet
+bardlike
+bardling
+Bardo
+bardo
+bardocucullus
+Bardolater
+bardolater
+Bardolatry
+bardolatry
+Bardolino
+Bardolph
+Bardolphian
+Bardot
+bards
+bardship
+Bardstown
+Bardulph
+Bardwell
+bardy
+Bare
+bare
+Barea
+bare-ankled
+bare-armed
+bare-ass
+bare-assed
+bareback
+bare-backed
+barebacked
+bare-bitten
+bareboat
+bareboats
+barebone
+bare-boned
+bareboned
+barebones
+bare-bosomed
+bare-branched
+bare-breasted
+bareca
+bare-chested
+bare-clawed
+bared
+bare-faced
+barefaced
+barefacedly
+barefacedness
+bare-fingered
+barefisted
+barefit
+Barefoot
+barefoot
+barefooted
+barege
+bareges
+bare-gnawn
+bare-handed
+barehanded
+barehead
+bare-headed
+bareheaded
+bareheadedness
+Bareilly
+bareka
+bare-kneed
+bareknuckle
+bareknuckled
+bare-legged
+barelegged
+Bareli
+barely
+Barenboim
+bare-necked
+barenecked
+bareness
+barenesses
+Barents
+bare-picked
+barer
+bare-ribbed
+bares
+baresark
+baresarks
+bare-skinned
+bare-skulled
+baresma
+barest
+baresthesia
+baret
+bare-throated
+bare-toed
+baretta
+bare-walled
+bare-worn
+barf
+barfed
+barff
+barfing
+barfish
+barflies
+barfly
+barfs
+barful
+Barfuss
+barfy
+bargain
+bargainable
+bargain-basement
+bargain-counter
+bargained
+bargainee
+bargainer
+bargainers
+bargain-hunting
+bargaining
+bargainor
+bargains
+bargainwise
+bargander
+barge
+barge-board
+bargeboard
+barge-couple
+barge-course
+barged
+bargee
+bargeer
+bargees
+bargeese
+bargehouse
+barge-laden
+bargelike
+bargelli
+bargello
+bargellos
+bargeload
+bargeman
+bargemaster
+bargemen
+bargepole
+Barger
+barger
+barge-rigged
+Bargersville
+barges
+barge-stone
+bargestone
+bargh
+bargham
+barghest
+barghests
+barging
+bargir
+bar-goose
+bargoose
+barguest
+barguests
+barhal
+Barhamsville
+barhop
+barhopped
+barhopping
+barhops
+Bari
+bari
+baria
+bariatrician
+bariatrics
+baric
+barid
+barie
+barih
+barile
+barilla
+barillas
+Bariloche
+Barimah
+Barina
+Barinas
+Baring
+baring
+bariolage
+baris
+barish
+barit
+barit.
+barite
+baritenor
+barites
+baritonal
+baritone
+baritones
+barium
+bariums
+bark
+barkan
+barkantine
+barkary
+bark-bared
+barkbound
+barkcutter
+bark-cutting
+barked
+barkeep
+barkeeper
+barkeepers
+barkeeps
+barken
+barkened
+barkening
+barkentine
+barkentines
+Barker
+barker
+barkers
+barkery
+barkevikite
+barkevikitic
+barkey
+bark-formed
+bark-galled
+bark-galling
+bark-grinding
+barkhan
+barkier
+barkiest
+Barking
+barking
+barkingly
+Barkinji
+Barkla
+barkle
+Barkleigh
+barkless
+Barkley
+barklyite
+barkometer
+barkpeel
+barkpeeler
+barkpeeling
+barks
+Barksdale
+bark-shredding
+barksome
+barkstone
+bark-tanned
+barky
+Barlach
+barlafumble
+barlafummil
+Bar-le-duc
+barleduc
+barleducs
+barless
+Barletta
+barley
+barleybird
+barleybrake
+barley-break
+barleybreak
+barley-bree
+barley-broo
+barley-cap
+barley-clipping
+Barleycorn
+barley-corn
+barleycorn
+barley-fed
+barley-grinding
+barley-hood
+barleyhood
+barley-hulling
+barleymow
+barleys
+barleysick
+barley-sugar
+Barling
+barling
+barlock
+Barlow
+barlow
+barlows
+barly
+barm
+barmaid
+barmaids
+barman
+barmaster
+barmbrack
+barmcloth
+Barmecidal
+barmecidal
+Barmecide
+barmecide
+Barmen
+barmen
+barmfel
+barmie
+barmier
+barmiest
+barming
+barmkin
+barmote
+barms
+barmskin
+barmy
+barmybrained
+Barn
+barn
+Barna
+Barnaba
+Barnabas
+barnabas
+Barnabe
+Barnabite
+barnabite
+Barna-brahman
+Barnaby
+barnaby
+barnacle
+barnacle-back
+barnacled
+barnacle-eater
+barnacles
+barnacling
+barnage
+Barnaise
+Barnard
+barnard
+Barnardo
+Barnardsville
+Barnaul
+barn-brack
+barnbrack
+Barnburner
+Barncard
+barn-door
+barndoor
+Barnebas
+Barnegat
+Barnes
+Barnesboro
+Barneston
+Barnesville
+Barnet
+Barnett
+Barneveld
+Barneveldt
+Barney
+barney
+barney-clapper
+barneys
+barnful
+Barnhard
+barnhardtite
+Barnhart
+Barnie
+barnier
+barniest
+barnlike
+barnman
+barnmen
+barn-raising
+barns
+barns-breaking
+Barnsdall
+Barnsley
+Barnstable
+Barnstead
+Barnstock
+barnstorm
+barnstormed
+barnstormer
+barnstormers
+barnstorming
+barnstorms
+Barnum
+Barnumesque
+Barnumism
+Barnumize
+barnumize
+Barnwell
+Barny
+barny
+barnyard
+barnyards
+baro-
+Barocchio
+barocco
+Barocius
+baroclinicity
+baroclinity
+Baroco
+barocyclonometer
+Baroda
+barodynamic
+barodynamics
+barognosis
+barogram
+barograms
+barograph
+barographic
+barographs
+baroi
+Baroja
+baroko
+Barolet
+Barolo
+barolo
+barology
+Barolong
+baromacrometer
+barometer
+barometers
+barometric
+barometrical
+barometrically
+barometrograph
+barometrography
+barometry
+barometz
+baromotor
+Baron
+baron
+baronage
+baronages
+baronduki
+baroness
+baronesses
+baronet
+baronetage
+baronetcies
+baronetcy
+baroneted
+baronethood
+baronetical
+baroneting
+baronetise
+baronetised
+baronetising
+baronetize
+baronetized
+baronetizing
+baronets
+baronetship
+barong
+Baronga
+barongs
+baroni
+baronial
+baronies
+baronize
+baronized
+baronizing
+baronne
+baronnes
+baronries
+baronry
+barons
+baronship
+barony
+barophobia
+Baroque
+baroque
+baroquely
+baroqueness
+baroques
+baroreceptor
+baroscope
+baroscopic
+baroscopical
+barosinusitis
+barosinusitus
+Barosma
+barosmin
+barostat
+baroswitch
+barotactic
+barotaxis
+barotaxy
+barothermogram
+barothermograph
+barothermohygrogram
+barothermohygrograph
+baroto
+barotrauma
+barotraumas
+barotraumata
+barotropic
+barotropy
+Barotse
+Barotseland
+barouche
+barouches
+barouchet
+barouchette
+Barouni
+baroxyton
+Barozzi
+barpost
+barquantine
+barque
+barquentine
+Barquero
+barques
+barquest
+barquette
+Barquisimeto
+Barr
+barr
+Barra
+barra
+barrabkie
+barrable
+barrabora
+barracan
+barrace
+barrack
+barracked
+barracker
+barracking
+barracks
+Barrackville
+barraclade
+barracoon
+barracouta
+barracoutas
+barracuda
+barracudas
+barracudina
+barrad
+Barrada
+barragan
+barrage
+barraged
+barrages
+barraging
+barragon
+Barram
+barramunda
+barramundas
+barramundi
+barramundies
+barramundis
+barranca
+Barrancabermeja
+barrancas
+barranco
+barrancos
+barrandite
+Barranquilla
+Barranquitas
+barras
+barrat
+barrater
+barraters
+barrator
+barrators
+barratries
+barratrous
+barratrously
+barratry
+Barrault
+Barraza
+Barre
+barre
+barred
+Barree
+barrel
+barrelage
+barrel-bellied
+barrel-boring
+barrel-branding
+barrel-chested
+barrel-driving
+barreled
+barreler
+barrelet
+barreleye
+barreleyes
+barrelfish
+barrelfishes
+barrelful
+barrelfuls
+barrelhead
+barrel-heading
+barrelhouse
+barrelhouses
+barreling
+barrelled
+barrelling
+barrelmaker
+barrelmaking
+barrel-packing
+barrel-roll
+barrels
+barrelsful
+barrel-shaped
+barrel-vaulted
+barrelwise
+Barren
+barren
+barrener
+barrenest
+barrenly
+barrenness
+barrennesses
+barrens
+barrenwort
+barrer
+barrera
+barrer-off
+Barres
+barres
+Barret
+barret
+barretor
+barretors
+barretries
+barretry
+barrets
+Barrett
+barrette
+barretter
+barrettes
+Barri
+barricade
+barricaded
+barricader
+barricaders
+barricades
+barricading
+barricado
+barricadoed
+barricadoes
+barricadoing
+barricados
+barrico
+barricoes
+barricos
+Barrie
+Barrientos
+barrier
+barriers
+barriguda
+barrigudo
+barrigudos
+barrikin
+barriness
+barring
+barringer
+Barrington
+Barringtonia
+barrio
+barrio-dwellers
+Barrios
+barrios
+Barris
+barrister
+barrister-at-law
+barristerial
+barristers
+barristership
+barristress
+BARRNET
+Barron
+Barronett
+barroom
+barrooms
+Barros
+Barrow
+barrow
+barrow-boy
+barrowcoat
+barrowful
+Barrow-in-Furness
+Barrowist
+barrowist
+barrow-man
+barrowman
+barrow-men
+barrows
+barrulee
+barrulet
+barrulety
+barruly
+Barrus
+Barry
+barry
+barry-bendy
+Barrymore
+barry-nebuly
+barry-pily
+Barryton
+Barrytown
+Barryville
+barry-wavy
+bars
+Barsac
+barse
+Barsky
+barsom
+barspoon
+barstool
+barstools
+Barstow
+Bart
+Bart.
+bart
+Barta
+bar-tailed
+Bartel
+Bartelso
+bartend
+bartended
+bartender
+bartenders
+bartending
+bartends
+barter
+bartered
+barterer
+barterers
+bartering
+barters
+Barth
+barth
+Barthel
+Barthelemy
+Barthian
+barthian
+Barthianism
+barthite
+Barthol
+Barthold
+Bartholdi
+Bartholemy
+bartholinitis
+Bartholomean
+Bartholomeo
+Bartholomeus
+Bartholomew
+bartholomew
+Bartholomewtide
+Bartholomite
+Barthou
+Bartie
+bartisan
+bartisans
+bartizan
+bartizaned
+bartizans
+Bartko
+Bartle
+Bartlemy
+Bartlesville
+Bartlet
+Bartlett
+bartlett
+bartletts
+Bartley
+Barto
+Bartok
+Bartolemo
+Bartolome
+Bartolomeo
+Bartolommeo
+Bartolozzi
+Barton
+barton
+Bartonella
+Bartonia
+Bartonsville
+Bartonville
+Bartosch
+Bartow
+Bartram
+bartram
+Bartramia
+Bartramiaceae
+Bartramian
+bartree
+Bartsia
+bartsia
+Barty
+baru
+Baruch
+barukhzy
+Barundi
+baruria
+barvel
+barvell
+Barvick
+barwal
+barware
+barwares
+barway
+barways
+Barwick
+barwin
+barwing
+barwise
+barwood
+bar-wound
+Bary
+barycenter
+barycentre
+barycentric
+Barye
+barye
+baryecoia
+baryes
+baryglossia
+barylalia
+barylite
+baryon
+baryonic
+baryons
+baryphonia
+baryphonic
+baryphony
+Baryram
+barysilite
+barysphere
+baryta
+barytas
+baryte
+barytes
+barythymia
+barytic
+barytine
+baryto-
+barytocalcite
+barytocelestine
+barytocelestite
+baryton
+barytone
+barytones
+barytons
+barytophyllite
+barytostrontianite
+barytosulphate
+Barzani
+BAS
+bas
+basad
+basal
+basale
+basalia
+basally
+basal-nerved
+basalt
+basaltes
+basaltic
+basaltiform
+basaltine
+basaltoid
+basalt-porphyry
+basalts
+basaltware
+basan
+basanite
+basaree
+basat
+BASc
+bascinet
+Bascio
+Basco
+Bascology
+Bascom
+Bascomb
+basculation
+bascule
+bascules
+bascunan
+Base
+base
+base-ball
+baseball
+baseballdom
+baseballer
+baseballs
+baseband
+base-begged
+base-begot
+baseboard
+baseboards
+base-born
+baseborn
+basebred
+base-burner
+baseburner
+basecoat
+base-court
+basecourt
+based
+base-forming
+basehearted
+baseheartedness
+Basehor
+Basel
+baselard
+Baseler
+baseless
+baselessly
+baselessness
+baselevel
+baselike
+baseline
+baseliner
+baselines
+Basella
+basella
+Basellaceae
+basellaceous
+Basel-Land
+Basel-Mulhouse
+Basel-Stadt
+basely
+baseman
+basemen
+basement
+basementless
+basements
+basementward
+base-mettled
+base-minded
+base-mindedly
+base-mindedness
+basename
+baseness
+basenesses
+basenet
+Basenji
+basenji
+basenjis
+baseplate
+baseplug
+basepoint
+baser
+baserunning
+bases
+base-souled
+base-spirited
+base-spiritedness
+basest
+base-witted
+bas-fond
+BASH
+bash
+bashalick
+Basham
+Bashan
+bashara
+bashaw
+bashawdom
+bashawism
+bashaws
+bashawship
+bashed
+Bashee
+Bashemath
+Bashemeth
+basher
+bashers
+bashes
+bashful
+bashfully
+bashfulness
+bashfulnesses
+bashi-bazouk
+bashibazouk
+bashi-bazoukery
+Bashilange
+-bashing
+bashing
+Bashkir
+Bashkiria
+bashless
+bashlik
+bashlyk
+bashlyks
+bashment
+Bashmuric
+Basho
+Bashuk
+bashyle
+basi-
+Basia
+basial
+basialveolar
+basiarachnitis
+basiarachnoiditis
+basiate
+basiated
+basiating
+basiation
+Basibracteolate
+basibranchial
+basibranchiate
+basibregmatic
+BASIC
+Basic
+basic
+basically
+basicerite
+basichromatic
+basichromatin
+basichromatinic
+basichromiole
+basicities
+basicity
+basic-lined
+basicranial
+basics
+basicytoparaplastin
+basidia
+basidial
+basidigital
+basidigitale
+basidigitalia
+basidiocarp
+basidiogenetic
+basidiolichen
+Basidiolichenes
+basidiomycete
+Basidiomycetes
+basidiomycetes
+basidiomycetous
+basidiophore
+basidiospore
+basidiosporous
+basidium
+basidorsal
+Basie
+basifacial
+basification
+basified
+basifier
+basifiers
+basifies
+basifixed
+basifugal
+basify
+basifying
+basigamous
+basigamy
+basigenic
+basigenous
+basiglandular
+basigynium
+basihyal
+basihyoid
+Basil
+basil
+Basilan
+basilar
+Basilarchia
+basilard
+basilary
+basilateral
+Basildon
+Basile
+basilect
+basileis
+basilemma
+basileus
+Basilian
+basilian
+basilic
+Basilica
+basilica
+Basilicae
+basilicae
+basilical
+basilicalike
+basilican
+basilicas
+Basilicata
+basilicate
+basilicock
+basilicon
+Basilics
+basilics
+basilidan
+Basilidian
+Basilidianism
+Basiliensis
+basilinna
+Basilio
+basiliscan
+basiliscine
+Basiliscus
+basilisk
+basilisks
+basilissa
+Basilius
+Basilosauridae
+Basilosaurus
+basils
+basilweed
+basilysis
+basilyst
+basimesostasis
+basin
+basinal
+basinasal
+basinasial
+basined
+basinerved
+basinet
+basinets
+basinful
+basing
+Basingstoke
+basinlike
+basins
+basioccipital
+basion
+basions
+basiophitic
+basiophthalmite
+basiophthalmous
+basiotribe
+basiotripsy
+basiparachromatin
+basiparaplastin
+basipetal
+basipetally
+basiphobia
+basipodite
+basipoditic
+basipterygial
+basipterygium
+basipterygoid
+Basir
+basiradial
+basirhinal
+basirostral
+basis
+basiscopic
+basisidia
+basisolute
+basisphenoid
+basisphenoidal
+basitemporal
+basitting
+basiventral
+basivertebral
+bask
+baske
+basked
+basker
+Baskerville
+basket
+basket-ball
+basketball
+basketballer
+basketballs
+basket-bearing
+basketful
+basketfuls
+basket-hilted
+basketing
+basketlike
+basketmaker
+basketmaking
+basket-of-gold
+basketries
+basketry
+baskets
+basket-star
+Baskett
+basketware
+basketweaving
+basketwoman
+basketwood
+basketwork
+basketworm
+Baskin
+basking
+Baskish
+Baskonize
+basks
+Basle
+basnat
+basnet
+Basoche
+basocyte
+Basoga
+basoid
+Basoko
+Basom
+Basommatophora
+basommatophorous
+bason
+Basonga-mina
+Basongo
+basophil
+basophile
+basophilia
+basophilic
+basophilous
+basophils
+basophobia
+basos
+basote
+Basotho
+basotho
+Basotho-Qwaqwa
+Basov
+Basque
+basque
+basqued
+basques
+basquine
+Basra
+bas-relief
+Bas-Rhin
+Bass
+bass
+Bassa
+Bassalia
+Bassalian
+bassan
+bassanello
+bassanite
+Bassano
+bassara
+bassarid
+Bassaris
+Bassariscus
+bassarisk
+bass-bar
+Bassein
+Basse-Normandie
+Bassenthwaite
+basses
+Basses-Alpes
+Basses-Pyrn
+Basset
+basset
+basse-taille
+basseted
+Basse-Terre
+Basseterre
+basset-horn
+basseting
+bassetite
+bassets
+Bassett
+bassetta
+bassette
+bassetted
+bassetting
+Bassetts
+Bassfield
+bass-horn
+bassi
+Bassia
+bassia
+bassie
+bassine
+bassinet
+bassinets
+bassing
+bassi-rilievi
+bassirilievi
+bassist
+bassists
+bassly
+bassness
+bassnesses
+Basso
+basso
+basson
+bassoon
+bassoonist
+bassoonists
+bassoons
+basso-relievo
+basso-relievos
+basso-rilievo
+bassorin
+bassos
+bass-relief
+bassus
+bass-viol
+bass-wood
+basswood
+basswoods
+bassy
+Bast
+bast
+basta
+Bastaard
+Bastad
+bastant
+Bastard
+bastard
+bastarda
+bastard-cut
+bastardice
+bastardies
+bastardisation
+bastardise
+bastardised
+bastardising
+bastardism
+bastardization
+bastardizations
+bastardize
+bastardized
+bastardizes
+bastardizing
+bastardliness
+bastardly
+bastardry
+bastards
+bastard-saw
+bastard-sawed
+bastard-sawing
+bastard-sawn
+bastardy
+baste
+basted
+bastel-house
+basten
+baster
+basters
+bastes
+basti
+Bastia
+Bastian
+bastian
+bastide
+Bastien
+bastile
+bastiles
+Bastille
+bastille
+bastilles
+bastillion
+bastiment
+bastinade
+bastinaded
+bastinades
+bastinading
+bastinado
+bastinadoed
+bastinadoes
+bastinadoing
+basting
+bastings
+bastion
+bastionary
+bastioned
+bastionet
+bastions
+bastite
+bastnaesite
+bastnasite
+basto
+Bastogne
+baston
+bastonet
+bastonite
+Bastrop
+basts
+basural
+basurale
+Basuto
+basuto
+Basutoland
+Basutos
+Basye
+basyl
+Bat
+bat
+Bataan
+bataan
+Bataan-Corregidor
+batable
+batad
+Batak
+batakan
+bataleur
+batamote
+Batan
+Batanes
+Batangas
+batara
+batarde
+batardeau
+batata
+Batatas
+batatilla
+Batavi
+Batavia
+Batavian
+batavian
+batboy
+batboys
+batch
+batched
+Batchelder
+Batchelor
+batcher
+batchers
+batches
+batching
+Batchtown
+Bate
+bate
+batea
+bat-eared
+bateau
+bateaux
+bated
+bateful
+Batekes
+batel
+bateleur
+batell
+Bateman
+bateman
+batement
+Baten
+bater
+Bates
+bates
+Batesburg
+Batesland
+Batesville
+batete
+Batetela
+batfish
+batfishes
+bat-fowl
+batfowl
+batfowled
+batfowler
+batfowling
+batfowls
+batful
+Bath
+bath
+bath-
+Batha
+Bathala
+bathe
+batheable
+bathed
+Bathelda
+bather
+bathers
+bathes
+Bathesda
+bathetic
+bathetically
+bathflower
+bathhouse
+bathhouses
+bathic
+Bathilda
+Bathinette
+bathinette
+bathing
+bathing-machine
+bathkol
+bathless
+bath-loving
+bathman
+bathmat
+bathmats
+bathmic
+bathmism
+bathmotropic
+bathmotropism
+batho-
+bathochromatic
+bathochromatism
+bathochrome
+bathochromic
+bathochromy
+bathoflore
+bathofloric
+batholite
+batholith
+batholithic
+batholiths
+batholitic
+Batholomew
+bathomania
+bathometer
+bathometry
+Bathonian
+bathool
+bathophobia
+bathorse
+bathos
+bathoses
+bathrobe
+bathrobes
+bathroom
+bathroomed
+bathrooms
+bathroot
+baths
+Bathsheb
+Bath-sheba
+Bathsheba
+Bathsheeb
+bathtub
+bathtubful
+bathtubs
+bathukolpian
+bathukolpic
+Bathulda
+Bathurst
+bathvillite
+bathwater
+bathwort
+bathy-
+bathyal
+bathyanesthesia
+bathybian
+bathybic
+bathybius
+bathycentesis
+bathychrome
+bathycolpian
+bathycolpic
+bathycurrent
+bathyesthesia
+bathygraphic
+bathyhyperesthesia
+bathyhypesthesia
+bathyl
+bathylimnetic
+bathylite
+bathylith
+bathylithic
+bathylitic
+bathymeter
+bathymetric
+bathymetrical
+bathymetrically
+bathymetry
+bathyorographical
+bathypelagic
+bathyplankton
+bathyscape
+bathyscaph
+bathyscaphe
+bathyscaphes
+bathyseism
+bathysmal
+bathysophic
+bathysophical
+bathysphere
+bathyspheres
+bathythermogram
+bathythermograph
+Batia
+Batidaceae
+batidaceous
+batik
+batiked
+batiker
+batiking
+batiks
+Batilda
+bating
+batino
+Batis
+Batish
+Batista
+batiste
+batistes
+batitinan
+batlan
+batler
+batlet
+Batley
+batlike
+batling
+batlon
+Batman
+batman
+batmen
+bat-minded
+bat-mindedness
+bat-mule
+Batna
+Batocrinidae
+Batocrinus
+Batodendron
+batoid
+Batoidei
+Batoka
+Baton
+baton
+batoneer
+Batonga
+batonist
+batonistic
+batonne
+batonnier
+batons
+batoon
+batophobia
+Bator
+Batory
+Batrachia
+batrachia
+batrachian
+batrachians
+batrachiate
+Batrachidae
+batrachite
+Batrachium
+batracho-
+batrachoid
+Batrachoididae
+batrachophagous
+Batrachophidia
+batrachophobia
+batrachoplasty
+Batrachospermum
+batrachotoxin
+Batruk
+bats
+BATSE
+Batsheva
+bats-in-the-belfry
+batsman
+batsmanship
+batsmen
+Batson
+batster
+batswing
+batt
+Batta
+batta
+battable
+battailant
+battailous
+Battak
+Battakhin
+battalia
+battalias
+battalion
+battalions
+Battambang
+battarism
+battarismus
+Battat
+batteau
+batteaux
+batted
+battel
+batteled
+batteler
+batteling
+Battelle
+Battelmatt
+battels
+battement
+battements
+batten
+Battenburg
+battened
+battener
+batteners
+battening
+battens
+batter
+batterable
+battercake
+batterdock
+battered
+batterer
+batterfang
+batterie
+batteried
+batteries
+battering
+battering-ram
+batterman
+batter-out
+batters
+Battersea
+Battery
+battery
+battery-charging
+batteryman
+battery-powered
+battery-testing
+batteuse
+Batticaloa
+battier
+batties
+Battiest
+battiest
+battik
+battiks
+battiness
+batting
+battings
+Battipaglia
+battish
+Battista
+Battiste
+battle
+battle-ax
+battle-axe
+Battleboro
+battled
+battledore
+battledored
+battledores
+battledoring
+battle-fallen
+battlefield
+battlefields
+battlefront
+battlefronts
+battleful
+battleground
+battlegrounds
+battlement
+battlemented
+battlements
+battlepiece
+battleplane
+battler
+battlers
+battles
+battle-scarred
+battleship
+battleships
+battle-slain
+battlesome
+battle-spent
+battlestead
+Battletown
+battlewagon
+battleward
+battlewise
+battle-writhen
+battling
+battological
+battologise
+battologised
+battologising
+battologist
+battologize
+battologized
+battologizing
+battology
+batton
+batts
+battu
+battue
+battues
+batture
+Battus
+battuta
+battutas
+battute
+battuto
+battutos
+Batty
+batty
+battycake
+batukite
+batule
+Batum
+Batumi
+batuque
+Batussi
+Batwa
+batwing
+batwoman
+batwomen
+batyphone
+batz
+batzen
+BAU
+Bau
+baubee
+baubees
+bauble
+baublery
+baubles
+baubling
+Baubo
+bauch
+Bauchi
+bauchle
+Baucis
+bauckie
+bauckiebird
+baud
+baudekin
+baudekins
+Baudelaire
+baudery
+Baudette
+Baudin
+Baudoin
+Baudouin
+baudrons
+baudronses
+bauds
+Bauer
+Bauera
+Bauernbrot
+baufrey
+bauge
+Baugh
+Baughman
+Bauhaus
+Bauhinia
+bauhinia
+bauhinias
+bauk
+Baul
+baul
+bauld
+baulea
+bauleah
+baulk
+baulked
+baulkier
+baulkiest
+baulking
+baulks
+baulky
+Baum
+Baumann
+Baumbaugh
+Baume
+baume
+Baumeister
+baumhauerite
+baumier
+Baun
+baun
+bauno
+Baure
+Bauru
+Bausch
+Bauske
+Bausman
+bauson
+bausond
+bauson-faced
+bauta
+Bautain
+Bautista
+Bautram
+bautta
+Bautzen
+bauxite
+bauxites
+bauxitic
+bauxitite
+Bav
+bavardage
+Bavaria
+Bavarian
+bavarian
+bavarois
+bavaroise
+bavaroy
+bavary
+bavenite
+bavette
+baviaantje
+Bavian
+bavian
+baviere
+bavin
+Bavius
+Bavon
+bavoso
+baw
+bawarchi
+bawbee
+bawbees
+bawble
+bawcock
+bawcocks
+bawd
+bawdier
+bawdies
+bawdiest
+bawdily
+bawdiness
+bawdinesses
+bawdric
+bawdrick
+bawdrics
+bawdries
+bawdry
+bawds
+bawdship
+bawdstrot
+bawdy
+bawdyhouse
+bawdyhouses
+bawhorse
+bawke
+bawl
+bawled
+bawler
+bawlers
+bawley
+bawling
+bawling-out
+bawls
+bawly
+bawn
+bawneen
+Bawra
+bawrel
+bawsint
+baws'nt
+bawsunt
+bawtie
+bawties
+bawty
+Bax
+B-axes
+Baxie
+B-axis
+Baxley
+Baxter
+baxter
+Baxterian
+Baxterianism
+baxtone
+Baxy
+Bay
+bay
+Baya
+baya
+bayadeer
+bayadeers
+bayadere
+bayaderes
+bayal
+Bayam
+Bayamo
+bayamo
+Bayamon
+bayamos
+bayano
+Bayar
+Bayard
+bayard
+bayardly
+bayards
+bay-bay
+bayberries
+bayberry
+baybolt
+Bayboro
+bay-breasted
+baybush
+bay-colored
+baycuru
+Bayda
+Bayeau
+bayed
+Bayer
+Bayern
+Bayesian
+bayesian
+bayeta
+bayete
+Bayfield
+baygall
+Bayh
+bayhead
+baying
+bayish
+bayldonite
+Bayle
+Bayless
+baylet
+Bayley
+baylike
+Baylis
+Baylor
+Bayly
+bayman
+baymen
+Bayminette
+Baynebridge
+bayness
+Bayogoula
+bayok
+bayonet
+bayoneted
+bayoneteer
+bayoneting
+bayonets
+bayonetted
+bayonetting
+bayong
+Bayonne
+bayou
+Bayougoula
+bayous
+Baypines
+Bayport
+Bayreuth
+Bays
+bays
+bay-salt
+Bayshore
+Bayside
+baysmelt
+baysmelts
+Baytown
+Bayview
+Bayville
+bay-window
+bay-winged
+baywood
+baywoods
+bayz
+bazaar
+bazaars
+Bazaine
+Bazar
+bazar
+bazars
+Bazatha
+baze
+Bazigar
+Bazil
+Bazin
+Bazine
+Baziotes
+Bazluke
+bazoo
+bazooka
+bazookaman
+bazookamen
+bazookas
+bazooms
+bazoos
+bazzite
+B/B
+BB
+bb
+BBA
+BBB
+B.B.C.
+BBC
+BBL
+bbl
+bbl.
+bbls
+BBN
+bbs
+BBXRT
+B.C.
+B/C
+BC
+BCBS
+BCC
+BCD
+bcd
+BCDIC
+B.C.E.
+BCE
+BCerE
+bcf
+B.Ch.
+BCh
+bch
+Bchar
+BChE
+bchs
+B.C.L.
+BCL
+BCM
+BCom
+BComSc
+BCP
+BCPL
+BCR
+BCS
+BCWP
+BCWS
+B.D.
+B/D
+BD
+bd
+bd.
+BDA
+BDC
+BDD
+Bde
+bde
+bdellatomy
+bdellid
+Bdellidae
+bdellium
+bdelliums
+bdelloid
+Bdelloida
+bdellometer
+Bdellostoma
+Bdellostomatidae
+Bdellostomidae
+bdellotomy
+Bdelloura
+Bdellouridae
+bdellovibrio
+BDes
+BDF
+bdft
+bdl
+bdl.
+bdle
+bdls
+bdrm
+B.D.S.
+BDS
+bds
+BDSA
+BDT
+B.E.
+B/E
+BE
+Be
+be
+be-
+BEA
+Bea
+Beach
+beach
+Beacham
+beachboy
+Beachboys
+beachboys
+beachcomb
+beachcomber
+beachcombers
+beachcombing
+beachdrops
+beached
+beacher
+beaches
+beachfront
+beachhead
+beachheads
+beachie
+beachier
+beachiest
+beaching
+Beach-la-Mar
+Beach-la-mar
+beach-la-mar
+beachlamar
+beachless
+beachman
+beachmaster
+beachmen
+beach-sap
+beachside
+beachward
+beachwear
+Beachwood
+beachy
+beacon
+beaconage
+beaconed
+beaconing
+beaconless
+beacons
+Beaconsfield
+beaconwise
+bead
+beaded
+beaded-edge
+beader
+beadeye
+bead-eyed
+beadeyes
+beadflush
+bead-hook
+beadhouse
+beadhouses
+beadier
+beadiest
+beadily
+beadiness
+beading
+beadings
+Beadle
+beadle
+beadledom
+beadlehood
+beadleism
+beadlery
+beadles
+beadleship
+beadlet
+bead-like
+beadlike
+beadman
+beadmen
+bead-roll
+beadroll
+beadrolls
+beadrow
+bead-rubies
+bead-ruby
+beads
+bead-shaped
+beadsman
+beadsmen
+beadswoman
+beadswomen
+beadwork
+beadworks
+beady
+beady-eyed
+Beagle
+beagle
+beagles
+beagling
+beak
+beak-bearing
+beaked
+beaker
+beakerful
+beakerman
+beakermen
+beakers
+beakful
+beak-head
+beakhead
+beakier
+beakiest
+beak-iron
+beakiron
+beakless
+beak-like
+beaklike
+beak-nosed
+beaks
+beak-shaped
+beaky
+Beal
+beal
+beala
+bealach
+Beale
+Bealeton
+bealing
+Beall
+be-all
+beallach
+Bealle
+Beallsville
+Beals
+bealtared
+Bealtine
+Bealtuinn
+beam
+beamage
+Beaman
+beam-bending
+beambird
+beamed
+beam-end
+beam-ends
+beamer
+beamers
+beamfilling
+beamful
+beamhouse
+beamier
+beamiest
+beamily
+beaminess
+beaming
+beamingly
+beamish
+beamishly
+beamless
+beamlet
+beamlike
+beamman
+beamroom
+beams
+beamsman
+beamsmen
+beamster
+beam-straightening
+beam-tree
+beamwork
+beamy
+Bean
+bean
+bean-bag
+beanbag
+beanbags
+beanball
+beanballs
+bean-cleaning
+beancod
+bean-crushing
+Beane
+beaned
+Beaner
+beaner
+beaneries
+beaners
+beanery
+bean-feast
+beanfeast
+beanfeaster
+bean-fed
+beanfest
+beanfield
+beanie
+beanier
+beanies
+beaniest
+beaning
+beanlike
+beano
+beanos
+bean-planting
+beanpole
+beanpoles
+bean-polishing
+beans
+beansetter
+bean-shaped
+beanshooter
+beanstalk
+beanstalks
+beant
+beanweed
+beany
+beaproned
+Bear
+bear
+bearability
+bearable
+bearableness
+bearably
+bearance
+bearbaiter
+bear-baiting
+bearbaiting
+bearbane
+bearberries
+bearberry
+bearbind
+bearbine
+bearbush
+bearcat
+bearcats
+Bearce
+bearcoot
+Beard
+beard
+bearded
+beardedness
+Bearden
+bearder
+beardfish
+beardfishes
+beardie
+bearding
+beardless
+beardlessness
+beardlike
+beardom
+beards
+Beardsley
+Beardstown
+beardtongue
+beardy
+Beare
+beared
+bearer
+bearer-off
+bearers
+bearess
+bearfoot
+bearfoots
+bearherd
+bearhide
+bearhound
+bearhug
+bearhugs
+bearing
+bearings
+bearish
+bearishly
+bearishness
+bear-lead
+bear-leader
+bearleap
+bearlet
+bearlike
+bearm
+Bearnaise
+bearnaise
+Bearnard
+bearpaw
+bears
+bear's-breech
+bear's-ear
+bear's-foot
+bear's-foots
+bearship
+bearskin
+bearskins
+bear's-paw
+Bearsville
+beartongue
+bear-tree
+bearward
+bearwood
+bearwoods
+bearwort
+Beasley
+Beason
+beast
+beastbane
+beastdom
+beasthood
+beastie
+beasties
+beastily
+beastings
+beastish
+beastishness
+beastlier
+beastliest
+beastlike
+beastlily
+beastliness
+beastlinesses
+beastling
+beastlings
+beastly
+beastman
+Beaston
+beasts
+beastship
+beat
+Beata
+beata
+beatable
+beatably
+beatae
+beatas
+beat-beat
+beatee
+beaten
+beater
+beaterman
+beatermen
+beater-out
+beaters
+beaters-up
+beater-up
+beath
+beati
+beatific
+beatifical
+beatifically
+beatificate
+beatification
+beatifications
+beatified
+beatifies
+beatify
+beatifying
+beatille
+beatinest
+beating
+beatings
+beating-up
+Beatitude
+beatitude
+beatitudes
+Beatles
+beatles
+beatless
+beatnik
+beatnikism
+beatniks
+Beaton
+Beatrice
+beatrice
+Beatrisa
+Beatrix
+Beatriz
+beats
+beatster
+Beattie
+Beatty
+Beattyville
+beat-up
+beatus
+beatuti
+Beau
+beau
+Beauchamp
+Beauclerc
+beauclerk
+beaucoup
+Beaudoin
+beaued
+beauetry
+Beaufert
+beaufet
+beaufin
+Beauford
+Beaufort
+beaufort
+beaugregories
+beaugregory
+Beauharnais
+beau-ideal
+beau-idealize
+beauing
+beauish
+beauism
+Beaujolais
+beaujolais
+Beaujolaises
+Beaulieu
+Beaumarchais
+beaume
+beau-monde
+Beaumont
+beaumont
+Beaumontia
+Beaune
+beaupere
+beaupers
+beau-pleader
+beau-pot
+Beauregard
+beaus
+beauseant
+beauship
+beausire
+beaut
+beauteous
+beauteously
+beauteousness
+beauti
+beautician
+beauticians
+beautied
+beauties
+beautification
+beautifications
+beautified
+beautifier
+beautifiers
+beautifies
+beautiful
+beautifully
+beautifulness
+beautify
+beautifying
+beautihood
+beautiless
+beauts
+beauty
+beauty-beaming
+beauty-berry
+beauty-blind
+beauty-blooming
+beauty-blushing
+beauty-breathing
+beauty-bright
+beauty-bush
+beauty-clad
+beautydom
+beauty-fruit
+beauty-loving
+beauty-proof
+beautyship
+beauty-waning
+Beauvais
+Beauvoir
+beaux
+Beaux-Arts
+beaux-arts
+beaux-esprits
+beauxite
+BEAV
+Beaver
+beaver
+Beaverboard
+beaverboard
+Beaverbrook
+Beaverdale
+beavered
+beaverette
+beaveries
+beavering
+beaverish
+beaverism
+beaverite
+beaverize
+Beaverkill
+beaverkin
+Beaverlett
+beaverlike
+beaverpelt
+beaverroot
+beavers
+beaverskin
+beaverteen
+Beaverton
+Beavertown
+beaver-tree
+Beaverville
+beaverwood
+beavery
+beback
+bebait
+beballed
+bebang
+bebannered
+bebar
+bebaron
+bebaste
+bebat
+bebathe
+bebatter
+bebay
+Bebe
+bebeast
+bebed
+bebeerin
+bebeerine
+bebeeru
+bebeerus
+Bebel
+bebelted
+Beberg
+bebilya
+Bebington
+bebite
+bebization
+beblain
+beblear
+bebled
+bebleed
+bebless
+beblister
+beblood
+beblooded
+beblooding
+bebloods
+bebloom
+beblot
+beblotch
+beblubber
+beblubbered
+bebog
+bebop
+bebopper
+beboppers
+bebops
+beboss
+bebotch
+bebothered
+bebouldered
+bebrave
+bebreech
+bebrine
+bebrother
+bebrush
+Bebryces
+bebump
+Bebung
+bebusy
+bebuttoned
+bec
+becafico
+becall
+becalm
+becalmed
+becalming
+becalmment
+becalms
+became
+becap
+becapped
+becapping
+becaps
+becard
+becarpet
+becarpeted
+becarpeting
+becarpets
+becarve
+becasse
+becassine
+becassocked
+becater
+because
+Becca
+beccabunga
+beccaccia
+beccafico
+beccaficoes
+beccaficos
+Beccaria
+becchi
+becco
+becense
+bechained
+bechalk
+bechalked
+bechalking
+bechalks
+bechamel
+bechamels
+bechance
+bechanced
+bechances
+bechancing
+becharm
+becharmed
+becharming
+becharms
+bechase
+bechatter
+bechauffeur
+beche
+becheck
+Beche-de-Mer
+beche-de-mer
+beche-le-mar
+becher
+bechern
+Bechet
+bechic
+bechignoned
+bechirp
+Bechler
+Becht
+Bechtel
+Bechtelsville
+Bechtler
+Bechuana
+Bechuanaland
+Bechuanas
+becircled
+becivet
+Beck
+beck
+Becka
+becked
+beckelite
+Beckemeyer
+Becker
+becker
+Beckerman
+Becket
+becket
+beckets
+Beckett
+beckett
+Beckford
+Becki
+Beckie
+becking
+beckiron
+Beckley
+Beckman
+Beckmann
+beckon
+beckoned
+beckoner
+beckoners
+beckoning
+beckoningly
+beckons
+becks
+Beckville
+Beckwith
+Becky
+beclad
+beclamor
+beclamored
+beclamoring
+beclamors
+beclamour
+beclang
+beclap
+beclart
+beclasp
+beclasped
+beclasping
+beclasps
+beclatter
+beclaw
+beclip
+becloak
+becloaked
+becloaking
+becloaks
+beclog
+beclogged
+beclogging
+beclogs
+beclose
+beclothe
+beclothed
+beclothes
+beclothing
+becloud
+beclouded
+beclouding
+beclouds
+beclout
+beclown
+beclowned
+beclowning
+beclowns
+becluster
+becobweb
+becoiffed
+becollier
+becolme
+becolor
+becombed
+become
+becomed
+becomes
+becometh
+becoming
+becomingly
+becomingness
+becomings
+becomma
+becompass
+becompliment
+becoom
+becoresh
+becost
+becousined
+becovet
+becoward
+becowarded
+becowarding
+becowards
+Becquer
+Becquerel
+becquerelite
+becram
+becramp
+becrampon
+becrawl
+becrawled
+becrawling
+becrawls
+becreep
+becrime
+becrimed
+becrimes
+becriming
+becrimson
+becrinolined
+becripple
+becrippled
+becrippling
+becroak
+becross
+becrowd
+becrowded
+becrowding
+becrowds
+becrown
+becrush
+becrust
+becrusted
+becrusting
+becrusts
+becry
+becudgel
+becudgeled
+becudgeling
+becudgelled
+becudgelling
+becudgels
+becuffed
+becuiba
+becumber
+becuna
+becurl
+becurry
+becurse
+becursed
+becurses
+becursing
+becurst
+becurtained
+becushioned
+becut
+B.Ed.
+BED
+BEd
+bed
+bedabble
+bedabbled
+bedabbles
+bedabbling
+Bedad
+bedad
+bedaff
+bedaggered
+bedaggle
+bedamn
+bedamned
+bedamning
+bedamns
+bedamp
+bedangled
+bedare
+bedark
+bedarken
+bedarkened
+bedarkening
+bedarkens
+bedash
+bedaub
+bedaubed
+bedaubing
+bedaubs
+bedawee
+bedawn
+beday
+bedaze
+bedazed
+bedazement
+bedazzle
+bedazzled
+bedazzlement
+bedazzles
+bedazzling
+bedazzlingly
+bedboard
+bedbug
+bedbugs
+bedcap
+bedcase
+bedchair
+bedchairs
+bedchamber
+bed-clothes
+bedclothes
+bedclothing
+bedcord
+bedcover
+bedcovers
+beddable
+bed-davenport
+bedded
+bedder
+bedders
+bedding
+beddingroll
+beddings
+Beddoes
+beddy-bye
+Bede
+bede
+bedead
+bedeaf
+bedeafen
+bedeafened
+bedeafening
+bedeafens
+bedebt
+bedeck
+bedecked
+bedecking
+bedecks
+bedecorate
+bedeen
+bedegar
+bedeguar
+bedehouse
+bedehouses
+bedel
+Bedelia
+Bedell
+bedell
+bedells
+bedels
+bedelve
+bedeman
+bedemen
+beden
+bedene
+bedesman
+bedesmen
+bedeswoman
+bedeswomen
+bedevil
+bedeviled
+bedeviling
+bedevilled
+bedevilling
+bedevilment
+bedevils
+bedew
+bedewed
+bedewer
+bedewing
+bedewoman
+bedews
+bedfast
+bedfellow
+bedfellows
+bedfellowship
+bed-fere
+bedflower
+bedfoot
+Bedford
+Bedfordshire
+bedfordshire
+bedframe
+bedframes
+bedgery
+bedgoer
+bedgown
+bedgowns
+bed-head
+bediademed
+bediamonded
+bediaper
+bediapered
+bediapering
+bediapers
+Bedias
+bedight
+bedighted
+bedighting
+bedights
+bedikah
+bedim
+bedimmed
+bedimming
+bedimple
+bedimpled
+bedimples
+bedimplies
+bedimpling
+bedims
+bedin
+bedip
+bedirt
+bedirter
+bedirtied
+bedirties
+bedirty
+bedirtying
+bedismal
+Bedivere
+bedivere
+bedizen
+bedizened
+bedizening
+bedizenment
+bedizens
+bedkey
+bedlam
+bedlamer
+Bedlamic
+bedlamise
+bedlamised
+bedlamising
+bedlamism
+bedlamite
+bedlamitish
+bedlamize
+bedlamized
+bedlamizing
+bedlamp
+bedlamps
+bedlams
+bedlar
+bedless
+bedlids
+bedlight
+bedlike
+Bedlington
+Bedlingtonshire
+bed-maker
+bedmaker
+bedmakers
+bedmaking
+bedman
+bedmate
+bedmates
+Bedminster
+bednighted
+bednights
+bedoctor
+bedog
+bedolt
+bedot
+bedote
+bedotted
+Bedouin
+bedouin
+Bedouinism
+Bedouins
+bedouins
+bedouse
+bedown
+bedoyo
+bedpad
+bedpan
+bedpans
+bedplate
+bedplates
+bedpost
+bedposts
+bedquilt
+bedquilts
+bedrabble
+bedrabbled
+bedrabbling
+bedraggle
+bedraggled
+bedragglement
+bedraggles
+bedraggling
+bedrail
+bedrails
+bedral
+bedrape
+bedraped
+bedrapes
+bedraping
+bedravel
+bedread
+bedrel
+bedrench
+bedrenched
+bedrenches
+bedrenching
+bedress
+bedribble
+bedrid
+bedridden
+bedriddenness
+bedrift
+bedright
+bedrip
+bedrite
+bedrivel
+bedriveled
+bedriveling
+bedrivelled
+bedrivelling
+bedrivels
+bedrizzle
+bedrock
+bedrocks
+bedroll
+bedrolls
+bedroom
+bedrooms
+bedrop
+bedrown
+bedrowse
+bedrug
+bedrugged
+bedrugging
+bedrugs
+Beds
+beds
+bedscrew
+bedsheet
+bedsheets
+bedsick
+bedside
+bedsides
+bedsit
+bedsite
+bed-sitter
+bedsitter
+bed-sitting-room
+bedsock
+bedsonia
+bedsonias
+bedsore
+bedsores
+bedspread
+bedspreads
+bedspring
+bedsprings
+bedstaff
+bedstand
+bedstands
+bedstaves
+bedstead
+bedsteads
+bedstock
+bedstraw
+bedstraws
+bedstring
+bedswerver
+bedtick
+bedticking
+bedticks
+bedtime
+bedtimes
+bedub
+beduchess
+beduck
+Beduin
+beduin
+Beduins
+beduins
+beduke
+bedull
+bedumb
+bedumbed
+bedumbing
+bedumbs
+bedunce
+bedunced
+bedunces
+bedunch
+beduncing
+bedung
+bedur
+bedusk
+bedust
+bedward
+bedwards
+bedwarf
+bedwarfed
+bedwarfing
+bedwarfs
+bedwarmer
+bedway
+bedways
+Bedwell
+bedwell
+bed-wetting
+Bedworth
+bedye
+BEE
+Bee
+bee
+beearn
+be-east
+Beeb
+beeball
+Beebe
+beebee
+beebees
+beebread
+beebreads
+bee-butt
+beech
+Beecham
+Beechbottom
+beechdrops
+beechen
+Beecher
+beecher
+beeches
+beech-green
+beechier
+beechiest
+Beechmont
+beechnut
+beechnuts
+beechwood
+beechwoods
+beechy
+Beeck
+Beedeville
+beedged
+beedi
+beedom
+Beedon
+bee-eater
+beef
+beefalo
+beefaloes
+beefalos
+beef-brained
+beefburger
+beefburgers
+beefcake
+beefcakes
+beefeater
+beefeaters
+beef-eating
+beefed
+beefed-up
+beefer
+beefers
+beef-faced
+beefhead
+beefheaded
+beefier
+beefiest
+beefily
+beefin
+beefiness
+beefing
+beefing-up
+beefish
+beefishness
+beefless
+beeflower
+beefs
+beef-steak
+beefsteak
+beefsteaks
+beeftongue
+beef-witted
+beef-wittedly
+beef-wittedness
+beef-wood
+beefwood
+beefwoods
+beefy
+beegerite
+beehead
+bee-headed
+beeheaded
+beeherd
+Beehive
+beehive
+beehives
+beehive-shaped
+Beehouse
+beehouse
+beeish
+beeishness
+beek
+beekeeper
+beekeepers
+beekeeping
+beekite
+Beekman
+Beekmantown
+beelbow
+beele
+Beeler
+beelike
+beeline
+beelines
+beelol
+bee-loud
+Beelzebub
+beelzebub
+Beelzebubian
+Beelzebul
+beeman
+beemaster
+beemen
+Beemer
+been
+beennut
+beent
+beento
+beep
+beeped
+beeper
+beepers
+beeping
+beeps
+Beer
+beer
+Beera
+beerage
+beerbachite
+beerbelly
+beerbibber
+Beerbohm
+beeregar
+beerhouse
+beerhouses
+beerier
+beeriest
+beerily
+beeriness
+beerish
+beerishly
+beermaker
+beermaking
+beermonger
+Beernaert
+beerocracy
+Beerothite
+beerpull
+Beers
+beers
+Beersheba
+Beersheeba
+beer-up
+beery
+bees
+Beesley
+Beeson
+beest
+beesting
+beestings
+beestride
+bees-wax
+beeswax
+beeswaxes
+beeswing
+beeswinged
+beeswings
+beet
+beetewk
+beetfly
+beeth
+Beethoven
+beethoven
+Beethovenian
+Beethovenish
+Beethovian
+beetiest
+beetle
+beetle-browed
+beetle-crusher
+beetled
+beetle-green
+beetlehead
+beetle-headed
+beetleheaded
+beetleheadedness
+beetler
+beetlers
+beetles
+beetlestock
+beetlestone
+beetleweed
+beetlike
+beetling
+beetmister
+Beetner
+Beetown
+beetrave
+beet-red
+beetroot
+beetroots
+beetrooty
+beets
+beety
+beeve
+beeves
+Beeville
+beevish
+beeware
+beeway
+beeweed
+beewinged
+beewise
+beewort
+beeyard
+beezer
+beezers
+B.E.F.
+BEF
+bef
+befall
+befallen
+befalling
+befalls
+befame
+befamilied
+befamine
+befan
+befancy
+befanned
+befathered
+befavor
+befavour
+befeather
+befell
+beferned
+befetished
+befetter
+befezzed
+Beffrey
+beffroy
+befiddle
+befilch
+befile
+befilleted
+befilmed
+befilth
+Befind
+befinger
+befingered
+befingering
+befingers
+befire
+befist
+befit
+befits
+befitted
+befitting
+befittingly
+befittingness
+beflag
+beflagged
+beflagging
+beflags
+beflannel
+beflap
+beflatter
+beflea
+befleaed
+befleaing
+befleas
+befleck
+beflecked
+beflecking
+beflecks
+beflounce
+beflour
+beflout
+beflower
+beflowered
+beflowering
+beflowers
+beflum
+befluster
+befoam
+befog
+befogged
+befogging
+befogs
+befool
+befoolable
+befooled
+befooling
+befoolment
+befools
+befop
+before
+before-cited
+before-created
+before-delivered
+before-going
+beforehand
+beforehandedness
+before-known
+before-mentioned
+beforementioned
+before-named
+beforeness
+before-noticed
+before-recited
+before-said
+beforesaid
+beforested
+before-tasted
+before-thought
+beforetime
+beforetimes
+before-told
+before-warned
+before-written
+befortune
+befoul
+befouled
+befouler
+befoulers
+befoulier
+befouling
+befoulment
+befouls
+befountained
+befraught
+befreckle
+befreeze
+befreight
+befret
+befrets
+befretted
+befretting
+befriend
+befriended
+befriender
+befriending
+befriendment
+befriends
+befrill
+befrilled
+befringe
+befringed
+befringes
+befringing
+befriz
+befrocked
+befrogged
+befrounce
+befrumple
+befuddle
+befuddled
+befuddlement
+befuddlements
+befuddler
+befuddlers
+befuddles
+befuddling
+befume
+befur
+befurbelowed
+befurred
+beg
+Bega
+begabled
+begad
+begall
+begalled
+begalling
+begalls
+began
+begani
+begar
+begari
+begarie
+begarlanded
+begarnish
+begartered
+begary
+begash
+begass
+begat
+begats
+begattal
+begaud
+begaudy
+begay
+begaze
+begazed
+begazes
+begazing
+begeck
+begem
+begemmed
+begemming
+beget
+begets
+begettal
+begetter
+begetters
+begetting
+Begga
+beggable
+beggar
+beggardom
+beggared
+beggarer
+beggaress
+beggarhood
+beggaries
+beggaring
+beggarism
+beggar-lice
+beggarlice
+beggarlike
+beggarliness
+beggarly
+beggarman
+beggar-my-neighbor
+beggar-my-neighbour
+beggar-patched
+beggars
+beggar's-lice
+beggar's-tick
+beggar's-ticks
+beggar-tick
+beggar-ticks
+beggarweed
+beggarwise
+beggarwoman
+beggary
+begged
+begger
+Beggiatoa
+Beggiatoaceae
+beggiatoaceous
+begging
+beggingly
+beggingwise
+Beggs
+Beghard
+beghard
+Beghtol
+begift
+begiggle
+begild
+Begin
+begin
+beginger
+beginner
+beginners
+beginning
+beginnings
+begins
+begird
+begirded
+begirding
+begirdle
+begirdled
+begirdles
+begirdling
+begirds
+begirt
+beglad
+begladded
+begladding
+beglads
+beglamour
+beglare
+beglerbeg
+beglerbeglic
+beglerbeglik
+beglerbegluc
+beglerbegship
+beglerbey
+beglew
+beglic
+beglide
+beglitter
+beglobed
+begloom
+begloomed
+beglooming
+beglooms
+begloze
+begluc
+beglue
+begnaw
+begnawed
+begnawn
+bego
+begob
+begobs
+begod
+begoggled
+begohm
+begone
+begonia
+Begoniaceae
+begoniaceous
+Begoniales
+begonias
+begorah
+begorra
+begorrah
+begorry
+begot
+begotten
+begottenness
+begoud
+begowk
+begowned
+begrace
+begrain
+begrave
+begray
+begrease
+begreen
+begrett
+begrim
+begrime
+begrimed
+begrimer
+begrimes
+begriming
+begrimmed
+begrimming
+begrims
+begripe
+begroan
+begroaned
+begroaning
+begroans
+begrown
+begrudge
+begrudged
+begrudger
+begrudges
+begrudging
+begrudgingly
+begruntle
+begrutch
+begrutten
+begs
+begster
+beguard
+beguess
+beguile
+beguiled
+beguileful
+beguilement
+beguilements
+beguiler
+beguilers
+beguiles
+beguiling
+beguilingly
+beguilingness
+Beguin
+beguin
+Beguine
+beguine
+beguines
+begulf
+begulfed
+begulfing
+begulfs
+begum
+begummed
+begumming
+begums
+begun
+begunk
+begut
+Behah
+Behaim
+behale
+behalf
+behallow
+behalves
+behammer
+Behan
+behang
+behap
+Behar
+behatted
+behav
+behave
+behaved
+behaver
+behavers
+behaves
+behaving
+behavior
+behavioral
+behaviorally
+behaviored
+behaviorism
+behaviorist
+behavioristic
+behavioristically
+behaviorists
+behaviors
+behaviour
+behavioural
+behaviourally
+behaviourism
+behaviourist
+behaviours
+behead
+beheadal
+beheaded
+beheader
+beheading
+beheadlined
+beheads
+behear
+behears
+behearse
+behedge
+beheira
+beheld
+behelp
+behemoth
+behemothic
+behemoths
+behen
+behenate
+behenic
+behest
+behests
+behew
+behight
+behind
+behinder
+behindhand
+behinds
+behindsight
+behint
+Behistun
+behither
+Behka
+Behl
+Behlau
+Behlke
+Behm
+Behmen
+Behmenism
+Behmenist
+Behmenite
+Behn
+behn
+Behnken
+behold
+beholdable
+beholden
+beholder
+beholders
+beholding
+beholdingness
+beholds
+behoney
+behoof
+behooped
+behoot
+behoove
+behooved
+behooveful
+behoovefully
+behoovefulness
+behooves
+behooving
+behoovingly
+behorn
+behorror
+behove
+behoved
+behovely
+behoves
+behoving
+behowl
+behowled
+behowling
+behowls
+Behre
+Behrens
+Behring
+Behrman
+behung
+behusband
+behymn
+behypocrite
+Beica
+beice
+Beichner
+Beid
+Beiderbecke
+beige
+beigel
+beiges
+beignet
+beignets
+beigy
+Beijing
+beild
+Beilul
+Bein
+bein
+being
+beingless
+beingness
+beings
+beinked
+beinly
+beinness
+Beira
+beira
+Beirne
+Beirut
+beirut
+beisa
+beisance
+Beisel
+Beitch
+Beitnes
+Beitris
+Beitz
+Beja
+beja
+bejabbers
+bejabers
+bejade
+bejan
+bejant
+bejape
+bejaundice
+bejazz
+bejel
+bejeled
+bejeling
+bejelled
+bejelling
+bejesuit
+bejesus
+bejewel
+bejeweled
+bejeweling
+bejewelled
+bejewelling
+bejewels
+bejezebel
+bejig
+Bejou
+bejuco
+bejuggle
+bejumble
+bejumbled
+bejumbles
+bejumbling
+Beka
+Bekaa
+Bekah
+bekah
+Bekelja
+Beker
+bekerchief
+Bekha
+bekick
+bekilted
+beking
+bekinkinite
+bekiss
+bekissed
+bekisses
+bekissing
+Bekki
+bekko
+beknave
+beknight
+beknighted
+beknighting
+beknights
+beknit
+beknived
+beknot
+beknots
+beknotted
+beknottedly
+beknottedness
+beknotting
+beknow
+beknown
+Bel
+bel
+Bela
+bela
+belabor
+belabored
+belaboring
+belabors
+belabour
+belaboured
+belabouring
+belabours
+bel-accoil
+belace
+belaced
+beladied
+beladies
+beladle
+belady
+beladying
+Belafonte
+belage
+belah
+Belair
+Belait
+Belaites
+Belak
+Belalton
+belam
+Belamcanda
+Bel-ami
+belamour
+Belamy
+belamy
+belanda
+belander
+Belanger
+belap
+belar
+belard
+Belasco
+belash
+belast
+belat
+belate
+belated
+belatedly
+belatedness
+belating
+Belatrix
+belatticed
+belaud
+belauded
+belauder
+belauding
+belauds
+Belaunde
+belavendered
+belay
+belayed
+belayer
+belaying
+Belayneh
+belays
+belch
+belched
+Belcher
+belcher
+belchers
+Belchertown
+belches
+belching
+Belcourt
+beld
+Belda
+beldam
+beldame
+beldames
+beldams
+beldamship
+Belden
+Beldenville
+belder
+belderroot
+Belding
+belduque
+beleaf
+beleaguer
+beleaguered
+beleaguerer
+beleaguering
+beleaguerment
+beleaguers
+beleap
+beleaped
+beleaping
+beleaps
+beleapt
+beleave
+belection
+belecture
+beledgered
+belee
+beleed
+beleft
+Belem
+belemnid
+belemnite
+Belemnites
+belemnitic
+Belemnitidae
+belemnoid
+Belemnoidea
+Belen
+beleper
+bel-esprit
+belesprit
+beletter
+beleve
+Belfair
+Belfast
+belfast
+belfather
+Belfield
+Belford
+Belfort
+belfried
+belfries
+belfry
+Belg
+Belg.
+belga
+Belgae
+belgae
+belgard
+belgas
+Belgaum
+Belgian
+belgian
+belgians
+Belgic
+Belgique
+Belgium
+belgium
+Belgophile
+Belgorod-Dnestrovski
+Belgrade
+belgrade
+Belgrano
+Belgravia
+Belgravian
+Belia
+Belial
+belial
+Belialic
+Belialist
+belibel
+belibeled
+belibeling
+Belicia
+belick
+belicoseness
+belie
+belied
+belief
+beliefful
+belieffulness
+beliefless
+beliefs
+Belier
+belier
+beliers
+belies
+believability
+believable
+believableness
+believably
+belie-ve
+believe
+believed
+believer
+believers
+believes
+believeth
+believing
+believingly
+belight
+beliing
+belike
+beliked
+belikely
+Belili
+belime
+belimousined
+Belinda
+Belington
+Belinuridae
+Belinurus
+belion
+beliquor
+beliquored
+beliquoring
+beliquors
+Belis
+Belisarius
+Belita
+belite
+Belitoeng
+Belitong
+belitter
+belittle
+belittled
+belittlement
+belittler
+belittlers
+belittles
+belittling
+Belitung
+belive
+Belize
+Belk
+belk
+Belknap
+belknap
+Bell
+bell
+Bella
+Bellabella
+Bellacoola
+belladonna
+belladonnas
+Bellaghy
+Bellaire
+Bellamy
+Bellanca
+bellarmine
+Bellarthur
+Bellatrix
+Bellaude
+Bellay
+bell-bearer
+bellbind
+bellbinder
+bellbine
+bell-bird
+bellbird
+bellbirds
+bellbottle
+bell-bottom
+bell-bottomed
+bell-bottoms
+bellboy
+bellboys
+Bellbrook
+Bellbuckle
+BELLCORE
+bell-cranked
+bell-crowned
+Bellda
+Belldame
+Belldas
+Belle
+belle
+Bellechasse
+belled
+belledom
+Belleek
+belleek
+belleeks
+Bellefonte
+bellehood
+Bellelay
+Bellemead
+Bellemina
+Belleplaine
+Beller
+belleric
+Bellerive
+Bellerophon
+bellerophon
+Bellerophontes
+Bellerophontic
+Bellerophontidae
+Bellerose
+belles
+belles-lettres
+belleter
+belletrist
+belletristic
+belletrists
+Bellevernon
+Belleview
+Belleville
+Bellevue
+bellevue
+Bellew
+bell-faced
+Bellflower
+bell-flower
+bellflower
+bell-flowered
+bellhanger
+bellhanging
+bell-hooded
+bellhop
+bellhops
+bell-house
+bellhouse
+belli
+bellibone
+bellic
+bellical
+bellicism
+bellicist
+bellicose
+bellicosely
+bellicoseness
+bellicosities
+bellicosity
+bellied
+bellies
+belliferous
+belligerence
+belligerences
+belligerencies
+belligerency
+belligerent
+belligerently
+belligerents
+Bellina
+belling
+Bellingham
+Bellini
+Bellinzona
+bellipotent
+Bellis
+bellite
+bell-less
+bell-like
+bell-magpie
+bellmaker
+bellmaking
+bellman
+bellmanship
+bellmaster
+Bellmead
+bellmen
+bell-metal
+Bellmont
+Bellmore
+bellmouth
+bell-mouthed
+bellmouthed
+bell-nosed
+Bello
+bello
+Belloc
+Belloir
+bellon
+Bellona
+bellona
+Bellonian
+bellonion
+belloot
+Bellot
+bellota
+bellote
+Bellotto
+Bellovaci
+Bellow
+bellow
+bellowed
+bellower
+bellowers
+bellowing
+Bellows
+bellows
+bellowsful
+bellowslike
+bellowsmaker
+bellowsmaking
+bellowsman
+Bellport
+bellpull
+bellpulls
+bellrags
+bell-ringer
+Bells
+bells
+bell-shaped
+belltail
+bell-tongue
+belltopper
+belltopperdom
+belluine
+bellum
+bell-up
+Bellvale
+Bellville
+Bellvue
+bellware
+bellwaver
+bellweather
+bellweed
+bell-wether
+bellwether
+bellwethers
+bellwind
+bellwine
+Bellwood
+bellwood
+bellwort
+bellworts
+belly
+bellyache
+bellyached
+bellyacher
+bellyaches
+bellyaching
+belly-band
+bellyband
+belly-beaten
+belly-blind
+belly-bound
+belly-bumper
+bellybutton
+bellybuttons
+belly-cheer
+belly-devout
+bellyer
+belly-fed
+bellyfish
+bellyflaught
+belly-flop
+belly-flopped
+belly-flopping
+belly-ful
+bellyful
+bellyfull
+bellyfulls
+bellyfuls
+belly-god
+belly-gulled
+belly-gun
+belly-helve
+bellying
+belly-laden
+belly-land
+bellyland
+belly-landing
+bellylike
+bellyman
+belly-naked
+belly-piece
+bellypiece
+bellypinch
+belly-pinched
+belly-proud
+belly-sprung
+belly-timber
+belly-wash
+belly-whop
+belly-whopped
+belly-whopping
+belly-worshiping
+Belmar
+Bel-Merodach
+Belmond
+Belmondo
+Belmont
+Belmonte
+Belmopan
+beloam
+belock
+beloeilite
+beloid
+Beloit
+belomancy
+Belone
+belonephobia
+belonesite
+belong
+belonged
+belonger
+belonging
+belongings
+belongs
+belonid
+Belonidae
+belonite
+belonoid
+belonosphaerite
+belook
+belord
+Belorussia
+Belorussian
+belorussian
+Belostok
+Belostoma
+Belostomatidae
+Belostomidae
+belotte
+belouke
+belout
+belove
+beloved
+beloveds
+Belovo
+below
+belowdecks
+belowground
+belows
+belowstairs
+belozenged
+Belpre
+Bel-Ridge
+bels
+Belsano
+Belsen
+Belshazzar
+belshazzar
+Belshazzaresque
+Belshin
+belsire
+Belsky
+belswagger
+belt
+Beltane
+beltane
+belt-coupled
+beltcourse
+belt-cutting
+belt-driven
+belted
+Beltene
+Belter
+belter
+belter-skelter
+Belteshazzar
+belt-folding
+Beltian
+beltie
+beltine
+belting
+beltings
+Beltir
+Beltis
+beltless
+beltline
+beltlines
+beltmaker
+beltmaking
+beltman
+beltmen
+Belton
+belton
+Beltrami
+Beltran
+belt-repairing
+belts
+belt-sanding
+belt-sewing
+Beltsville
+belt-tightening
+Beltu
+beltway
+beltways
+beltwise
+Beluchi
+Belucki
+belue
+beluga
+belugas
+belugite
+Belus
+belute
+Belva
+belve
+Belvedere
+belvedere
+belvedered
+belvederes
+Belverdian
+Belvia
+Belvidere
+belvidere
+Belview
+Belvue
+Bely
+bely
+belying
+belyingly
+belzebub
+belzebuth
+Belzoni
+B.E.M.
+BEM
+BEMA
+bema
+bemad
+bemadam
+bemadamed
+bemadaming
+bemadams
+bemadden
+bemaddened
+bemaddening
+bemaddens
+bemail
+bemaim
+bemajesty
+beman
+bemangle
+bemantle
+bemar
+bemartyr
+bemas
+bemask
+bemaster
+bemat
+bemata
+bemaul
+bemazed
+Bemba
+Bembas
+Bembecidae
+Bemberg
+Bembex
+beme
+bemeal
+bemean
+bemeaned
+bemeaning
+bemeans
+bemedaled
+bemedalled
+bemeet
+Bemelmans
+Bement
+bementite
+bemercy
+bemete
+Bemidji
+bemingle
+bemingled
+bemingles
+bemingling
+beminstrel
+bemire
+bemired
+bemirement
+bemires
+bemiring
+bemirror
+bemirrorment
+Bemis
+bemist
+bemisted
+bemisting
+bemistress
+bemists
+bemitered
+bemitred
+bemix
+bemixed
+bemixes
+bemixing
+bemixt
+bemoan
+bemoanable
+bemoaned
+bemoaner
+bemoaning
+bemoaningly
+bemoans
+bemoat
+bemock
+bemocked
+bemocking
+bemocks
+bemoil
+bemoisten
+bemol
+bemole
+bemolt
+bemonster
+bemoon
+bemotto
+bemoult
+bemourn
+bemouth
+bemuck
+bemud
+bemuddle
+bemuddled
+bemuddlement
+bemuddles
+bemuddling
+bemuddy
+bemuffle
+bemurmur
+bemurmure
+bemurmured
+bemurmuring
+bemurmurs
+bemuse
+bemused
+bemusedly
+bemusement
+bemuses
+bemusing
+bemusk
+bemuslined
+bemuzzle
+bemuzzled
+bemuzzles
+bemuzzling
+Ben
+ben
+Bena
+bena
+benab
+Benacus
+Benadryl
+benadryl
+bename
+benamed
+benamee
+benames
+benami
+benamidar
+benaming
+Benares
+Benarnold
+benasty
+Benavides
+benben
+Benbow
+Benbrook
+bench
+benchboard
+benched
+bencher
+benchers
+benchership
+benches
+benchfellow
+benchful
+bench-hardened
+benching
+bench-kneed
+benchland
+bench-legged
+benchless
+benchlet
+Benchley
+bench-made
+benchman
+benchmar
+bench-mark
+benchmark
+benchmarked
+benchmarking
+benchmarks
+benchmen
+bench-warmer
+benchwarmer
+benchwork
+benchy
+Bencion
+bencite
+Benco
+Bend
+bend
+Benda
+benda
+bendability
+bendable
+benday
+bendayed
+bendaying
+bendays
+bended
+bendee
+bendees
+Bendel
+bendel
+bendell
+Bendena
+Bender
+bender
+benders
+Bendersville
+Bendick
+Bendict
+Bendicta
+Bendicty
+bendies
+Bendigo
+bending
+bendingly
+Bendite
+Bendix
+bendlet
+bends
+bendsome
+bendways
+bendwise
+bendy
+bendys
+bendy-wavy
+Bene
+bene
+beneaped
+beneath
+beneception
+beneceptive
+beneceptor
+Benedetta
+Benedetto
+Benedic
+Benedicite
+benedicite
+Benedick
+benedick
+benedicks
+Benedict
+benedict
+Benedicta
+Benedictine
+benedictine
+Benedictinism
+benediction
+benedictional
+benedictionale
+benedictionary
+benedictions
+benedictive
+benedictively
+Benedicto
+benedictory
+benedicts
+Benedictus
+benedictus
+benedight
+Benedikt
+Benedikta
+Benediktov
+Benedix
+benefact
+benefaction
+benefactions
+benefactive
+benefactor
+benefactors
+benefactorship
+benefactory
+benefactress
+benefactresses
+benefactrices
+benefactrix
+benefactrixes
+benefic
+benefice
+beneficed
+benefice-holder
+beneficeless
+beneficence
+beneficences
+beneficency
+beneficent
+beneficential
+beneficently
+benefices
+beneficiaire
+beneficial
+beneficially
+beneficialness
+beneficiaries
+beneficiary
+beneficiaryship
+beneficiate
+beneficiated
+beneficiating
+beneficiation
+beneficience
+beneficient
+beneficing
+beneficium
+benefit
+benefited
+benefiter
+benefiting
+benefits
+benefitted
+benefitting
+benegro
+beneighbored
+BENELUX
+Benelux
+beneme
+Benemid
+benempt
+benempted
+Benenson
+beneplacit
+beneplacito
+beneplacity
+Benes
+benes
+Benet
+benet
+Benet-Mercie
+Benetnasch
+Benetta
+benetted
+benetting
+benettle
+beneurous
+Beneventan
+Beneventana
+Benevento
+benevolence
+benevolences
+benevolency
+benevolent
+benevolently
+benevolentness
+benevolist
+Benezett
+Benfleet
+BEng
+Beng
+Beng.
+beng
+Bengal
+bengal
+Bengalese
+Bengali
+bengali
+Bengalic
+bengaline
+bengals
+Bengasi
+Benge
+Benghazi
+Bengkalis
+Bengola
+Bengt
+Benguela
+Ben-Gurion
+Benham
+Benhur
+Beni
+beni
+Benia
+Beniamino
+benic
+Benicia
+benight
+benighted
+benightedly
+benightedness
+benighten
+benighter
+benighting
+benightmare
+benightment
+benign
+benignancies
+benignancy
+benignant
+benignantly
+benignities
+benignity
+benignly
+benignness
+Beni-israel
+Benil
+Benilda
+Benildas
+Benildis
+benim
+Benin
+benin
+Benincasa
+Benioff
+Benis
+Benisch
+beniseed
+benison
+benisons
+Benita
+benitier
+Benito
+benitoite
+benj
+Benjamen
+Benjamin
+benjamin
+benjamin-bush
+Benjamin-Constant
+Benjaminite
+benjaminite
+benjamins
+Benjamite
+Benji
+Benjie
+benjoin
+Benjy
+benjy
+Benkelman
+Benkley
+Benkulen
+Benld
+Benlomond
+benmost
+Benn
+benn
+benne
+bennel
+bennes
+Bennet
+bennet
+bennets
+Bennett
+Bennettitaceae
+bennettitaceous
+Bennettitales
+Bennettites
+Bennettsville
+bennetweed
+Benni
+benni
+Bennie
+bennies
+Bennington
+Bennink
+Bennion
+Bennir
+bennis
+benniseed
+Bennu
+Benny
+benny
+Beno
+beno
+Benoit
+Benoite
+benomyl
+benomyls
+Ben-oni
+Benoni
+benorth
+benote
+bens
+bensail
+Bensalem
+bensall
+bensel
+bensell
+Bensen
+Bensenville
+bensh
+benshea
+benshee
+benshi
+bensil
+Bensky
+Benson
+Bent
+bent
+bentang
+ben-teak
+bentgrass
+benthal
+Bentham
+Benthamic
+Benthamism
+benthamism
+Benthamite
+benthic
+benthon
+benthonic
+benthopelagic
+benthos
+benthoscope
+benthoses
+Bentinck
+bentinck
+Bentincks
+bentiness
+benting
+Bentlee
+bentlet
+Bentley
+Bentleyville
+Bently
+Benton
+Bentonia
+bentonite
+bentonitic
+Bentonville
+Bentree
+bents
+bentstar
+bent-taildog
+bentwood
+bentwoods
+benty
+Benu
+Benue
+Benue-Congo
+benumb
+benumbed
+benumbedness
+benumbing
+benumbingly
+benumbment
+benumbs
+Benvenuto
+benvenuto
+benward
+benweed
+Benwood
+Benyamin
+Benz
+benz-
+benzacridine
+benzal
+benzalacetone
+benzalacetophenone
+benzalaniline
+benzalazine
+benzalcohol
+benzalcyanhydrin
+benzaldehyde
+benzaldiphenyl
+benzaldoxime
+benzalethylamine
+benzalhydrazine
+benzalphenylhydrazone
+benzalphthalide
+benzamide
+benzamido
+benzamine
+benzaminic
+benzamino
+benzanalgen
+benzanilide
+benzanthracene
+benzanthrone
+benzantialdoxime
+benzazide
+benzazimide
+benzazine
+benzazole
+benzbitriazole
+benzdiazine
+benzdifuran
+benzdioxazine
+benzdioxdiazine
+benzdioxtriazine
+Benzedrine
+benzedrine
+benzein
+Benzel
+benzene
+benzeneazobenzene
+benzenediazonium
+benzenes
+benzenoid
+benzenyl
+benzhydrol
+benzhydroxamic
+benzidin
+benzidine
+benzidino
+benzidins
+benzil
+benzilic
+benzimidazole
+benziminazole
+benzin
+benzinduline
+benzine
+benzines
+benzins
+benzo
+benzo-
+benzoate
+benzoated
+benzoates
+benzoazurine
+benzobis
+benzocaine
+benzocoumaran
+benzodiazine
+benzodiazole
+benzoflavine
+benzofluorene
+benzofulvene
+benzofuran
+benzofuroquinoxaline
+benzofuryl
+benzoglycolic
+benzoglyoxaline
+benzohydrol
+benzoic
+benzoid
+benzoin
+benzoinated
+benzoins
+benzoiodohydrin
+benzol
+benzolate
+benzole
+benzoles
+benzoline
+benzolize
+benzols
+benzomorpholine
+benzonaphthol
+Benzonia
+benzonitrile
+benzonitrol
+benzoperoxide
+benzophenanthrazine
+benzophenanthroline
+benzophenazine
+benzophenol
+benzophenone
+benzophenothiazine
+benzophenoxazine
+benzophloroglucinol
+benzophosphinic
+benzophthalazine
+benzopinacone
+benzopyran
+benzopyranyl
+benzopyrazolone
+benzopyrene
+benzopyrylium
+benzoquinoline
+benzoquinone
+benzoquinoxaline
+benzosulfimide
+benzosulphimide
+benzotetrazine
+benzotetrazole
+benzothiazine
+benzothiazole
+benzothiazoline
+benzothiodiazole
+benzothiofuran
+benzothiophene
+benzothiopyran
+benzotoluide
+benzotriazine
+benzotriazole
+benzotrichloride
+benzotrifluoride
+benzotrifuran
+benzoxate
+benzoxy
+benzoxyacetic
+benzoxycamphor
+benzoxyphenanthrene
+benzoyl
+benzoylate
+benzoylated
+benzoylating
+benzoylation
+benzoylformic
+benzoylglycine
+benzoyls
+benzpinacone
+benzpyrene
+benzthiophen
+benztrioxazine
+Ben-Zvi
+benzyl
+benzylamine
+benzylic
+benzylidene
+benzylpenicillin
+benzyls
+beode
+Beograd
+Beora
+Beore
+Beothuk
+Beothukan
+Beowawe
+Beowulf
+beowulf
+BEP
+bepaid
+Bepaint
+bepaint
+bepainted
+bepainting
+bepaints
+bepale
+bepaper
+beparch
+beparody
+beparse
+bepart
+bepaste
+bepastured
+bepat
+bepatched
+bepaw
+bepearl
+bepelt
+bepen
+bepepper
+beperiwigged
+bepester
+bepewed
+bephilter
+bephrase
+bepicture
+bepiece
+bepierce
+bepile
+bepill
+bepillared
+bepimple
+bepimpled
+bepimples
+bepimpling
+bepinch
+bepistoled
+bepity
+beplague
+beplaided
+beplaster
+beplumed
+bepommel
+bepowder
+bepraise
+bepraisement
+bepraiser
+beprank
+bepranked
+bepray
+bepreach
+bepress
+bepretty
+bepride
+beprose
+bepuddle
+bepuff
+bepuffed
+bepun
+bepurple
+bepuzzle
+bepuzzlement
+Beqaa
+bequalm
+bequeath
+bequeathable
+bequeathal
+bequeathed
+bequeather
+bequeathing
+bequeathment
+bequeaths
+bequest
+bequests
+bequirtle
+bequote
+beqwete
+BER
+Ber
+ber
+berain
+berairou
+berakah
+berake
+beraked
+berakes
+beraking
+berakot
+berakoth
+Beranger
+berapt
+Berar
+Berard
+Berardo
+berascal
+berascaled
+berascaling
+berascals
+berat
+berate
+berated
+berates
+berating
+berattle
+beraunite
+beray
+berbamine
+Berber
+berber
+Berbera
+Berberi
+berberia
+Berberian
+berberid
+Berberidaceae
+berberidaceous
+berberin
+berberine
+berberins
+Berberis
+berberis
+berberry
+berbers
+berbery
+berceau
+berceaunette
+bercelet
+berceuse
+berceuses
+Berchemia
+Berchta
+Berchtesgaden
+Berck
+Berclair
+Bercovici
+Bercy
+berdache
+berdaches
+berdash
+Berdichev
+Berdyaev
+Berdyayev
+bere
+Berea
+Berean
+bereareft
+bereason
+bereave
+bereaved
+bereavement
+bereavements
+bereaven
+bereaver
+bereavers
+bereaves
+bereaving
+Berecyntia
+berede
+bereft
+berend
+berendo
+Berengaria
+Berengarian
+Berengarianism
+berengelite
+berengena
+Berenice
+Berenices
+Berenson
+Beresford
+Bereshith
+beresite
+Beret
+beret
+berets
+Beretta
+beretta
+berettas
+berewick
+Berey
+Berezina
+Berezniki
+Berfield
+Berg
+berg
+Berga
+bergalith
+bergall
+Bergama
+bergamasca
+bergamasche
+Bergamask
+bergamask
+Bergamee
+bergamiol
+Bergamo
+Bergamos
+Bergamot
+bergamot
+bergamots
+bergander
+bergaptene
+Bergdama
+Bergeman
+Bergen
+Bergen-Belsen
+Bergenfield
+Berger
+berger
+Bergerac
+bergere
+bergeres
+bergeret
+bergerette
+Bergeron
+Bergess
+Berget
+bergfall
+berggylt
+Bergh
+bergh
+berghaan
+Berghoff
+Bergholz
+Bergin
+berginization
+berginize
+Bergius
+Bergland
+berglet
+Berglund
+Bergman
+bergman
+Bergmann
+bergmannite
+Bergmans
+bergomask
+Bergoo
+Bergquist
+Bergren
+bergs
+bergschrund
+Bergsma
+Bergson
+Bergsonian
+Bergsonism
+Bergstein
+Bergstrom
+Bergton
+bergut
+Bergwall
+bergy
+bergylt
+Berhley
+berhyme
+berhymed
+berhymes
+berhyming
+Beri
+Beria
+beribanded
+beribbon
+beribboned
+beriber
+beriberi
+beriberic
+beriberis
+beribers
+beride
+berigora
+berime
+berimed
+berimes
+beriming
+Bering
+bering
+beringed
+beringite
+beringleted
+berinse
+Berio
+Beriosova
+Berit
+Berith
+berith
+Berk
+berk
+Berke
+Berkeleian
+berkeleian
+Berkeleianism
+Berkeley
+berkeley
+Berkeleyism
+Berkeleyite
+berkelium
+Berkey
+Berkie
+Berkin
+Berkley
+Berkly
+Berkman
+berkovets
+berkovtsi
+Berkow
+Berkowitz
+berkowitz
+Berks
+Berkshire
+berkshire
+Berkshires
+Berky
+Berl
+Berlauda
+Berlen
+berley
+Berlichingen
+Berlin
+berlin
+berlina
+Berlinda
+berline
+berline-landaulet
+Berliner
+berliner
+berliners
+berlines
+Berlinguer
+berlinite
+Berlinize
+berlin-landaulet
+berlins
+Berlioz
+Berlitz
+Berlon
+berloque
+Berlyn
+Berlyne
+berm
+Berman
+berme
+Bermejo
+bermensch
+bermes
+berms
+Bermuda
+bermuda
+Bermudan
+Bermudas
+bermudas
+Bermudian
+bermudian
+bermudians
+bermudite
+Bern
+Berna
+bernacle
+Bernadene
+Bernadette
+Bernadina
+Bernadine
+Bernadotte
+Bernal
+Bernalillo
+Bernanos
+Bernard
+bernard
+Bernardi
+Bernardina
+Bernardine
+bernardine
+Bernardino
+Bernardo
+Bernardston
+Bernardsville
+Bernarr
+Bernat
+Berne
+berne
+Bernelle
+Berner
+Berners
+Bernese
+Bernet
+Berneta
+Bernete
+Bernetta
+Bernette
+Bernhard
+Bernhardi
+Bernhardt
+Berni
+Bernice
+Bernicia
+bernicle
+bernicles
+Bernie
+Berniece
+Bernina
+Berninesque
+Bernini
+Bernis
+Bernita
+Bernj
+Bernkasteler
+bernoo
+Bernouilli
+Bernoulli
+Bernoullian
+Berns
+Bernstein
+bernstein
+Bernstorff
+Bernt
+Bernville
+Berny
+berob
+berobed
+Beroe
+beroe
+berogue
+Beroida
+Beroidae
+beroll
+Berossos
+Berosus
+berouged
+Beroun
+beround
+Berra
+berreave
+berreaved
+berreaves
+berreaving
+Berrellez
+berrendo
+berret
+berretta
+berrettas
+berrettino
+Berri
+berri
+berrichon
+berrichonne
+Berrie
+berried
+berrier
+berries
+berrigan
+Berriman
+berrugate
+Berry
+berry
+berry-bearing
+berry-brown
+berrybush
+berry-formed
+berrying
+berryless
+berrylike
+Berryman
+berryman
+berry-on-bone
+berrypicker
+berrypicking
+Berrysburg
+berry-shaped
+Berryton
+Berryville
+bersagliere
+bersaglieri
+berseem
+berseems
+berserk
+berserker
+berserks
+Bersiamite
+Bersil
+bersim
+berskin
+berstel
+Berstine
+BERT
+Bert
+Berta
+Bertasi
+Bertat
+Bertaud
+Berte
+Bertelli
+Bertero
+Berteroa
+berth
+Bertha
+bertha
+berthage
+berthas
+Berthe
+berthed
+berther
+berthierite
+berthing
+Berthold
+Bertholletia
+Berthoud
+berths
+Berti
+Bertie
+Bertila
+Bertilla
+Bertillon
+bertillonage
+bertin
+Bertina
+Bertine
+Bertle
+Bertoia
+Bertold
+Bertolde
+Bertolonia
+Bertolt
+Bertolucci
+Berton
+Bertram
+bertram
+Bertrand
+bertrandite
+Bertrando
+Bertrant
+bertrum
+Bertsche
+Berty
+beruffed
+beruffled
+berun
+berust
+bervie
+Berwick
+berwick
+Berwickshire
+Berwick-upon-Tweed
+Berwind
+Berwyn
+berycid
+Berycidae
+beryciform
+berycine
+berycoid
+Berycoidea
+berycoidean
+Berycoidei
+Berycomorphi
+Beryl
+beryl
+berylate
+beryl-blue
+Beryle
+beryl-green
+beryline
+beryllate
+beryllia
+berylline
+berylliosis
+beryllium
+berylloid
+beryllonate
+beryllonite
+beryllosis
+beryls
+Berytidae
+Beryx
+beryx
+berzelianite
+berzeliite
+Berzelius
+BES
+Bes
+bes
+bes-
+besa
+besagne
+besague
+besaiel
+besaile
+besaint
+besan
+Besancon
+besanctify
+besand
+Besant
+besant
+bes-antler
+besauce
+besayle
+bescab
+bescarf
+bescatter
+bescent
+bescorch
+bescorched
+bescorches
+bescorching
+bescorn
+bescoundrel
+bescour
+bescoured
+bescourge
+bescouring
+bescours
+bescramble
+bescrape
+bescratch
+bescrawl
+bescreen
+bescreened
+bescreening
+bescreens
+bescribble
+bescribbled
+bescribbling
+bescurf
+bescurvy
+bescutcheon
+beseam
+besee
+beseech
+beseeched
+beseecher
+beseechers
+beseeches
+beseeching
+beseechingly
+beseechingness
+beseechment
+beseek
+beseem
+beseemed
+beseeming
+beseemingly
+beseemingness
+beseemliness
+beseemly
+beseems
+beseen
+beseige
+Beseleel
+beset
+besetment
+besets
+besetter
+besetters
+besetting
+besew
+beshackle
+beshade
+beshadow
+beshadowed
+beshadowing
+beshadows
+beshag
+beshake
+beshame
+beshamed
+beshames
+beshaming
+beshawled
+beshear
+beshell
+beshield
+beshine
+beshiver
+beshivered
+beshivering
+beshivers
+beshlik
+beshod
+Beshore
+beshout
+beshouted
+beshouting
+beshouts
+beshow
+beshower
+beshrew
+beshrewed
+beshrewing
+beshrews
+beshriek
+beshrivel
+beshroud
+beshrouded
+beshrouding
+beshrouds
+BeShT
+besiclometer
+beside
+besides
+besiege
+besieged
+besiegement
+besieger
+besiegers
+besieges
+besieging
+besiegingly
+Besier
+besigh
+besilver
+besin
+besing
+besiren
+besit
+beslab
+beslabber
+beslap
+beslash
+beslave
+beslaved
+beslaver
+besleeve
+beslime
+beslimed
+beslimer
+beslimes
+besliming
+beslings
+beslipper
+beslobber
+beslow
+beslubber
+besluit
+beslur
+beslushed
+besmear
+besmeared
+besmearer
+besmearing
+besmears
+besmell
+besmile
+besmiled
+besmiles
+besmiling
+besmirch
+besmirched
+besmircher
+besmirchers
+besmirches
+besmirching
+besmirchment
+besmoke
+besmoked
+besmokes
+besmoking
+besmooth
+besmoothed
+besmoothing
+besmooths
+besmother
+besmottered
+besmouch
+besmudge
+besmudged
+besmudges
+besmudging
+be-smut
+besmut
+be-smutch
+besmutch
+besmuts
+besmutted
+besmutting
+Besnard
+besnare
+besneer
+besnivel
+besnow
+besnowed
+besnowing
+besnows
+besnuff
+besodden
+besogne
+besognier
+besoil
+besoin
+besom
+besomer
+besoms
+besonio
+besonnet
+besoot
+besoothe
+besoothed
+besoothement
+besoothes
+besoothing
+besort
+besot
+besotment
+besots
+besotted
+besottedly
+besottedness
+besotter
+besotting
+besottingly
+besought
+besoul
+besour
+besouth
+bespake
+bespangle
+bespangled
+bespangles
+bespangling
+bespate
+bespatter
+bespattered
+bespatterer
+bespattering
+bespatterment
+bespatters
+bespawl
+bespeak
+bespeakable
+bespeaker
+bespeaking
+bespeaks
+bespecked
+bespeckle
+bespeckled
+bespecklement
+bespectacled
+besped
+bespeech
+bespeed
+bespell
+bespelled
+bespend
+bespete
+bespew
+bespice
+bespill
+bespin
+bespirit
+bespit
+besplash
+besplatter
+besplit
+bespoke
+bespoken
+bespot
+bespotted
+bespottedness
+bespotting
+bespouse
+bespoused
+bespouses
+bespousing
+bespout
+bespray
+bespread
+bespreading
+bespreads
+bespreng
+besprent
+bespring
+besprinkle
+besprinkled
+besprinkler
+besprinkles
+besprinkling
+besprizorni
+bespurred
+bespurt
+besputter
+bespy
+besqueeze
+besquib
+besquirt
+besra
+Bess
+bess
+Bessarabia
+Bessarabian
+Bessarion
+Besse
+Bessel
+bessel
+Besselian
+Bessemer
+bessemer
+Bessemerize
+bessemerize
+bessemerized
+bessemerizing
+Bessera
+besses
+Bessi
+Bessie
+Bessy
+Bessye
+BEST
+Best
+best
+bestab
+best-able
+best-abused
+best-accomplished
+bestad
+best-agreeable
+bestain
+bestamp
+bestand
+bestar
+bestare
+best-armed
+bestarve
+bestatued
+bestay
+bestayed
+best-ball
+best-beloved
+best-bred
+best-built
+best-clad
+best-conditioned
+best-conducted
+best-considered
+best-consulted
+best-cultivated
+best-dressed
+bestead
+besteaded
+besteading
+besteads
+besteal
+bested
+besteer
+bestench
+bester
+best-established
+best-esteemed
+best-formed
+best-graced
+best-grounded
+best-hated
+best-humored
+bestial
+bestialise
+bestialised
+bestialising
+bestialism
+bestialist
+bestialities
+bestiality
+bestialize
+bestialized
+bestializes
+bestializing
+bestially
+bestials
+bestian
+bestiarian
+bestiarianism
+bestiaries
+bestiarist
+bestiary
+bestick
+besticking
+bestill
+best-informed
+besting
+bestink
+best-intentioned
+bestir
+bestirred
+bestirring
+bestirs
+best-known
+best-laid
+best-learned
+best-liked
+best-loved
+best-made
+best-managed
+best-meaning
+best-meant
+best-minded
+best-natured
+bestness
+best-nourishing
+bestock
+bestore
+bestorm
+bestove
+bestow
+bestowable
+bestowage
+bestowal
+bestowals
+bestowed
+bestower
+bestowing
+bestowment
+bestows
+best-paid
+best-paying
+best-pleasing
+best-preserved
+best-principled
+bestraddle
+bestraddled
+bestraddling
+bestrapped
+bestraught
+bestraw
+best-read
+bestreak
+bestream
+best-resolved
+bestrew
+bestrewed
+bestrewing
+bestrewment
+bestrewn
+bestrews
+bestrid
+bestridden
+bestride
+bestrided
+bestrides
+bestriding
+bestripe
+bestrode
+bestrow
+bestrowed
+bestrowing
+bestrown
+bestrows
+bestrut
+bests
+bestseller
+bestsellerdom
+bestsellers
+best-selling
+bestselling
+best-sighted
+best-skilled
+best-tempered
+best-trained
+bestubble
+bestubbled
+bestuck
+bestud
+bestudded
+bestudding
+bestuds
+bestuur
+besugar
+besugo
+besuit
+besully
+beswarm
+beswarmed
+beswarming
+beswarms
+besweatered
+besweeten
+beswelter
+beswim
+beswinge
+beswink
+beswitch
+bet
+bet.
+Beta
+beta
+beta-amylase
+betacaine
+betacism
+betacismus
+beta-eucaine
+betafite
+betag
+beta-glucose
+betail
+betailor
+betain
+betaine
+betaines
+betainogen
+betake
+betaken
+betakes
+betaking
+betalk
+betallow
+beta-naphthol
+betanaphthol
+beta-naphthyl
+beta-naphthylamine
+Betancourt
+betangle
+betanglement
+beta-orcin
+beta-orcinol
+betas
+betask
+betassel
+betatron
+betatrons
+betatter
+betattered
+betattering
+betatters
+betaxed
+bete
+beteach
+betear
+beteela
+beteem
+betel
+Betelgeuse
+betelgeuse
+Betelgeux
+betell
+betelnut
+betelnuts
+betels
+beterschap
+betes
+Beth
+beth
+bethabara
+Bethalto
+Bethania
+bethank
+bethanked
+bethanking
+bethankit
+bethanks
+Bethanna
+Bethanne
+Bethany
+Bethe
+Bethel
+bethel
+bethels
+Bethena
+Bethera
+Bethesda
+bethesda
+bethesdas
+Bethesde
+Bethezel
+bethflower
+Bethina
+bethink
+bethinking
+bethinks
+Bethlehem
+bethlehem
+Bethlehemite
+bethlehemite
+bethorn
+bethorned
+bethorning
+bethorns
+bethought
+Bethpage
+bethrall
+bethreaten
+bethroot
+beths
+Bethsabee
+Bethsaida
+Bethuel
+bethumb
+bethump
+bethumped
+bethumping
+bethumps
+bethunder
+Bethune
+bethwack
+bethwine
+bethylid
+Bethylidae
+betide
+betided
+betides
+betiding
+betimber
+betime
+betimes
+betinge
+betipple
+betire
+betis
+betise
+betises
+betitle
+Betjeman
+betocsin
+betoil
+betoken
+betokened
+betokener
+betokening
+betokenment
+betokens
+beton
+betone
+betongue
+Betonica
+betonica
+betonies
+betons
+betony
+betook
+betorcin
+betorcinol
+betorn
+betoss
+betowel
+betowered
+Betoya
+Betoyan
+betrace
+betrail
+betraise
+betrample
+betrap
+betravel
+betray
+betrayal
+betrayals
+betrayed
+betrayer
+betrayers
+betra'ying
+betraying
+betrayment
+betrays
+betread
+betrend
+betrim
+betrinket
+betroth
+betrothal
+betrothals
+betrothed
+betrotheds
+betrothing
+betrothment
+betroths
+betrough
+betrousered
+BETRS
+betrumpet
+betrunk
+betrust
+bets
+Betsey
+Betsi
+Betsileos
+Betsimisaraka
+betso
+Betsy
+Bett
+Betta
+betta
+bettas
+Bette
+Bette-Ann
+Betteann
+Betteanne
+betted
+Bettencourt
+Bettendorf
+better
+better-advised
+better-affected
+better-balanced
+better-becoming
+better-behaved
+better-born
+better-bred
+better-considered
+better-disposed
+better-dressed
+bettered
+betterer
+bettergates
+better-humored
+better-informed
+bettering
+better-knowing
+better-known
+better-liked
+better-liking
+betterly
+better-meant
+betterment
+betterments
+bettermost
+better-natured
+betterness
+better-omened
+better-principled
+better-regulated
+betters
+better-seasoned
+better-taught
+Betterton
+better-witted
+Betthel
+Betthezel
+Betthezul
+Betti
+betties
+Bettina
+Bettine
+betting
+Bettinus
+bettong
+bettonga
+Bettongia
+bettor
+bettors
+Bettsville
+Betty
+betty
+Bettye
+Bettzel
+betuckered
+Betula
+Betulaceae
+betulaceous
+betulin
+betulinamaric
+betulinic
+betulinol
+Betulites
+betumbled
+beturbaned
+betusked
+betutor
+betutored
+betwattled
+between
+betweenbrain
+between-deck
+between-decks
+betweenity
+between-maid
+betweenmaid
+betweenness
+betweens
+betweentimes
+between-whiles
+betweenwhiles
+betwine
+betwit
+betwixen
+betwixt
+Betz
+beudanite
+beudantite
+Beulah
+beulah
+Beulaville
+beuncled
+beuniformed
+beurre
+Beuthel
+Beuthen
+Beutler
+Beutner
+BeV
+Bev
+Bevan
+bevaring
+Bevash
+bevatron
+bevatrons
+beveil
+bevel
+beveled
+bevel-edged
+beveler
+bevelers
+beveling
+bevelled
+beveller
+bevellers
+bevelling
+bevelment
+bevels
+bevenom
+Bever
+bever
+beverage
+beverages
+Beveridge
+Beverie
+Beverle
+Beverlee
+Beverley
+Beverlie
+Beverly
+Bevers
+beverse
+bevesseled
+bevesselled
+beveto
+Bevier
+bevies
+bevil
+bevillain
+bevilled
+Bevin
+bevined
+Bevington
+Bevinsville
+Bevis
+bevoiled
+bevomit
+bevomited
+bevomiting
+bevomits
+Bevon
+bevor
+bevors
+bevue
+Bevus
+Bevvy
+bevvy
+bevy
+BEW
+bewail
+bewailable
+bewailed
+bewailer
+bewailers
+bewailing
+bewailingly
+bewailment
+bewails
+bewaitered
+bewake
+bewall
+beware
+bewared
+bewares
+bewaring
+bewary
+bewash
+bewaste
+bewater
+bewearied
+bewearies
+beweary
+bewearying
+beweep
+beweeper
+beweeping
+beweeps
+bewelcome
+bewelter
+bewend
+bewept
+bewest
+bewet
+bewhig
+bewhisker
+bewhiskered
+bewhisper
+bewhistle
+bewhite
+bewhiten
+bewhore
+Bewick
+bewidow
+bewield
+bewig
+bewigged
+bewigging
+bewigs
+bewilder
+bewildered
+bewilderedly
+bewilderedness
+bewildering
+bewilderingly
+bewilderment
+bewilderments
+bewilders
+bewimple
+bewinged
+bewinter
+bewired
+bewit
+bewitch
+bewitched
+bewitchedness
+bewitcher
+bewitchery
+bewitches
+bewitchful
+bewitching
+bewitchingly
+bewitchingness
+bewitchment
+bewitchments
+bewith
+bewizard
+bewonder
+bework
+beworm
+bewormed
+beworming
+beworms
+beworn
+beworried
+beworries
+beworry
+beworrying
+beworship
+bewpers
+bewrap
+bewrapped
+bewrapping
+bewraps
+bewrapt
+bewrathed
+bewray
+bewrayed
+bewrayer
+bewrayers
+bewraying
+bewrayingly
+bewrayment
+bewrays
+bewreak
+bewreath
+bewreck
+bewrite
+bewrought
+bewry
+bewwept
+Bexar
+Bexhill-on-Sea
+Bexley
+bey
+beydom
+Beyer
+beyerite
+Beyle
+Beylic
+beylic
+beylical
+beylics
+beylik
+beyliks
+Beyo
+Beyoglu
+beyond
+beyondness
+beyonds
+beyrichite
+Beyrouth
+beys
+beyship
+Bezae
+Bezaleel
+Bezaleelian
+bezan
+Bezanson
+bezant
+bezante
+bezantee
+bez-antler
+bezants
+bezanty
+bezazz
+bezazzes
+bezel
+bezels
+bezesteen
+bezetta
+bezette
+Beziers
+bezil
+bezils
+bezique
+beziques
+bezoar
+bezoardic
+bezoars
+bezonian
+Bezpopovets
+Bezwada
+bezzant
+bezzants
+bezzi
+bezzle
+bezzled
+bezzling
+bezzo
+B/F
+BF
+b.f.
+bf
+BFA
+BFAMus
+BFD
+BFDC
+BFHD
+B-flat
+BFR
+BFS
+BFT
+BG
+bg
+BGE
+BGeNEd
+B-girl
+Bglr
+BGP
+BH
+BHA
+bhabar
+Bhabha
+Bhadgaon
+Bhadon
+Bhaga
+Bhagalpur
+bhagat
+Bhagavad-Gita
+bhagavat
+bhagavata
+Bhai
+bhaiachara
+bhaiachari
+Bhairava
+Bhairavi
+bhaiyachara
+bhajan
+bhakta
+Bhaktapur
+bhaktas
+bhakti
+bhaktimarga
+bhaktis
+bhalu
+bhandar
+bhandari
+bhang
+bhangi
+bhangs
+Bhar
+bhara
+bharal
+Bharat
+Bharata
+Bharatiya
+bharti
+bhat
+Bhatpara
+Bhatt
+Bhaunagar
+bhava
+Bhavabhuti
+bhavan
+Bhavani
+Bhave
+Bhavnagar
+Bhayani
+BHC
+bhd
+bheestie
+bheesties
+bheesty
+bhikhari
+Bhikku
+bhikku
+Bhikkuni
+Bhikshu
+bhikshu
+Bhil
+Bhili
+Bhima
+bhindi
+bhishti
+bhisti
+bhistie
+bhisties
+BHL
+Bhojpuri
+bhokra
+Bhola
+Bhoodan
+bhoosa
+bhoot
+bhoots
+Bhopal
+b-horizon
+Bhotia
+Bhotiya
+Bhowani
+b'hoy
+bhoy
+BHP
+bhp
+BHT
+Bhubaneswar
+Bhudan
+Bhudevi
+Bhumibol
+bhumidar
+Bhumij
+bhunder
+bhungi
+bhungini
+bhut
+Bhutan
+bhutan
+Bhutanese
+bhutanese
+Bhutani
+Bhutatathata
+bhutatathata
+bhut-bali
+Bhutia
+bhuts
+Bhutto
+BI
+Bi
+bi
+bi-
+Bia
+biabo
+biacetyl
+biacetylene
+biacetyls
+biacid
+biacromial
+biacuminate
+biacuru
+Biadice
+Biafra
+Biafran
+Biagi
+Biagio
+biajaiba
+Biak
+bialate
+biali
+Bialik
+bialis
+biallyl
+bialveolar
+bialy
+bialys
+Bialystok
+bialystoker
+Biamonte
+Bianca
+Biancha
+Bianchi
+Bianchini
+bianchite
+Bianco
+bianco
+biangular
+biangulate
+biangulated
+biangulous
+bianisidine
+Bianka
+biannual
+biannually
+biannulate
+biarchy
+biarcuate
+biarcuated
+Biarritz
+biarticular
+biarticulate
+biarticulated
+Bias
+bias
+biased
+biasedly
+biases
+biasing
+biasness
+biasnesses
+biassed
+biassedly
+biasses
+biassing
+biasteric
+biasways
+biaswise
+biathlon
+biathlons
+biatomic
+biaural
+biauricular
+biauriculate
+biaxal
+biaxial
+biaxiality
+biaxially
+biaxillary
+Biayenda
+Bib
+Bib.
+bib
+bibacious
+bibaciousness
+bibacity
+bibasic
+bibasilar
+bibation
+bibb
+bibbed
+bibber
+bibberies
+bibbers
+bibbery
+Bibbie
+Bibbiena
+bibbing
+bibble
+bibble-babble
+bibbled
+bibbler
+bibbling
+bibbons
+bibbs
+Bibby
+bibby
+Bibbye
+bibcock
+bibcocks
+Bibeau
+bibelot
+bibelots
+bibenzyl
+biberon
+Bibi
+bibi
+Bibiena
+Bibio
+bibionid
+Bibionidae
+bibiri
+bibiru
+bibitory
+bi-bivalent
+Bibl
+Bibl.
+bibl
+bibl.
+Bible
+bible
+Bible-basher
+bible-christian
+bible-clerk
+bibles
+bibless
+BiblHeb
+Biblic
+Biblical
+biblical
+Biblicality
+Biblically
+biblically
+Biblicism
+biblicism
+Biblicist
+biblicist
+Biblicistic
+biblico-
+Biblicolegal
+Biblicoliterary
+Biblicopsychological
+biblike
+biblio-
+biblioclasm
+biblioclast
+bibliofilm
+bibliog
+bibliog.
+bibliogenesis
+bibliognost
+bibliognostic
+bibliogony
+bibliograph
+bibliographer
+bibliographers
+bibliographic
+bibliographical
+bibliographically
+bibliographies
+bibliographize
+bibliography
+bibliokelpt
+biblioklept
+bibliokleptomania
+bibliokleptomaniac
+bibliolater
+bibliolatrist
+bibliolatrous
+bibliolatry
+bibliological
+bibliologies
+bibliologist
+bibliology
+bibliomancy
+bibliomane
+bibliomania
+bibliomaniac
+bibliomaniacal
+bibliomanian
+bibliomanianism
+bibliomanism
+bibliomanist
+bibliopegic
+bibliopegically
+bibliopegist
+bibliopegistic
+bibliopegistical
+bibliopegy
+bibliophage
+bibliophagic
+bibliophagist
+bibliophagous
+bibliophil
+bibliophile
+bibliophiles
+bibliophilic
+bibliophilism
+bibliophilist
+bibliophilistic
+bibliophily
+bibliophobe
+bibliophobia
+bibliopolar
+bibliopole
+bibliopolery
+bibliopolic
+bibliopolical
+bibliopolically
+bibliopolism
+bibliopolist
+bibliopolistic
+bibliopoly
+bibliosoph
+bibliotaph
+bibliotaphe
+bibliotaphic
+bibliothec
+bibliotheca
+bibliothecae
+bibliothecaire
+bibliothecal
+bibliothecarial
+bibliothecarian
+bibliothecary
+bibliothecas
+bibliotheke
+bibliotheque
+bibliotherapeutic
+bibliotherapies
+bibliotherapist
+bibliotherapy
+bibliothetic
+bibliothque
+bibliotic
+bibliotics
+bibliotist
+Biblism
+Biblist
+biblist
+biblists
+biblos
+biblus
+biborate
+bibracteate
+bibracteolate
+bibs
+bibulosities
+bibulosity
+bibulous
+bibulously
+bibulousness
+Bibulus
+Bicakci
+bicalcarate
+bicalvous
+bicameral
+bicameralism
+bicameralist
+bicamerist
+bicapitate
+bicapsular
+bicarb
+bicarbide
+bicarbonate
+bicarbonates
+bicarbs
+bicarbureted
+bicarburetted
+bicarinate
+bicarpellary
+bicarpellate
+bicaudal
+bicaudate
+bicched
+Bice
+bice
+bicellular
+bicentenaries
+bicentenarnaries
+bicentenary
+bicentennial
+bicentennially
+bicentennials
+bicentral
+bicentric
+bicentrically
+bicentricity
+bicep
+bicephalic
+bicephalous
+biceps
+bicepses
+bices
+bicetyl
+Bichat
+Biche-la-mar
+Bichelamar
+bichir
+bichloride
+bichlorides
+bichord
+bichos
+bichromate
+bichromated
+bichromatic
+bichromatize
+bichrome
+bichromic
+bichy
+biciliate
+biciliated
+bicipital
+bicipitous
+bicircular
+bicirrose
+Bick
+bick
+Bickart
+bicker
+bickered
+bickerer
+bickerers
+bickering
+bickern
+bickers
+bick-iron
+bickiron
+Bickleton
+Bickmore
+Bicknell
+biclavate
+biclinia
+biclinium
+Bicol
+bicollateral
+bicollaterality
+bicolligate
+bicolor
+bicolored
+bicolorous
+bicolors
+bicolour
+bicoloured
+bicolourous
+bicolours
+Bicols
+bicompact
+biconcave
+biconcavities
+biconcavity
+biconditional
+bicondylar
+bicone
+biconic
+biconical
+biconically
+biconjugate
+biconnected
+biconsonantal
+biconvex
+biconvexities
+biconvexity
+Bicorn
+bicorn
+bicornate
+bicorne
+bicorned
+bicornes
+bicornous
+bicornuate
+bicornuous
+bicornute
+bicorporal
+bicorporate
+bicorporeal
+bicostate
+bicrenate
+bicrescentic
+bicrofarad
+bicron
+bicrons
+bicrural
+BICS
+bicuculline
+bicultural
+biculturalism
+bicursal
+bicuspid
+bicuspidal
+bicuspidate
+bicuspids
+bicyanide
+bicycle
+bicycle-built-for-two
+bicycled
+bicycler
+bicyclers
+bicycles
+bicyclic
+bicyclical
+bicycling
+bicyclism
+bicyclist
+bicyclists
+bicyclo
+bicycloheptane
+bicycular
+bicylindrical
+BID
+bid
+Bida
+bid-a-bid
+bidactyl
+bidactyle
+bidactylous
+bid-ale
+bidar
+bidarka
+bidarkas
+bidarkee
+bidarkees
+Bidault
+bidcock
+biddability
+biddable
+biddableness
+biddably
+biddance
+Biddeford
+Biddelian
+bidden
+bidder
+bidders
+biddery
+Biddick
+Biddie
+biddie
+biddies
+bidding
+biddings
+Biddle
+Biddulphia
+Biddulphiaceae
+Biddy
+biddy
+biddy-bid
+biddy-biddy
+bide
+bided
+bidene
+Bidens
+bident
+bidental
+bidentalia
+bidentate
+bidented
+bidential
+bidenticulate
+bider
+biders
+bidery
+bides
+bidet
+bidets
+bidgee-widgee
+Bidget
+bidget
+bidi
+bidiagonal
+bidialectal
+bidialectalism
+bidigitate
+bidimensional
+biding
+bidirectional
+bidirectionally
+bidiurnal
+Bidle
+bidonville
+Bidpai
+bidree
+bidri
+bidry
+bids
+bidstand
+biduous
+Bidwell
+BIE
+Biebel
+Bieber
+bieberite
+Biedermann
+Biedermeier
+bieennia
+Biegel
+Biel
+Biela
+bielbrief
+bielby
+bield
+bielded
+bielding
+bields
+bieldy
+bielectrolysis
+Bielefeld
+bielenite
+Bielersee
+Bielid
+Bielka
+Bielorouss
+Bielo-russian
+Bielsko-Biala
+bien
+bienly
+biennale
+biennales
+Bienne
+bienne
+bienness
+biennia
+biennial
+biennially
+biennials
+biennium
+bienniums
+biens
+bienseance
+bientt
+bienvenu
+bienvenue
+Bienville
+bier
+bierbalk
+Bierce
+bierkeller
+Bierman
+Biernat
+biers
+bierstube
+bierstuben
+bierstubes
+biestings
+biethnic
+bietle
+biface
+bifaces
+bifacial
+bifanged
+bifara
+bifarious
+bifariously
+bifer
+biferous
+biff
+Biffar
+biffed
+biffies
+biffin
+biffing
+biffins
+biffs
+biffy
+bifid
+bifidate
+bifidated
+bifidities
+bifidity
+bifidly
+bifilar
+bifilarly
+bifistular
+biflabellate
+biflagelate
+biflagellate
+biflecnode
+biflected
+biflex
+biflorate
+biflorous
+bifluorid
+bifluoride
+bifocal
+bifocals
+bifoil
+bifold
+bifolia
+bifoliate
+bifoliolate
+bifolium
+bifollicular
+biforate
+biforin
+biforine
+biforked
+biforking
+biform
+biformed
+biformity
+biforous
+bifront
+bifrontal
+bifronted
+Bifrost
+bifrost
+bifteck
+bifunctional
+bifurcal
+bifurcate
+bifurcated
+bifurcately
+bifurcates
+bifurcating
+bifurcation
+bifurcations
+bifurcous
+big
+biga
+bigae
+bigam
+bigamic
+bigamies
+bigamist
+bigamistic
+bigamistically
+bigamists
+bigamize
+bigamized
+bigamizing
+bigamous
+bigamously
+bigamy
+big-antlered
+bigarade
+bigarades
+big-armed
+bigaroon
+bigaroons
+Bigarreau
+bigarreau
+bigas
+bigate
+big-bearded
+big-bellied
+bigbloom
+big-bodied
+big-boned
+big-bosomed
+big-breasted
+big-bulked
+bigbury
+big-chested
+big-eared
+Bigelow
+bigemina
+bigeminal
+bigeminate
+bigeminated
+bigeminies
+bigeminum
+bigeminy
+Big-endian
+big-endian
+bigener
+bigeneric
+bigential
+bigeye
+big-eyed
+bigeyes
+bigfeet
+bigfoot
+big-footed
+bigfoots
+Bigford
+big-framed
+Bigg
+bigg
+biggah
+big-gaited
+bigged
+biggen
+biggened
+biggening
+bigger
+biggest
+biggety
+biggie
+biggies
+biggin
+bigging
+biggings
+biggins
+biggish
+biggishness
+biggity
+biggonet
+Biggs
+biggy
+bigha
+big-handed
+bighead
+big-headed
+bigheaded
+bigheads
+big-hearted
+bighearted
+bigheartedly
+bigheartedness
+big-hoofed
+Bighorn
+bighorn
+Bighorns
+bighorns
+bight
+bighted
+bighting
+bights
+big-jawed
+big-laden
+biglandular
+big-league
+big-leaguer
+big-leaved
+biglenoid
+Bigler
+big-looking
+biglot
+bigly
+bigmitt
+bigmouth
+big-mouthed
+bigmouthed
+bigmouths
+big-name
+Bigner
+bigness
+bignesses
+Bignonia
+bignonia
+Bignoniaceae
+bignoniaceous
+bignoniad
+bignonias
+big-nosed
+big-note
+bignou
+Bigod
+bigoniac
+bigonial
+Bigot
+bigot
+bigoted
+bigotedly
+bigotedness
+bigothero
+bigotish
+bigotries
+bigotry
+bigots
+bigotty
+bigram
+big-rich
+bigroot
+big-souled
+big-sounding
+big-swollen
+Bigtha
+bigthatch
+big-ticket
+big-time
+big-timer
+biguanide
+biguttate
+biguttulate
+bi-guy
+big-voiced
+big-waisted
+bigwig
+bigwigged
+bigwiggedness
+bigwiggery
+bigwiggism
+bigwigs
+Bihai
+bihalve
+Biham
+bihamate
+Bihar
+Bihari
+bihari
+biharmonic
+bihourly
+bihydrazine
+Bihzad
+bi-iliac
+bi-ischiadic
+bi-ischiatic
+Biisk
+bija
+Bijapur
+bijasal
+bijection
+bijections
+bijective
+bijectively
+bijou
+bijous
+bijouterie
+bijoux
+bijugate
+bijugous
+bijugular
+bijwoner
+Bik
+Bikales
+Bikaner
+bike
+biked
+biker
+bikers
+bikes
+bikeway
+bikeways
+bikh
+bikhaconitine
+bikie
+bikies
+Bikila
+biking
+Bikini
+bikini
+bikinied
+bikinis
+bikkurim
+Bikol
+Bikols
+Bikram
+Bikukulla
+Bil
+Bilaan
+bilabe
+bilabial
+bilabials
+bilabiate
+Bilac
+bilaciniate
+bilalo
+bilamellar
+bilamellate
+bilamellated
+bilaminar
+bilaminate
+bilaminated
+biland
+bilander
+bilanders
+bilateral
+bilateralism
+bilateralistic
+bilateralities
+bilaterality
+bilaterally
+bilateralness
+Bilati
+bilayer
+bilayers
+Bilbao
+Bilbe
+bilberries
+bilberry
+bilbi
+bilbie
+bilbies
+bilbo
+bilboa
+bilboas
+bilboes
+bilboquet
+bilbos
+bilby
+bilch
+bilcock
+Bildad
+bildar
+bilder
+bilders
+Bildungsroman
+bile
+bilection
+Bilek
+bilertinned
+Biles
+biles
+bilestone
+bileve
+bilewhit
+bilge
+bilged
+bilge-hoop
+bilge-keel
+bilges
+bilge-water
+bilgewater
+bilgeway
+bilgier
+bilgiest
+bilging
+bilgy
+Bilhah
+Bilharzia
+bilharzia
+bilharzial
+bilharziasis
+bilharzic
+bilharziosis
+Bili
+bili-
+bilianic
+biliary
+biliate
+biliation
+bilic
+Bilicki
+bilicyanin
+bilifaction
+biliferous
+bilification
+bilifuscin
+bilify
+bilihumin
+bilimbi
+bilimbing
+bilimbis
+biliment
+Bilin
+bilinear
+bilineate
+bilineated
+bilingual
+bilingualism
+bilinguality
+bilingually
+bilinguar
+bilinguist
+bilinigrin
+bilinite
+bilio
+bilious
+biliously
+biliousness
+biliousnesses
+biliprasin
+bilipurpurin
+bilipyrrhin
+bilirubin
+bilirubinemia
+bilirubinic
+bilirubinuria
+biliteral
+biliteralism
+bilith
+bilithon
+biliverdic
+biliverdin
+bilixanthin
+bilk
+bilked
+bilker
+bilkers
+bilking
+bilkis
+bilks
+Bill
+bill
+billa
+billable
+billabong
+billage
+bill-and-cooers
+billard
+Billat
+billback
+billbeetle
+Billbergia
+billbergia
+billboard
+billboards
+bill-broker
+billbroking
+billbug
+billbugs
+Bille
+billed
+Billen
+biller
+Billerica
+billers
+billet
+billet-doux
+billete
+billeted
+billeter
+billeters
+billethead
+billeting
+billets
+billets-doux
+billette
+billetty
+billetwood
+billety
+billfish
+billfishes
+billfold
+billfolds
+billhead
+billheading
+billheads
+billholder
+bill-hook
+billhook
+billhooks
+Billi
+billian
+billiard
+billiardist
+billiardly
+billiards
+Billie
+billie
+billies
+Billiken
+billikin
+billing
+Billings
+billings
+Billingsgate
+billingsgate
+Billingsley
+billion
+billionaire
+billionaires
+billionism
+billions
+billionth
+billionths
+Billiton
+billitonite
+Billjim
+bill-like
+billman
+billmen
+Billmyre
+billon
+billons
+billot
+billow
+billowed
+billowier
+billowiest
+billowiness
+billowing
+Billows
+billows
+billowy
+bill-patched
+billposter
+billposting
+Billroth
+Bills
+bills
+bill-shaped
+billsticker
+billsticking
+billtong
+Billy
+billy
+billyboy
+billy-button
+billycan
+billycans
+billycock
+Billye
+billyer
+billy-goat
+billyhood
+billyo
+billywix
+bilo
+bilobate
+bilobated
+bilobe
+bilobed
+bilobiate
+bilobular
+bilocation
+bilocellate
+bilocular
+biloculate
+Biloculina
+biloculine
+bilophodont
+biloquist
+bilos
+Bilow
+Biloxi
+bilsh
+Bilski
+Bilskirnir
+bilsted
+bilsteds
+Biltmore
+biltong
+biltongs
+biltongue
+BIM
+Bim
+bim
+BIMA
+bima
+bimaculate
+bimaculated
+bimah
+bimahs
+bimalar
+Bimana
+bimana
+bimanal
+bimane
+bimanous
+bimanual
+bimanually
+bimarginate
+bimarine
+bimas
+bimastic
+bimastism
+bimastoid
+bimasty
+bimaxillary
+bimbashi
+bimbil
+Bimbisara
+Bimble
+bimbo
+bimboes
+bimbos
+bimeby
+bimedial
+bimensal
+bimester
+bimesters
+bimestrial
+bimetal
+bimetalic
+bimetalism
+bimetallic
+bimetallism
+bimetallist
+bimetallistic
+bimetallists
+bimetals
+bimethyl
+bimethyls
+bimillenary
+bimillenial
+bimillenium
+bimillennia
+bimillennium
+bimillenniums
+bimillionaire
+bimilllennia
+Bimini
+Biminis
+Bimmeler
+bimodal
+bimodality
+bimodule
+bimodulus
+bimolecular
+bimolecularly
+bimong
+bimonthlies
+bimonthly
+bimorph
+bimorphemic
+bimorphs
+bimotor
+bimotored
+bimotors
+bimucronate
+bimuscular
+bin
+bin-
+Bina
+Binah
+binal
+Binalonen
+binaphthyl
+binapthyl
+binaries
+binarium
+binary
+binate
+binately
+bination
+binational
+binationalism
+binationalisms
+binaural
+binaurally
+binauricular
+binbashi
+bin-burn
+Binchois
+BIND
+bind
+bindable
+bind-days
+BIndEd
+binder
+binderies
+binders
+bindery
+bindheimite
+bindi
+bindi-eye
+binding
+bindingly
+bindingness
+bindings
+bindis
+bindle
+bindles
+bindlet
+Bindman
+bindoree
+binds
+bindweb
+bindweed
+bindweeds
+bindwith
+bindwood
+bine
+binervate
+bines
+Binet
+Binetta
+Binette
+bineweed
+Binford
+binful
+Bing
+bing
+binge
+binged
+bingee
+bingeing
+Bingen
+Binger
+binges
+bingey
+bingeys
+Bingham
+Binghamton
+binghi
+bingies
+binging
+bingle
+bingo
+bingos
+bingy
+binh
+Binhdinh
+Bini
+biniodide
+biniou
+binit
+Binitarian
+Binitarianism
+binits
+Bink
+bink
+Binky
+binman
+binmen
+binna
+binnacle
+binnacles
+binned
+Binni
+Binnie
+binning
+Binnings
+binnite
+binnogue
+Binny
+binny
+bino
+binocle
+binocles
+binocs
+binocular
+binocularity
+binocularly
+binoculars
+binoculate
+binodal
+binode
+binodose
+binodous
+binomen
+binomenclature
+binomial
+binomialism
+binomially
+binomials
+binominal
+binominated
+binominous
+binomy
+binormal
+binotic
+binotonous
+binous
+binoxalate
+binoxide
+bins
+bint
+bintangor
+bints
+binturong
+binuclear
+binucleate
+binucleated
+binucleolate
+binukau
+Binyon
+Binzuru
+bio
+bio-
+bioaccumulation
+bioacoustics
+bioactivities
+bioactivity
+bio-aeration
+bio-assay
+bioassay
+bioassayed
+bioassaying
+bioassays
+bioastronautical
+bioastronautics
+bioavailability
+biobibliographer
+biobibliographic
+biobibliographical
+biobibliographies
+biobibliography
+bioblast
+bioblastic
+BIOC
+biocatalyst
+biocatalytic
+biocellate
+biocenology
+biocenosis
+biocenotic
+biocentric
+biochemic
+biochemical
+biochemically
+biochemicals
+biochemics
+biochemist
+biochemistries
+biochemistry
+biochemists
+biochemy
+biochore
+biochron
+biocidal
+biocide
+biocides
+bioclean
+bioclimatic
+bioclimatician
+bioclimatological
+bioclimatologically
+bioclimatologies
+bioclimatologist
+bioclimatology
+biocoenose
+biocoenoses
+biocoenosis
+biocoenotic
+biocontrol
+biocycle
+biocycles
+biod
+biodegradabilities
+biodegradability
+biodegradable
+biodegradation
+biodegradations
+biodegrade
+biodegraded
+biodegrades
+biodegrading
+biodynamic
+biodynamical
+biodynamics
+biodyne
+bioecologic
+bioecological
+bioecologically
+bioecologies
+bioecologist
+bioecology
+bio-economic
+bio-electric
+bioelectric
+bioelectrical
+bioelectricities
+bioelectricity
+bio-electrogenesis
+bioelectrogenesis
+bioelectrogenetic
+bioelectrogenetically
+bioelectronics
+bio-energetics
+bioenergetics
+bioengineering
+bioenvironmental
+bioenvironmentaly
+bioethic
+bioethics
+biofeedback
+bioflavinoid
+bioflavonoid
+biofog
+biog
+biog.
+biogas
+biogases
+biogasses
+biogen
+biogenase
+biogenesis
+biogenesist
+biogenetic
+biogenetical
+biogenetically
+biogenetics
+biogenic
+biogenies
+biogenous
+biogens
+biogeny
+biogeochemical
+biogeochemistry
+biogeographer
+biogeographers
+biogeographic
+biogeographical
+biogeographically
+biogeography
+biognosis
+biograph
+biographee
+biographer
+biographers
+biographic
+biographical
+biographically
+biographies
+biographist
+biographize
+biography
+biohazard
+bioherm
+bioherms
+bioinstrument
+bioinstrumentation
+biokinetics
+biol
+biol.
+Biola
+biolinguistics
+biolite
+biolith
+biologese
+biologic
+biological
+biologically
+biologicohumanistic
+biologics
+biologies
+biologism
+biologist
+biologistic
+biologists
+biologize
+biology
+bioluminescence
+bioluminescent
+biolyses
+biolysis
+biolytic
+biomagnetic
+biomagnetism
+biomass
+biomasses
+biomaterial
+biomathematics
+biome
+biomechanical
+biomechanics
+biomedical
+biomedicine
+biomes
+biometeorology
+biometer
+biometric
+biometrical
+biometrically
+biometrician
+biometricist
+biometrics
+biometries
+Biometrika
+biometrist
+biometry
+biomicroscope
+biomicroscopies
+biomicroscopy
+biomorphic
+Bion
+bion
+bionditional
+Biondo
+bionergy
+bionic
+bionics
+bionomic
+bionomical
+bionomically
+bionomics
+bionomies
+bionomist
+bionomy
+biont
+biontic
+bionts
+bio-osmosis
+bio-osmotic
+biophagism
+biophagous
+biophagy
+biophilous
+biophor
+biophore
+biophotometer
+biophotophone
+biophysic
+biophysical
+biophysically
+biophysicist
+biophysicists
+biophysicochemical
+biophysics
+biophysiography
+biophysiological
+biophysiologist
+biophysiology
+biophyte
+biopic
+bioplasm
+bioplasmic
+bioplasms
+bioplast
+bioplastic
+biopoesis
+biopoiesis
+biopotential
+bioprecipitation
+biopsic
+biopsies
+biopsy
+biopsychic
+biopsychical
+biopsychological
+biopsychologies
+biopsychologist
+biopsychology
+bioptic
+biopyribole
+bioral
+biorbital
+biordinal
+bioreaction
+bioresearch
+biorgan
+biorhythm
+biorhythmic
+biorhythmicities
+biorhythmicity
+biorythmic
+BIOS
+bios
+Biosatellite
+biosatellite
+biosatellites
+bioscience
+biosciences
+bioscientific
+bioscientist
+bioscope
+bioscopes
+bioscopic
+bioscopies
+bioscopy
+biose
+biosensor
+bioseston
+-biosis
+biosis
+biosocial
+biosociological
+biosociology
+biosome
+biospeleology
+biosphere
+biospheres
+biostatic
+biostatical
+biostatics
+biostatistic
+biostatistics
+biosterin
+biosterol
+biostratigraphy
+biostrome
+biosyntheses
+biosynthesis
+biosynthesize
+biosynthetic
+biosynthetically
+biosystematic
+biosystematics
+biosystematist
+biosystematy
+Biot
+Biota
+biota
+biotas
+biotaxy
+biotech
+biotechnics
+biotechnological
+biotechnologically
+biotechnologicaly
+biotechnologies
+biotechnology
+biotechs
+biotelemetric
+biotelemetries
+biotelemetry
+biotherapy
+-biotic
+biotic
+biotical
+biotically
+biotics
+biotin
+biotins
+biotite
+biotites
+biotitic
+biotome
+biotomy
+biotope
+biotopes
+biotoxin
+biotoxins
+biotransformation
+biotron
+biotrons
+biotype
+biotypes
+biotypic
+biotypology
+biovular
+biovulate
+bioxalate
+bioxide
+biozone
+bipack
+bipacks
+bipaleolate
+Bipaliidae
+Bipalium
+bipalmate
+biparasitic
+biparental
+biparentally
+biparietal
+biparous
+biparted
+bipartible
+bipartient
+bipartile
+bipartisan
+bipartisanism
+bipartisanship
+bipartite
+bipartitely
+bipartition
+bipartizan
+biparty
+bipaschal
+bipectinate
+bipectinated
+biped
+bipedal
+bipedality
+bipedism
+bipeds
+bipeltate
+bipennate
+bipennated
+bipenniform
+biperforate
+bipersonal
+bipetalous
+biphase
+biphasic
+biphenol
+biphenyl
+biphenylene
+biphenyls
+bipinnaria
+bipinnariae
+bipinnarias
+bipinnate
+bipinnated
+bipinnately
+bipinnatifid
+bipinnatiparted
+bipinnatipartite
+bipinnatisect
+bipinnatisected
+biplace
+biplanal
+biplanar
+biplane
+biplanes
+biplicate
+biplicity
+biplosion
+biplosive
+bipod
+bipods
+bipolar
+bipolarity
+bipolarization
+bipolarize
+Bipont
+bipont
+Bipontine
+biporose
+biporous
+bipotentialities
+bipotentiality
+Bippus
+biprism
+biprong
+bipropellant
+bipunctal
+bipunctate
+bipunctual
+bipupillate
+bipyramid
+bipyramidal
+bipyridine
+bipyridyl
+biquadrantal
+biquadrate
+biquadratic
+biquarterly
+biquartz
+biquintile
+biracial
+biracialism
+biracially
+biradial
+biradiate
+biradiated
+biramose
+biramous
+birational
+Birch
+birch
+Birchard
+birchbark
+Birchdale
+birched
+birchen
+Bircher
+bircher
+birchers
+Birches
+birches
+birching
+Birchism
+birchism
+Birchite
+Birchleaf
+birchman
+Birchrunville
+Birchtree
+Birchwood
+birchwood
+Birck
+Bird
+bird
+birdbander
+birdbanding
+birdbath
+birdbaths
+bird-batting
+birdberry
+birdbrain
+bird-brained
+birdbrained
+birdbrains
+bird-cage
+birdcage
+birdcages
+birdcall
+birdcalls
+birdcatcher
+birdcatching
+birdclapper
+birdcraft
+bird-dog
+bird-dogged
+bird-dogging
+birddom
+birde
+birded
+birdeen
+Birdell
+Birdella
+birder
+birders
+Birdeye
+birdeye
+bird-eyed
+bird-faced
+birdfarm
+birdfarms
+bird-fingered
+bird-foot
+bird-foots
+birdglue
+birdhood
+birdhouse
+birdhouses
+Birdie
+birdie
+birdieback
+birdied
+birdieing
+birdies
+birdikin
+birding
+birdings
+Birdinhand
+bird-in-the-bush
+birdland
+birdless
+birdlet
+birdlife
+birdlike
+bird-lime
+birdlime
+birdlimed
+birdlimes
+birdliming
+birdling
+birdlore
+birdman
+birdmen
+birdmouthed
+bird-nest
+birdnest
+birdnester
+bird-nesting
+bird-ridden
+Birds
+birds
+birdsall
+Birdsboro
+birdseed
+birdseeds
+Birdseye
+bird's-eye
+birdseye
+bird's-eyes
+birdseyes
+bird's-foot
+bird's-foots
+birdshot
+birdshots
+birds-in-the-bush
+bird's-nest
+birdsnest
+birdsong
+birdstone
+Birdt
+bird-watch
+birdwatch
+bird-watcher
+birdweed
+birdwise
+bird-witted
+birdwitted
+birdwoman
+birdwomen
+birdy
+birdyback
+Birecree
+birectangular
+birefracting
+birefraction
+birefractive
+birefringence
+birefringent
+bireme
+biremes
+biretta
+birettas
+birgand
+Birgit
+Birgitta
+Birgus
+biri
+biriani
+biriba
+birimose
+Birk
+birk
+Birkbeck
+birken
+Birkenhead
+Birkenia
+Birkeniidae
+Birkett
+Birkhoff
+birkie
+birkies
+Birkle
+Birkner
+birkremite
+birks
+birky
+birl
+birle
+birled
+birler
+birlers
+birles
+birlie
+birlieman
+birling
+birlings
+birlinn
+birls
+birma
+Birmingham
+birmingham
+Birminghamize
+birn
+Birnamwood
+birne
+Birney
+birny
+Biro
+Birobidzhan
+Birobijan
+Birobizhan
+birodo
+Birome
+Biron
+birostrate
+birostrated
+birota
+birotation
+birotatory
+birr
+birred
+Birrell
+birretta
+birrettas
+birri
+birring
+birrotch
+birrs
+birrus
+birse
+birses
+birsit
+birsle
+birsy
+Birt
+birt
+birth
+birthbed
+birthdate
+birthdates
+birthday
+birthdays
+birthdom
+birthed
+birthing
+birthland
+birthless
+birthmark
+birthmarks
+birthmate
+birthnight
+birthplace
+birthplaces
+birthrate
+birthrates
+birthright
+birthrights
+birthroot
+births
+birthstone
+birthstones
+birthstool
+birthwort
+birthy
+Birtwhistle
+Birzai
+BIS
+bis
+bis-
+bisabol
+bisaccate
+bisacromial
+bisagre
+bisalt
+Bisaltae
+bisannual
+bisantler
+bisaxillary
+Bisayan
+bisayan
+Bisayans
+Bisayas
+Bisbee
+bisbeeite
+biscacha
+Biscanism
+Biscay
+Biscayan
+biscayan
+Biscayanism
+biscayen
+Biscayner
+bischofite
+Biscoe
+biscot
+biscotin
+biscuit
+biscuit-brained
+biscuit-colored
+biscuit-fired
+biscuiting
+biscuitlike
+biscuitmaker
+biscuitmaking
+biscuitroot
+biscuitry
+biscuits
+biscuit-shaped
+biscutate
+bisdiapason
+bisdimethylamino
+BISDN
+bise
+bisect
+bisected
+bisecting
+bisection
+bisectional
+bisectionally
+bisections
+bisector
+bisectors
+bisectrices
+bisectrix
+bisects
+bisegment
+bisellia
+bisellium
+biseptate
+biserial
+biserially
+biseriate
+biseriately
+biserrate
+bises
+biset
+bisetose
+bisetous
+bisexed
+bisext
+bisexual
+bisexualism
+bisexuality
+bisexually
+bisexuals
+bisexuous
+bisglyoxaline
+Bish
+bish
+Bishareen
+Bishari
+Bisharin
+Bishop
+bishop
+bishopbird
+bishopdom
+bishoped
+bishopess
+bishopful
+bishophood
+bishoping
+bishopless
+bishoplet
+bishoplike
+bishopling
+bishopric
+bishoprics
+bishops
+bishop's-cap
+bishopscap
+bishopship
+bishopstool
+bishop's-weed
+Bishopville
+bishopweed
+bishydroxycoumarin
+bisie
+bisiliac
+bisilicate
+bisiliquous
+bisimine
+bisinuate
+bisinuation
+bisischiadic
+bisischiatic
+Bisitun
+Bisk
+bisk
+biskop
+Biskra
+bisks
+Bisley
+bislings
+bismanol
+bismar
+Bismarck
+bismarck
+Bismarckian
+Bismarckianism
+bismarine
+Bismark
+bismark
+bisme
+bismer
+bismerpund
+bismethyl
+bismillah
+bismite
+Bismosol
+bismuth
+bismuthal
+bismuthate
+bismuthic
+bismuthide
+bismuthiferous
+bismuthine
+bismuthinite
+bismuthite
+bismuthous
+bismuths
+bismuthyl
+bismutite
+bismutoplagionite
+bismutosmaltite
+bismutosphaerite
+bisnaga
+bisnagas
+bisognio
+bison
+bisonant
+bisons
+bisontine
+BISP
+bisphenoid
+bispinose
+bispinous
+bispore
+bisporous
+bisque
+bisques
+bisquette
+bissabol
+Bissau
+Bissell
+bissellia
+Bisset
+bissext
+bissextile
+bissextus
+bisso
+bisson
+bissonata
+bist
+bistable
+bistate
+bistephanic
+bister
+bistered
+bisters
+bistetrazole
+bisti
+bistipular
+bistipulate
+bistipuled
+bistort
+Bistorta
+bistorts
+bistouries
+bistournage
+bistoury
+bistratal
+bistratose
+bistre
+bistred
+bistres
+bistriate
+bistriazole
+bistro
+bistroic
+bistros
+bisubstituted
+bisubstitution
+bisulc
+bisulcate
+bisulcated
+bisulfate
+bisulfid
+bisulfide
+bisulfite
+bisulphate
+bisulphide
+bisulphite
+Bisutun
+bisyllabic
+bisyllabism
+bisymmetric
+bisymmetrical
+bisymmetrically
+bisymmetry
+BISYNC
+bisync
+BIT
+bit
+bitable
+bitake
+bitangent
+bitangential
+bitanhol
+bitartrate
+bitbrace
+Bitburg
+bit-by-bit
+bitch
+bitched
+bitcheries
+bitchery
+bitches
+bitchier
+bitchiest
+bitchily
+bitchiness
+bitching
+bitch-kitty
+bitchy
+bite
+biteable
+biteche
+bited
+biteless
+Bitely
+bitemporal
+bitentaculate
+biter
+biternate
+biternately
+biters
+bites
+bite-sheep
+bitesheep
+bite-tongue
+bitewing
+bitewings
+bitheism
+Bithia
+Bithynia
+Bithynian
+biti
+biting
+bitingly
+bitingness
+Bitis
+bitless
+bitmap
+bitmapped
+BITNET
+bitnet
+bito
+Bitolj
+bitolyl
+Biton
+bitonal
+bitonalities
+bitonality
+bitore
+bitreadle
+bi-tri-
+bitripartite
+bitripinnatifid
+bitriseptate
+bitrochanteric
+BITS
+bits
+bitser
+bitstalk
+bitstock
+bitstocks
+bitstone
+bitsy
+bitt
+bittacle
+bitte
+bitted
+bitten
+Bittencourt
+bitter
+bitter-
+bitterbark
+bitter-biting
+bitterblain
+bitterbloom
+bitterbrush
+bitterbump
+bitterbur
+bitterbush
+bittered
+bitter-end
+bitter-ender
+bitterender
+bitter-enderism
+bitter-endism
+bitterer
+bitterest
+bitterful
+bitterhead
+bitterhearted
+bitterheartedness
+bittering
+bitterish
+bitterishness
+bitterless
+bitterling
+bitterly
+bittern
+bitterness
+bitternesses
+bitterns
+bitternut
+bitter-rinded
+bitterroot
+bitters
+bitter-sweet
+bittersweet
+bitter-sweeting
+bittersweetly
+bittersweetness
+bittersweets
+bitter-tasting
+bitter-tongued
+bitterweed
+bitterwood
+bitterworm
+bitterwort
+bitthead
+Bitthia
+bittie
+bittier
+bittiest
+bitting
+Bittinger
+bittings
+Bittium
+Bittner
+Bitto
+bittock
+bittocks
+bittor
+bitts
+bitty
+bitubercular
+bituberculate
+bituberculated
+Bitulithic
+bitulithic
+bitume
+bitumed
+bitumen
+bitumens
+bituminate
+bituminiferous
+bituminisation
+bituminise
+bituminised
+bituminising
+bituminization
+bituminize
+bituminized
+bituminizing
+bituminoid
+bituminosis
+bituminous
+bit-wise
+bitwise
+bityite
+bitypic
+BIU
+biune
+biunial
+biunique
+biuniquely
+biuniqueness
+biunity
+biunivocal
+biurate
+biurea
+biuret
+bivalence
+bivalencies
+bivalency
+bivalent
+bivalents
+bivalve
+bivalved
+bivalves
+Bivalvia
+bivalvian
+bivalvous
+bivalvular
+bivane
+bivariant
+bivariate
+bivascular
+bivaulted
+bivector
+biventer
+biventral
+biverb
+biverbal
+bivial
+Bivins
+bivinyl
+bivinyls
+bivious
+bivittate
+bivium
+bivocal
+bivocalized
+bivoltine
+bivoluminous
+bivouac
+bivouaced
+bivouacked
+bivouacking
+bivouacks
+bivouacs
+bivvy
+biw-
+biwa
+Biwabik
+biweeklies
+biweekly
+biwinter
+BIX
+Bixa
+bixa
+Bixaceae
+bixaceous
+Bixby
+bixbyite
+bixin
+Bixler
+biyearly
+Biysk
+biz
+bizant
+bizardite
+bizarre
+bizarrely
+bizarreness
+bizarrerie
+bizarres
+bizcacha
+bize
+bizel
+Bizen
+Bizerta
+Bizerte
+bizes
+Bizet
+bizet
+biznaga
+biznagas
+bizonal
+bizone
+bizones
+Bizonia
+Biztha
+bizygomatic
+bizz
+bizzarro
+Bjart
+Bjneborg
+Bjoerling
+Bjork
+Bjorn
+Bjornson
+Bk
+bk
+bk.
+bkbndr
+bkcy
+bkcy.
+bkg
+bkg.
+bkgd
+bklr
+bkpr
+bkpt
+bks
+bks.
+bkt
+B.L.
+B/L
+BL
+b/l
+bl
+bl.
+BLA
+blaasop
+blab
+blabbed
+blabber
+blabbered
+blabberer
+blabbering
+blabbermouth
+blabbermouths
+blabbers
+blabbing
+blabby
+blabmouth
+blabs
+Blacher
+Blachly
+blachong
+Black
+black
+blackacre
+blackamoor
+blackamoors
+black-and-blue
+black-and-tan
+black-and-white
+black-aproned
+blackarm
+black-a-viced
+black-a-visaged
+black-a-vised
+blackback
+black-backed
+black-ball
+blackball
+blackballed
+blackballer
+blackballing
+blackballs
+blackband
+black-banded
+Blackbeard
+black-bearded
+blackbeetle
+black-bellied
+blackbelly
+black-belt
+black-berried
+blackberries
+blackberry
+blackberrylike
+black-billed
+blackbine
+blackbird
+blackbirder
+blackbirding
+blackbirds
+black-blooded
+black-blue
+blackboard
+blackboards
+black-bodied
+black-boding
+blackbody
+black-bordered
+black-boughed
+blackboy
+blackboys
+blackbreast
+black-breasted
+black-browed
+black-brown
+blackbrush
+blackbuck
+Blackburn
+blackbush
+blackbutt
+blackcap
+black-capped
+blackcaps
+black-chinned
+black-clad
+blackcoat
+black-coated
+blackcock
+blackcod
+blackcods
+black-colored
+black-cornered
+black-crested
+black-crowned
+blackcurrant
+blackdamp
+Blackduck
+black-eared
+black-ears
+blacked
+black-edged
+blacken
+blackened
+blackener
+blackeners
+blackening
+blackens
+blacker
+blackest
+blacketeer
+Blackett
+Blackey
+blackey
+blackeye
+black-eyed
+blackeyes
+blackface
+black-faced
+black-favored
+black-feathered
+Blackfeet
+blackfeet
+blackfellow
+blackfellows
+black-figure
+black-figured
+blackfigured
+blackfin
+blackfins
+blackfire
+blackfish
+blackfisher
+blackfishes
+blackfishing
+blackflies
+blackfly
+Blackfoot
+blackfoot
+black-footed
+Blackford
+Blackfriars
+black-fruited
+black-gowned
+blackguard
+blackguardism
+blackguardize
+blackguardly
+blackguardry
+blackguards
+blackgum
+blackgums
+black-hafted
+black-haired
+Blackhander
+blackhander
+Blackhawk
+black-head
+blackhead
+black-headed
+blackheads
+blackheart
+black-hearted
+blackhearted
+blackheartedly
+blackheartedness
+black-hilted
+black-hole
+black-hooded
+black-hoofed
+blackie
+blackies
+blacking
+blackings
+Blackington
+blackish
+blackishly
+blackishness
+blackit
+blackjack
+blackjacked
+blackjacking
+blackjacks
+blackland
+blacklead
+black-leg
+blackleg
+black-legged
+blacklegged
+blackleggery
+blacklegging
+blacklegism
+blacklegs
+black-letter
+Blacklick
+black-lidded
+blacklight
+black-lipped
+blacklist
+blacklisted
+blacklister
+blacklisting
+blacklists
+black-locked
+black-looking
+blackly
+blackmail
+blackmailed
+blackmailer
+blackmailers
+blackmailing
+blackmails
+Blackman
+blackman
+black-maned
+black-margined
+black-market
+black-marketeer
+Blackmore
+black-mouth
+black-mouthed
+Blackmun
+Blackmur
+black-neb
+blackneb
+blackneck
+black-necked
+blackness
+blacknesses
+blacknob
+black-nosed
+black-out
+blackout
+blackouts
+blackpatch
+black-peopled
+blackplate
+black-plumed
+blackpoll
+Blackpool
+black-pot
+blackpot
+blackprint
+blackrag
+black-red
+black-robed
+blackroot
+black-rooted
+blacks
+black-sander
+Blacksburg
+blackseed
+Blackshear
+Blackshirt
+blackshirt
+blackshirted
+black-shouldered
+black-skinned
+blacksmith
+blacksmithing
+blacksmiths
+black-snake
+blacksnake
+black-spotted
+blackstick
+Blackstock
+black-stoled
+Blackstone
+blackstrap
+Blacksville
+black-tail
+blacktail
+black-tailed
+black-thorn
+blackthorn
+blackthorns
+black-throated
+black-tie
+black-toed
+blacktongue
+black-tongued
+blacktop
+blacktopped
+blacktopping
+blacktops
+blacktree
+black-tressed
+black-tufted
+black-veiled
+Blackville
+black-visaged
+blackware
+black-wash
+blackwash
+blackwasher
+blackwashing
+Blackwater
+blackwater
+blackweed
+Blackwell
+black-whiskered
+Blackwood
+black-wood
+blackwood
+blackwork
+blackwort
+blacky
+blad
+bladder
+bladderet
+bladderless
+bladderlike
+bladdernose
+bladdernut
+bladderpod
+bladders
+bladderseed
+bladderweed
+bladderwort
+bladderwrack
+bladdery
+blade
+bladebone
+bladed
+bladeless
+bladelet
+bladelike
+Bladen
+Bladenboro
+Bladensburg
+blade-point
+Blader
+blader
+blades
+bladesmith
+bladewise
+blading
+bladish
+Bladon
+blady
+bladygrass
+blae
+blaeberries
+blaeberry
+blaeness
+Blaeu
+Blaeuw
+Blaew
+blaewort
+blaff
+blaffert
+blaflum
+Blagg
+blaggard
+Blagonravov
+Blagoveshchensk
+blague
+blagueur
+blah
+blah-blah
+blahlaut
+blahs
+Blain
+blain
+Blaine
+Blainey
+blains
+Blair
+blair
+Blaire
+blairmorite
+Blairs
+Blairsburg
+Blairsden
+Blairstown
+Blairsville
+Blaisdell
+Blaise
+Blake
+blake
+blakeberyed
+blakeite
+Blakelee
+Blakeley
+Blakely
+Blakemore
+Blakesburg
+Blakeslee
+Blalock
+blam
+blamability
+blamable
+blamableness
+blamably
+blame
+blameable
+blameableness
+blameably
+blamed
+blameful
+blamefully
+blamefulness
+blameless
+blamelessly
+blamelessness
+blamer
+blamers
+blames
+blame-shifting
+blameworthiness
+blameworthinesses
+blameworthy
+Blamey
+blaming
+blamingly
+blams
+blan
+Blanc
+blanc
+Blanca
+blanca
+Blancanus
+blancard
+Blanch
+blanch
+Blancha
+Blanchard
+Blanchardville
+Blanche
+blanche
+blanched
+blancher
+blanchers
+blanches
+Blanchester
+Blanchette
+blanchi
+blanchimeter
+blanching
+blanchingly
+Blanchinus
+blancmange
+blancmanger
+blancmanges
+Blanco
+blanco
+blancs
+Bland
+bland
+blanda
+BLandArch
+blandation
+Blandburg
+blander
+blandest
+Blandford
+Blandfordia
+blandiloquence
+blandiloquious
+blandiloquous
+Blandina
+Blanding
+Blandinsville
+blandish
+blandished
+blandisher
+blandishers
+blandishes
+blandishing
+blandishingly
+blandishment
+blandishments
+blandly
+blandness
+blandnesses
+Blandon
+Blandville
+Blandy-les-Tours
+Blane
+Blanford
+Blank
+blank
+Blanka
+blankard
+blankbook
+blanked
+blankeel
+Blankenship
+blanker
+blankest
+blanket
+blanketed
+blanketeer
+blanketer
+blanketers
+blanket-flower
+blanketflower
+blanketing
+blanketless
+blanketlike
+blanketmaker
+blanketmaking
+blanketry
+blankets
+blanket-stitch
+blanketweed
+blankety
+blankety-blank
+blank-eyed
+blanking
+blankish
+Blankit
+blankite
+blank-looking
+blankly
+blank-minded
+blankminded
+blankmindedness
+blankness
+blanknesses
+Blanks
+blanks
+blanky
+blanque
+blanquette
+blanquillo
+blanquillos
+Blantyre
+Blantyre-Limbe
+blaoner
+blaoners
+blare
+blared
+blares
+Blarina
+blarina
+blaring
+blarney
+blarneyed
+blarneyer
+blarneying
+blarneys
+blarnid
+blarny
+blart
+BLAS
+Blas
+blas
+Blasdell
+Blase
+blase
+Blaseio
+blaseness
+blash
+blashy
+Blasia
+Blasien
+Blasius
+blason
+blaspheme
+blasphemed
+blasphemer
+blasphemers
+blasphemes
+blasphemies
+blaspheming
+blasphemous
+blasphemously
+blasphemousness
+blasphemy
+-blast
+BLAST
+blast
+blast-
+blastaea
+blast-borne
+blasted
+blastema
+blastemal
+blastemas
+blastemata
+blastematic
+blastemic
+blaster
+blasters
+blast-freeze
+blast-freezing
+blast-frozen
+blastful
+blast-furnace
+blasthole
+-blastic
+blastid
+blastide
+blastie
+blastier
+blasties
+blastiest
+blasting
+blastings
+blastman
+blastment
+blasto-
+blastocarpous
+blastocele
+blastocheme
+blastochyle
+blastocoel
+blastocoele
+blastocoelic
+blastocolla
+blastocyst
+blastocyte
+blastoderm
+blastodermatic
+blastodermic
+blastodisc
+blastodisk
+blast-off
+blastoff
+blastoffs
+blastogenesis
+blastogenetic
+blastogenic
+blastogeny
+blastogranitic
+blastoid
+Blastoidea
+blastoma
+blastomas
+blastomata
+blastomere
+blastomeric
+Blastomyces
+blastomycete
+Blastomycetes
+blastomycetic
+blastomycetous
+blastomycin
+blastomycosis
+blastomycotic
+blastoneuropore
+Blastophaga
+blastophitic
+blastophoral
+blastophore
+blastophoric
+blastophthoria
+blastophthoric
+blastophyllum
+blastoporal
+blastopore
+blastoporic
+blastoporphyritic
+blastosphere
+blastospheric
+blastostylar
+blastostyle
+blastozooid
+blastplate
+blasts
+blastula
+blastulae
+blastular
+blastulas
+blastulation
+blastule
+blasty
+blat
+blatancies
+blatancy
+blatant
+blatantly
+blatch
+blatchang
+blate
+blately
+blateness
+blateration
+blateroon
+blather
+blathered
+blatherer
+blathering
+blathers
+blatherskite
+blatherskites
+blathery
+blatiform
+blatjang
+Blatman
+blats
+Blatt
+Blatta
+blatta
+Blattariae
+blatted
+blatter
+blattered
+blatterer
+blattering
+blatters
+blatti
+blattid
+Blattidae
+blattiform
+blatting
+Blattodea
+blattoid
+Blattoidea
+Blatz
+Blau
+blaubok
+blauboks
+Blaugas
+blaunner
+blautok
+Blauvelt
+blauwbok
+Blavatsky
+blaver
+blaw
+blawed
+Blawenburg
+blawing
+blawn
+blawort
+blaws
+blay
+Blaydon
+blayk
+Blayne
+Blayze
+Blaze
+blaze
+blazed
+blazer
+blazers
+blazes
+blazing
+blazingly
+blazon
+blazoned
+blazoner
+blazoners
+blazoning
+blazonment
+blazonries
+blazonry
+blazons
+blazy
+Blcher
+bld
+bldg
+bldg.
+BldgE
+bldr
+BLDS
+-ble
+BLE
+blea
+bleaberry
+bleach
+bleachability
+bleachable
+bleached
+bleached-blond
+bleacher
+bleacheries
+bleacherite
+bleacherman
+bleachers
+bleachery
+bleaches
+bleachfield
+bleachground
+bleachhouse
+bleaching
+bleachman
+bleachs
+bleachworks
+bleachyard
+bleak
+bleaker
+bleakest
+bleakish
+bleakly
+bleakness
+bleaknesses
+bleaks
+bleaky
+blear
+bleared
+blearedness
+bleareye
+blear-eyed
+bleareyed
+blear-eyedness
+blearier
+bleariest
+blearily
+bleariness
+blearing
+blearness
+blears
+blear-witted
+bleary
+bleary-eyed
+blearyeyedness
+bleat
+bleated
+bleater
+bleaters
+bleating
+bleatingly
+bleats
+bleaty
+bleaunt
+bleb
+blebby
+blebs
+blechnoid
+Blechnum
+bleck
+bled
+Bledsoe
+blee
+bleed
+bleeder
+bleeders
+bleeding
+bleedings
+bleeds
+bleekbok
+Bleeker
+bleep
+bleeped
+bleeping
+bleeps
+bleery
+bleeze
+bleezy
+Bleiblerville
+Bleier
+bleinerite
+blellum
+blellums
+blemish
+blemished
+blemisher
+blemishes
+blemishing
+blemishment
+blemmatrope
+Blemmyes
+Blen
+blench
+blenched
+blencher
+blenchers
+blenches
+blenching
+blenchingly
+Blencoe
+blencorn
+blend
+Blenda
+blendcorn
+blende
+blended
+blender
+blenders
+blendes
+blending
+blendor
+blends
+blendure
+blendwater
+blend-word
+Blenheim
+blenheim
+blenk
+Blenker
+blennadenitis
+blennemesis
+blennenteria
+blennenteritis
+blennies
+blenniid
+Blenniidae
+blenniiform
+Blenniiformes
+blennioid
+Blennioidea
+blenno-
+blennocele
+blennocystitis
+blennoemesis
+blennogenic
+blennogenous
+blennoid
+blennoma
+blennometritis
+blennophlogisma
+blennophlogosis
+blennophobia
+blennophthalmia
+blennoptysis
+blennorhea
+blennorrhagia
+blennorrhagic
+blennorrhea
+blennorrheal
+blennorrhinia
+blennorrhoea
+blennosis
+blennostasis
+blennostatic
+blennothorax
+blennotorrhea
+blennuria
+blenny
+blennymenitis
+blens
+blent
+bleo
+bleomycin
+blephar-
+blephara
+blepharadenitis
+blepharal
+blepharanthracosis
+blepharedema
+blepharelcosis
+blepharemphysema
+Blephariglottis
+blepharism
+blepharitic
+blepharitis
+blepharo-
+blepharoadenitis
+blepharoadenoma
+blepharoatheroma
+blepharoblennorrhea
+blepharocarcinoma
+Blepharocera
+Blepharoceridae
+blepharochalasis
+blepharochromidrosis
+blepharoclonus
+blepharocoloboma
+blepharoconjunctivitis
+blepharodiastasis
+blepharodyschroia
+blepharohematidrosis
+blepharolithiasis
+blepharomelasma
+blepharoncosis
+blepharoncus
+blepharophimosis
+blepharophryplasty
+blepharophthalmia
+blepharophyma
+blepharoplast
+blepharoplastic
+blepharoplasty
+blepharoplegia
+blepharoptosis
+blepharopyorrhea
+blepharorrhaphy
+blepharospasm
+blepharospath
+blepharosphincterectomy
+blepharostat
+blepharostenosis
+blepharosymphysis
+blepharosyndesmitis
+blepharosynechia
+blepharotomy
+blepharydatis
+Blephillia
+BLER
+blere
+Bleriot
+BLERT
+bles-bok
+blesbok
+blesboks
+blesbuck
+blesbucks
+blesmol
+bless
+blesse
+blessed
+blesseder
+blessedest
+blessedly
+blessedness
+blessednesses
+blesser
+blessers
+blesses
+Blessing
+blessing
+blessingly
+blessings
+Blessington
+blest
+blet
+blethe
+blether
+bletheration
+blethered
+blethering
+blethers
+bletherskate
+Bletia
+Bletilla
+bletonism
+blets
+bletted
+bletting
+bleu
+Bleuler
+Blevins
+blew
+blewits
+bleymes
+BLF
+BLFE
+BLI
+bliaut
+blibe
+blick
+blickey
+blickeys
+blickie
+blickies
+blicky
+Blida
+blier
+bliest
+Bligh
+Blighia
+Blight
+blight
+blightbird
+blighted
+blighter
+blighters
+blighties
+blighting
+blightingly
+blights
+Blighty
+blighty
+blijver
+Blim
+blimbing
+blimey
+Blimp
+blimp
+blimpish
+blimpishly
+blimpishness
+blimps
+blimy
+blin
+blind
+blindage
+blindages
+blind-alley
+blindball
+blindcat
+blinded
+blindedly
+blinder
+blinders
+blindest
+blindeyes
+blindfast
+blindfish
+blindfishes
+blindfold
+blindfolded
+blindfoldedly
+blindfoldedness
+blindfolder
+blindfolding
+blindfoldly
+blindfolds
+blind-head
+Blindheim
+blinding
+blindingly
+blindish
+blindism
+blindless
+blindling
+blind-loaded
+blindly
+blindman
+blind-man's-buff
+blind-nail
+blindness
+blindnesses
+blind-nettle
+blind-pigger
+blind-pigging
+blind-punch
+blinds
+blind-stamp
+blind-stamped
+blindstitch
+blindstorey
+blindstories
+blindstory
+blind-tool
+blind-tooled
+blindweed
+blind-worm
+blindworm
+blind-your-eyes
+blinger
+blini
+blinis
+blink
+blinkard
+blinkards
+blinked
+blinker
+blinkered
+blinkering
+blinkers
+blink-eyed
+blinking
+blinkingly
+blinks
+blinky
+Blinn
+Blinni
+Blinnie
+Blinny
+blinter
+blintz
+blintze
+blintzes
+bliny
+blip
+blipped
+blippers
+blipping
+blips
+blirt
+Bliss
+bliss
+Blisse
+blissed
+blisses
+Blissfield
+blissful
+blissfully
+blissfulness
+blissing
+blissless
+blissom
+blist
+blister
+blistered
+blistering
+blisteringly
+blisterous
+blisters
+blisterweed
+blisterwort
+blistery
+BLit
+blit
+blite
+blites
+Blithe
+blithe
+blithebread
+blitheful
+blithefully
+blithehearted
+blithelike
+blithe-looking
+blithely
+blithemeat
+blithen
+blitheness
+blither
+blithered
+blithering
+blithers
+blithesome
+blithesomely
+blithesomeness
+blithest
+B.Litt.
+BLitt
+blitter
+Blitum
+Blitz
+blitz
+blitzbuggy
+blitzed
+blitzes
+blitzing
+blitzkrieg
+blitzkrieged
+blitzkrieging
+blitzkriegs
+Blitzstein
+Blixen
+blizz
+blizzard
+blizzardly
+blizzardous
+blizzards
+blizzardy
+blk
+blk.
+blksize
+BLL
+BLM
+blo
+bloat
+bloated
+bloatedness
+bloater
+bloaters
+bloating
+bloats
+blob
+blobbed
+blobber
+blobber-lipped
+blobbier
+blobbiest
+blobbiness
+blobbing
+blobby
+BLOBS
+blobs
+bloc
+blocage
+Bloch
+Block
+block
+blockade
+blockaded
+blockader
+blockaders
+blockade-runner
+blockade-running
+blockaderunning
+blockades
+blockading
+blockage
+blockages
+blockboard
+block-book
+blockbuster
+blockbusters
+blockbusting
+block-caving
+blocked
+blocked-out
+Blocker
+blocker
+blocker-out
+blockers
+blockhead
+blockheaded
+blockheadedly
+blockheadedness
+blockheadish
+blockheadishness
+blockheadism
+blockheads
+blockhole
+blockholer
+blockhouse
+blockhouses
+blockier
+blockiest
+blockiness
+blocking
+blockish
+blockishly
+blockishness
+blocklayer
+blocklike
+blockline
+blockmaker
+blockmaking
+blockman
+blockout
+blockpate
+block-printed
+blocks
+block-saw
+Blocksburg
+block-serifed
+blockship
+Blockton
+Blockus
+blockwood
+blocky
+blocs
+Blodenwedd
+Blodget
+Blodgett
+blodite
+bloedite
+Bloem
+Bloemfontein
+Blois
+Blok
+blok
+bloke
+blokes
+blolly
+bloman
+Blomberg
+Blomkest
+Blomquist
+blomstrandine
+blond
+blonde
+Blondel
+Blondell
+Blondelle
+blondeness
+blonder
+blondes
+blondest
+blond-haired
+blond-headed
+Blondie
+blondine
+blondish
+blondness
+blonds
+Blondy
+Blood
+blood
+bloodalley
+bloodalp
+blood-and-guts
+blood-and-thunder
+bloodbath
+bloodbeat
+blood-bedabbled
+bloodberry
+blood-bespotted
+blood-besprinkled
+bloodbird
+blood-boltered
+blood-bought
+blood-cemented
+blood-colored
+blood-consuming
+bloodcurdler
+bloodcurdling
+bloodcurdlingly
+blood-defiled
+blood-discolored
+blood-drenched
+blooddrop
+blooddrops
+blood-drunk
+blood-dyed
+blooded
+bloodedness
+blood-extorting
+blood-faced
+blood-filled
+bloodfin
+bloodfins
+blood-fired
+blood-flecked
+bloodflower
+blood-frozen
+bloodguilt
+bloodguiltiness
+bloodguiltless
+blood-guilty
+bloodguilty
+blood-gushing
+blood-heat
+blood-hot
+bloodhound
+bloodhounds
+blood-hued
+bloodied
+bloodier
+bloodies
+bloodiest
+bloodily
+bloodiness
+blooding
+bloodings
+bloodleaf
+bloodless
+bloodlessly
+bloodlessness
+blood-letter
+bloodletter
+blood-letting
+bloodletting
+bloodlettings
+bloodlike
+bloodline
+bloodlines
+blood-loving
+bloodlust
+bloodlusting
+blood-mad
+bloodmobile
+bloodmobiles
+blood-money
+bloodmonger
+bloodnoun
+blood-plashed
+blood-polluted
+blood-polluting
+blood-raw
+blood-red
+bloodred
+blood-relation
+bloodripe
+bloodripeness
+blood-root
+bloodroot
+bloodroots
+bloods
+blood-scrawled
+blood-shaken
+bloodshed
+bloodshedder
+bloodshedding
+bloodsheds
+blood-shot
+bloodshot
+blood-shotten
+bloodshotten
+blood-sized
+blood-spattered
+blood-spavin
+bloodspiller
+bloodspilling
+blood-stain
+bloodstain
+bloodstained
+bloodstainedness
+bloodstains
+bloodstanch
+blood-stirring
+blood-stirringness
+bloodstock
+blood-stone
+bloodstone
+bloodstones
+blood-strange
+bloodstream
+bloodstreams
+bloodstroke
+blood-suck
+bloodsuck
+blood-sucker
+bloodsucker
+bloodsuckers
+bloodsucking
+bloodsuckings
+blood-swelled
+blood-swoln
+bloodtest
+bloodthirst
+bloodthirster
+bloodthirstier
+bloodthirstiest
+bloodthirstily
+bloodthirstiness
+bloodthirstinesses
+bloodthirsting
+bloodthirsty
+blood-tinctured
+blood-type
+blood-vascular
+blood-vessel
+blood-warm
+bloodweed
+bloodwit
+blood-wite
+bloodwite
+blood-won
+bloodwood
+blood-worm
+bloodworm
+blood-wort
+bloodwort
+bloodworthy
+bloody
+bloody-back
+bloody-bones
+bloodybones
+bloody-eyed
+bloody-faced
+bloody-handed
+bloody-hearted
+bloodying
+bloody-minded
+bloody-mindedness
+bloody-mouthed
+bloody-nosed
+bloody-red
+bloody-sceptered
+bloody-veined
+blooey
+blooie
+Bloom
+bloom
+bloomage
+Bloomburg
+bloom-colored
+Bloomdale
+bloomed
+Bloomer
+bloomer
+Bloomeria
+bloomeries
+bloomerism
+bloomers
+Bloomery
+bloomery
+bloom-fell
+bloomfell
+Bloomfield
+Bloomfieldian
+bloomier
+bloomiest
+blooming
+Bloomingburg
+Bloomingdale
+bloomingly
+bloomingness
+Bloomingrose
+Bloomington
+bloomkin
+bloomless
+blooms
+Bloomsburg
+Bloomsburian
+Bloomsbury
+Bloomsdale
+bloom-shearing
+Bloomville
+bloomy
+bloomy-down
+bloop
+blooped
+blooper
+bloopers
+blooping
+bloops
+blooth
+blore
+blosmy
+Blossburg
+Blossom
+blossom
+blossom-bearing
+blossombill
+blossom-billed
+blossom-bordered
+blossom-crested
+blossomed
+blossom-faced
+blossomhead
+blossom-headed
+blossoming
+blossom-laden
+blossomless
+blossom-nosed
+blossomry
+blossoms
+blossomtime
+blossomy
+Blossvale
+blot
+blotch
+blotched
+blotches
+blotchier
+blotchiest
+blotchily
+blotchiness
+blotching
+blotch-shaped
+blotchy
+blote
+blotless
+blotlessness
+blots
+blotted
+blotter
+blotters
+blottesque
+blottesquely
+blottier
+blottiest
+blotting
+blottingly
+blotto
+blottto
+blotty
+bloubiskop
+Blount
+Blountstown
+Blountsville
+Blountville
+blouse
+bloused
+blouselike
+blouses
+blousier
+blousiest
+blousily
+blousing
+blouson
+blousons
+blousy
+blout
+bloviate
+bloviated
+bloviates
+bloviating
+Blow
+blow
+blow-
+blowback
+blowbacks
+blowball
+blowballs
+blow-bies
+blow-by
+blowby
+blow-by-blow
+blowbys
+blowcase
+blowcock
+blowdown
+blow-dry
+blowed
+blowen
+blower
+blowers
+blower-up
+blowess
+blowfish
+blowfishes
+blowflies
+blow-fly
+blowfly
+blowgun
+blowguns
+blow-hard
+blowhard
+blowhards
+blow-hole
+blowhole
+blowholes
+blowie
+blowier
+blowiest
+blow-in
+blowiness
+blowing
+blowings
+blow-iron
+blowiron
+blowjob
+blowjobs
+blowlamp
+blowline
+blow-molded
+blown
+blown-in-the-bottle
+blown-mold
+blown-molded
+blown-out
+blown-up
+blowoff
+blowoffs
+blowout
+blowouts
+blow-pipe
+blowpipe
+blowpipes
+blowpit
+blowpoint
+blowproof
+blows
+blowse
+blowsed
+blowsier
+blowsiest
+blowsily
+blowspray
+blowsy
+blowth
+blow-through
+blowtorch
+blowtorches
+blowtube
+blowtubes
+blow-up
+blowup
+blowups
+blow-wave
+blowy
+blowze
+blowzed
+blowzier
+blowziest
+blowzily
+blowziness
+blowzing
+blowzy
+Bloxberg
+Bloxom
+Blriot
+BLS
+bls
+BLT
+blub
+blubbed
+blubber
+blubber-cheeked
+blubbered
+blubberer
+blubberers
+blubber-fed
+blubberhead
+blubbering
+blubberingly
+blubberman
+blubberous
+blubbers
+blubbery
+blubbing
+Blucher
+blucher
+bluchers
+bludge
+bludged
+bludgeon
+bludgeoned
+bludgeoneer
+bludgeoner
+bludgeoning
+bludgeons
+bludger
+bludging
+Blue
+blue
+blue-annealed
+blue-aproned
+blueback
+blue-backed
+Blueball
+blueball
+blueballs
+blue-banded
+bluebead
+Bluebeard
+bluebeard
+Bluebeardism
+Bluebell
+bluebell
+bluebelled
+blue-bellied
+bluebells
+blue-belt
+blue-berried
+blueberries
+blueberry
+bluebill
+blue-billed
+bluebills
+blue-bird
+bluebird
+bluebirds
+blue-black
+blueblack
+blue-blackness
+blueblaw
+blue-blind
+blueblood
+blue-blooded
+blue-blossom
+blueblossom
+blue-bloused
+bluebonnet
+bluebonnets
+bluebook
+bluebooks
+blue-bottle
+bluebottle
+bluebottles
+bluebreast
+blue-breasted
+bluebuck
+bluebush
+bluebutton
+blue-cap
+bluecap
+bluecaps
+blue-checked
+blue-cheeked
+blue-chip
+bluecoat
+blue-coated
+bluecoated
+bluecoats
+blue-collar
+blue-colored
+blue-crested
+blue-cross
+bluecup
+blue-curls
+bluecurls
+blued
+blue-devilage
+blue-devilism
+blue-eared
+Blueeye
+blue-eye
+blue-eyed
+blue-faced
+Bluefarb
+Bluefield
+Bluefields
+bluefin
+bluefins
+blue-fish
+bluefish
+bluefishes
+blue-flowered
+blue-footed
+blue-fronted
+bluegill
+bluegills
+blue-glancing
+blue-glimmering
+bluegown
+bluegrass
+blue-gray
+blue-green
+bluegum
+bluegums
+blue-haired
+bluehead
+blue-headed
+blueheads
+bluehearted
+blue-hearts
+bluehearts
+Bluehole
+blue-hot
+blueing
+blueings
+blueish
+bluejack
+bluejacket
+bluejackets
+bluejacks
+Bluejay
+bluejay
+bluejays
+blue-john
+bluejoint
+blue-leaved
+blueleg
+bluelegs
+blueline
+blue-lined
+bluelines
+bluely
+blue-mantled
+blue-molded
+blue-molding
+Bluemont
+blue-mottled
+blue-mouthed
+blueness
+bluenesses
+blue-nose
+bluenose
+blue-nosed
+bluenosed
+Bluenoser
+bluenoses
+blue-pencil
+blue-penciled
+blue-penciling
+blue-pencilled
+blue-pencilling
+bluepoint
+bluepoints
+blueprint
+blueprinted
+blueprinter
+blueprinting
+blueprints
+bluer
+blue-rayed
+blue-red
+blue-ribbon
+blue-ribboner
+blue-ribbonism
+blue-ribbonist
+blue-roan
+blue-rolled
+blues
+blue-sailors
+bluesides
+bluesier
+blue-sighted
+blue-sky
+blue-slate
+bluesman
+bluesmen
+blue-spotted
+bluest
+blue-stained
+blue-starry
+bluestem
+blue-stemmed
+bluestems
+blue-stocking
+bluestocking
+bluestockingish
+bluestockingism
+bluestockings
+bluestone
+bluestoner
+blue-striped
+bluesy
+Bluet
+bluet
+blue-tailed
+blueth
+bluethroat
+blue-throated
+bluetick
+blue-tinted
+bluetit
+bluetongue
+blue-tongued
+bluetop
+bluetops
+bluets
+blue-veined
+blue-washed
+Bluewater
+blue-water
+blue-wattled
+blueweed
+blueweeds
+blue-white
+bluewing
+blue-winged
+bluewood
+bluewoods
+Bluey
+bluey
+blue-yellow
+blue-yellow-blind
+blueys
+bluff
+bluffable
+bluff-bowed
+Bluffdale
+bluffed
+bluffer
+bluffers
+bluffest
+bluff-headed
+bluffing
+bluffly
+bluffness
+Bluffs
+bluffs
+Bluffton
+bluffy
+Bluford
+blufter
+bluggy
+Bluh
+Bluhm
+bluing
+bluings
+bluish
+bluish-green
+bluishness
+bluism
+bluisness
+Blum
+Bluma
+blume
+Blumea
+blumed
+Blumenfeld
+Blumenthal
+blumes
+bluming
+blunder
+Blunderbore
+blunderbuss
+blunderbusses
+blundered
+blunderer
+blunderers
+blunderful
+blunderhead
+blunderheaded
+blunderheadedness
+blundering
+blunderingly
+blunderings
+blunders
+blundersome
+blunge
+blunged
+blunger
+blungers
+blunges
+blunging
+Blunk
+blunk
+blunker
+blunket
+blunks
+blunnen
+Blunt
+blunt
+blunt-angled
+blunted
+blunt-edged
+blunt-ended
+blunter
+bluntest
+blunt-faced
+blunthead
+blunt-headed
+blunthearted
+bluntie
+blunting
+bluntish
+bluntishness
+blunt-leaved
+blunt-lobed
+bluntly
+bluntness
+bluntnesses
+blunt-nosed
+blunt-pointed
+blunts
+blunt-spoken
+blunt-witted
+blup
+blur
+blurb
+blurbed
+blurbing
+blurbist
+blurbs
+blurping
+blurred
+blurredly
+blurredness
+blurrer
+blurrier
+blurriest
+blurrily
+blurriness
+blurring
+blurringly
+blurry
+blurs
+blurt
+blurted
+blurter
+blurters
+blurting
+blurts
+Blus
+blush
+blush-colored
+blush-compelling
+blushed
+blusher
+blushers
+blushes
+blushet
+blush-faced
+blushful
+blushfully
+blushfulness
+blushiness
+blushing
+blushingly
+blushless
+blush-suffused
+blusht
+blush-tinted
+blushwort
+blushy
+bluster
+blusteration
+blustered
+blusterer
+blusterers
+blustering
+blusteringly
+blusterous
+blusterously
+blusters
+blustery
+blutwurst
+BLV
+Blvd
+blvd
+Bly
+Blynn
+blype
+blypes
+Blyth
+Blythe
+Blythedale
+Blytheville
+Blythewood
+B.M.
+BM
+bm
+BMA
+BMarE
+BME
+Bme
+BMEd
+BMet
+BMetE
+BMEWS
+BMG
+BMgtE
+BMI
+BMJ
+BMO
+BMOC
+BMP
+BMR
+BMS
+BMT
+B.Mus.
+BMus
+BMV
+BMW
+BN
+Bn
+Bn.
+bn
+BNC
+BNET
+BNF
+bnf
+BNFL
+BNS
+BNSC
+BNU
+B.O.
+B/O
+B/o
+BO
+Bo
+b.o.
+bo
+boa
+Boabdil
+BOAC
+boa-constrictor
+Boadicea
+Boaedon
+boagane
+Boak
+Boalsburg
+Boanbura
+boanergean
+Boanerges
+boanerges
+boanergism
+boanthropy
+Boar
+boar
+boarcite
+board
+boardable
+board-and-roomer
+board-and-shingle
+boardbill
+boarded
+boarder
+boarders
+boarder-up
+boarding
+boardinghouse
+boardinghouses
+boardings
+boardlike
+boardly
+Boardman
+boardman
+boardmanship
+boardmen
+boardroom
+boards
+board-school
+boardsmanship
+board-wages
+boardwalk
+boardwalks
+boardy
+Boarer
+boar-fish
+boarfish
+boarfishes
+boarhound
+boar-hunting
+boarish
+boarishly
+boarishness
+boars
+boarship
+boarskin
+boarspear
+boarstaff
+boart
+boarts
+boarwood
+Boas
+boas
+boast
+boasted
+boaster
+boasters
+boastful
+boastfully
+boastfulness
+boasting
+boastingly
+boastings
+boastive
+boastless
+boasts
+boat
+boatable
+boatage
+boat-bill
+boatbill
+boatbills
+boatbuilder
+boatbuilding
+boated
+boatel
+boatels
+Boaten
+boater
+boaters
+boatfalls
+boat-fly
+boatful
+boat-green
+boat-handler
+boathead
+boatheader
+boathook
+boathouse
+boathouses
+boatie
+boating
+boatings
+boation
+boatkeeper
+boatless
+boatlike
+boatlip
+boatload
+boatloader
+boatloading
+boatloads
+boat-lowering
+boatly
+boatman
+boatmanship
+boatmaster
+boatmen
+boatowner
+boat-race
+boats
+boatsetter
+boat-shaped
+boatshop
+boatside
+boatsman
+boatsmanship
+boatsmen
+boatsteerer
+boatswain
+boatswains
+boattail
+boat-tailed
+boatward
+boatwise
+boat-woman
+boatwoman
+Boatwright
+boatwright
+boatyard
+boatyards
+Boaz
+Bob
+bob
+boba
+bobac
+bobache
+bobachee
+Bobadil
+bobadil
+Bobadilian
+Bobadilish
+Bobadilism
+Bobadilla
+bobance
+Bobbe
+bobbed
+Bobbee
+bobbejaan
+bobber
+bobberies
+bobbers
+bobbery
+Bobbette
+Bobbi
+Bobbie
+bobbie
+Bobbielee
+bobbies
+bobbin
+bobbiner
+bobbinet
+bobbinets
+bobbing
+Bobbinite
+bobbin-net
+bobbins
+bobbinwork
+bobbish
+bobbishly
+bobble
+bobbled
+bobbles
+bobbling
+Bobby
+bobby
+bobby-dazzler
+Bobbye
+bobby-socker
+bobbysocks
+bobby-soxer
+bobbysoxer
+bobbysoxers
+bobcat
+bobcats
+bob-cherry
+bobcoat
+bobeche
+bobeches
+bobet
+Bobette
+bobflies
+bobfloat
+bobfly
+bob-haired
+bobierrite
+Bobina
+Bobine
+Bobinette
+bobization
+bobjerom
+Bobker
+boblet
+Bo-Bo
+Bobo
+bobo
+Bobo-Dioulasso
+bobol
+bobolink
+bobolinks
+bobooti
+bobotee
+bobotie
+bobowler
+bobs
+Bobseine
+bob-sled
+bobsled
+bobsledded
+bobsledder
+bobsledders
+bobsledding
+bobsleded
+bobsleding
+bobsleds
+bobsleigh
+bobstay
+bobstays
+bobsy-die
+bob-tail
+bobtail
+bobtailed
+bobtailing
+bobtails
+Bobtown
+Bobwhite
+bob-white
+bobwhite
+bobwhites
+bob-wig
+bobwood
+BOC
+boc
+Boca
+boca
+bocaccio
+bocaccios
+bocage
+bocal
+bocardo
+bocasin
+bocasine
+bocca
+Boccaccio
+boccaccio
+boccale
+boccarella
+boccaro
+bocce
+bocces
+Boccherini
+bocci
+boccia
+boccias
+boccie
+boccies
+Boccioni
+boccis
+Bocconia
+bocconia
+boce
+bocedization
+Boche
+boche
+bocher
+boches
+Bochism
+bochism
+Bochum
+bochur
+Bock
+bock
+bockerel
+bockeret
+bockey
+bocking
+bocklogged
+bocks
+Bockstein
+Bocock
+bocoy
+bocstaff
+B.O.D.
+BOD
+bod
+bodach
+bodacious
+bodaciously
+Bodanzky
+Bodb
+bodd-
+boddagh
+boddhisattva
+boddle
+Bode
+bode
+boded
+bodeful
+bodefully
+bodefulness
+Bodega
+bodega
+bodegas
+bodegon
+bodegones
+bodement
+bodements
+boden
+bodenbenderite
+Bodenheim
+Bodensee
+boder
+bodes
+bodewash
+bodeword
+Bodfish
+bodge
+bodger
+bodgery
+bodgie
+bodhi
+Bodhidharma
+bodhisat
+Bodhisattva
+bodhisattva
+bodhisattwa
+Bodi
+bodice
+bodiced
+bodicemaker
+bodicemaking
+bodices
+-bodied
+bodied
+bodier
+bodieron
+bodies
+bodikin
+bodiless
+bodilessness
+bodiliness
+bodilize
+bodily
+bodiment
+Bodine
+boding
+bodingly
+bodings
+bodken
+Bodkin
+bodkin
+bodkins
+bodkinwise
+bodle
+Bodleian
+bodleian
+Bodley
+Bodmin
+Bodnar
+Bodo
+bodock
+Bodoni
+bodoni
+bodonid
+bodrag
+bodrage
+Bodrogi
+bods
+bodstick
+Bodwell
+bodword
+Body
+body
+bodybending
+body-breaking
+body-build
+bodybuild
+bodybuilder
+bodybuilders
+bodybuilding
+body-centered
+body-centred
+bodycheck
+body-guard
+bodyguard
+bodyguards
+bodyhood
+bodying
+body-killing
+bodykins
+bodyless
+body-line
+bodymaker
+bodymaking
+body-mind
+bodyplate
+bodyshirt
+body-snatching
+bodysuit
+bodysuits
+bodysurf
+bodysurfed
+bodysurfer
+bodysurfing
+bodysurfs
+bodywear
+bodyweight
+bodywise
+bodywood
+bodywork
+bodyworks
+boe
+Boebera
+Boece
+Boedromion
+Boedromius
+Boehike
+Boehme
+Boehmenism
+boehmenism
+Boehmenist
+Boehmenite
+Boehmer
+Boehmeria
+Boehmian
+Boehmist
+Boehmite
+boehmite
+boehmites
+Boeing
+boeing
+Boeke
+Boelter
+Boelus
+boeotarch
+Boeotia
+boeotia
+Boeotian
+boeotian
+Boeotic
+Boeotus
+Boer
+boer
+Boerdom
+Boerhavia
+Boerne
+boers
+Boesch
+Boeschen
+Boethian
+Boethius
+Boethusian
+Boetius
+Boettiger
+boettner
+BOF
+Boff
+boff
+Boffa
+boffin
+boffins
+boffo
+boffola
+boffolas
+boffos
+boffs
+Bofors
+bog
+boga
+bogach
+Bogalusa
+Bogan
+bogan
+bogans
+Bogard
+bogard
+Bogarde
+Bogart
+bogart
+Bogata
+bogatyr
+bogbean
+bogbeans
+bogberries
+bogberry
+bog-bred
+bog-down
+boget
+Bogey
+bogey
+bog-eyed
+bogeyed
+bogey-hole
+bogeying
+bogeyman
+bogeymen
+bogeys
+bogfern
+boggard
+boggart
+bogged
+Boggers
+boggier
+boggiest
+boggin
+bogginess
+bogging
+boggish
+boggishness
+boggle
+bogglebo
+boggled
+boggle-dy-botch
+boggler
+bogglers
+boggles
+boggling
+bogglingly
+bogglish
+Boggs
+Boggstown
+boggy
+Boghazkeui
+Boghazkoy
+boghole
+bog-hoose
+Bogie
+bogie
+bogieman
+bogier
+bogies
+Bogijiab
+bogland
+boglander
+bogle
+bogled
+bogledom
+bogles
+boglet
+bogman
+bogmire
+Bogo
+bogo
+Bogoch
+Bogomil
+Bogomile
+Bogomilian
+Bogomilism
+bogong
+Bogor
+Bogosian
+Bogot
+Bogota
+bogota
+bogotana
+bog-rush
+bogs
+bogsucker
+bog-trot
+bogtrot
+bog-trotter
+bogtrotter
+bogtrotting
+Bogue
+bogue
+Boguechitto
+bogued
+boguing
+bogum
+bogus
+Boguslawsky
+bogusness
+Bogusz
+bogway
+bogwood
+bogwoods
+bogwort
+bogy
+bogydom
+bogyism
+bogyisms
+bogyland
+bogyman
+bogymen
+bogys
+boh
+Bohairic
+Bohannon
+Bohaty
+bohawn
+Bohea
+bohea
+boheas
+Bohemia
+bohemia
+Bohemia-Moravia
+Bohemian
+bohemian
+Bohemianism
+bohemianism
+bohemians
+Bohemian-tartar
+bohemias
+bohemium
+bohereen
+Bohi
+bohireen
+Bohlen
+Bohlin
+Bohm
+Bohman
+Bohme
+Bohmerwald
+bohmite
+Bohnenberger
+Bohner
+boho
+Bohol
+Bohon
+bohor
+bohora
+bohorok
+Bohr
+Bohrer
+Bohs
+Bohun
+bohunk
+bohunks
+Bohuslav
+Boiardo
+Boice
+Boiceville
+boid
+Boidae
+Boieldieu
+boiette
+boigid
+Boigie
+boiguacu
+Boii
+Boiko
+boil
+boilable
+boildown
+Boileau
+boiled
+boiler
+boiler-cleaning
+boilerful
+boilerhouse
+boilerless
+boilermaker
+boilermakers
+boilermaking
+boilerman
+boiler-off
+boiler-out
+boilerplate
+boilers
+boilersmith
+boiler-testing
+boiler-washing
+boilerworks
+boilery
+boiling
+boiling-house
+boilinglike
+boilingly
+boil-off
+boiloff
+boiloffs
+boilover
+boils
+boily
+Boiney
+boing
+Bois
+bois-brl
+Boisdarc
+Boise
+boise
+boiserie
+boiseries
+Bois-le-Duc
+boisseau
+boisseaux
+Boissevain
+boist
+boisterous
+boisterously
+boisterousness
+boistous
+boistously
+boistousness
+boite
+boites
+boithrin
+Boito
+Bojardo
+Bojer
+Bojig-ngiji
+bojite
+bojo
+Bok
+bokadam
+bokard
+bokark
+Bokchito
+boke
+Bokeelia
+Bokhara
+Bokharan
+Bokm'
+bokmakierie
+boko
+bokom
+bokos
+Bokoshe
+Bokoto
+Bol
+Bol.
+bol
+bola
+Bolag
+Bolan
+Boland
+Bolanger
+bolar
+bolas
+bolases
+bolbanac
+bolbonac
+Bolboxalis
+Bolckow
+bold
+boldacious
+bold-beating
+bolded
+bolden
+bolder
+Bolderian
+boldest
+bold-face
+boldface
+bold-faced
+boldfaced
+bold-facedly
+boldfacedly
+bold-facedness
+boldfacedness
+boldfaces
+boldfacing
+bold-following
+boldhearted
+boldheartedly
+boldheartedness
+boldin
+boldine
+bolding
+bold-looking
+boldly
+bold-minded
+boldness
+boldnesses
+boldo
+boldoine
+boldos
+bold-spirited
+Boldu
+bole
+bolection
+bolectioned
+boled
+boleite
+Bolelia
+bolelike
+Bolen
+bolero
+boleros
+Boles
+boles
+Boleslaw
+Boletaceae
+boletaceous
+bolete
+boletes
+boleti
+boletic
+Boletus
+boletus
+boletuses
+boleweed
+bolewort
+Boley
+Boleyn
+Bolger
+boliche
+bolide
+bolides
+Boligee
+bolimba
+Bolinas
+Boling
+Bolingbroke
+Bolinger
+bolis
+bolita
+Bolitho
+Bolivar
+bolivar
+bolivares
+bolivarite
+bolivars
+Bolivia
+bolivia
+Bolivian
+bolivian
+boliviano
+bolivianos
+bolivians
+bolivias
+bolk
+Boll
+boll
+Bolland
+Bollandist
+bollandist
+Bollandus
+bollard
+bollards
+Bollay
+bolled
+Bollen
+bollen
+boller
+bollies
+Bolling
+bolling
+Bollinger
+bollito
+bollix
+bollixed
+bollixes
+bollixing
+bollock
+bollocks
+bollox
+bolloxed
+bolloxes
+bolloxing
+bolls
+bollworm
+bollworms
+bolly
+Bolme
+Bolo
+bolo
+boloball
+bolo-bolo
+boloed
+Bologna
+bologna
+Bolognan
+bolognas
+Bologne
+Bolognese
+bolograph
+bolographic
+bolographically
+bolography
+boloing
+Boloism
+boloism
+boloman
+bolomen
+bolometer
+bolometric
+bolometrically
+boloney
+boloneys
+boloroot
+bolos
+Bolshevik
+bolshevik
+Bolsheviki
+Bolshevikian
+Bolshevikism
+Bolsheviks
+bolsheviks
+Bolshevism
+bolshevism
+Bolshevist
+bolshevist
+Bolshevistic
+bolshevistic
+Bolshevistically
+bolshevistically
+bolshevists
+Bolshevization
+Bolshevize
+bolshevize
+Bolshevized
+bolshevized
+Bolshevizing
+bolshevizing
+Bolshie
+bolshie
+Bolshies
+bolshies
+Bolshoi
+Bolshy
+bolshy
+bolson
+bolsons
+bolster
+bolstered
+bolsterer
+bolsterers
+bolstering
+bolsters
+bolsterwork
+Bolt
+bolt
+bolt-action
+boltage
+boltant
+boltcutter
+bolt-cutting
+Bolte
+bolted
+boltel
+Bolten
+bolter
+bolter-down
+bolters
+bolters-down
+bolters-up
+bolter-up
+bolt-forging
+bolt-head
+bolthead
+boltheader
+boltheading
+boltheads
+bolt-hole
+bolthole
+boltholes
+bolti
+boltin
+bolting
+boltings
+boltless
+boltlike
+boltmaker
+boltmaking
+Bolton
+Boltonia
+boltonia
+boltonias
+boltonite
+bolt-pointing
+bolt-rope
+boltrope
+boltropes
+bolts
+bolt-shaped
+boltsmith
+boltspreet
+boltstrake
+bolt-threading
+bolt-turning
+boltuprightness
+boltwork
+bolty
+Boltzmann
+bolus
+boluses
+Bolyai
+Bolyaian
+Bolzano
+BOM
+bom
+Boma
+boma
+Bomarc
+Bomarea
+bomb
+bombable
+Bombacaceae
+bombacaceous
+bombace
+bombard
+bombarde
+bombarded
+bombardelle
+bombarder
+bombardier
+bombardiers
+bombarding
+bombardman
+bombardmen
+bombardment
+bombardments
+bombardo
+bombardon
+bombards
+bombasine
+bombast
+bombaster
+bombastic
+bombastical
+bombastically
+bombasticness
+bombastry
+bombasts
+Bombax
+bombax
+Bombay
+bombay
+bombazeen
+bombazet
+bombazette
+bombazine
+bombe
+bombed
+bomber
+bombernickel
+bombers
+bombes
+bombesin
+bombesins
+bombic
+bombiccite
+Bombidae
+bombilate
+bombilation
+bombilla
+bombillas
+Bombinae
+bombinate
+bombinating
+bombination
+bombing
+bombings
+bomb-ketch
+bomble
+bombline
+bombload
+bombloads
+bombo
+bombola
+bombonne
+bombora
+bombous
+bomb-proof
+bombproof
+bombs
+bomb-shell
+bombshell
+bombshells
+bombsight
+bombsights
+bomb-throwing
+Bombus
+bombus
+bombycid
+Bombycidae
+bombycids
+bombyciform
+Bombycilla
+Bombycillidae
+Bombycina
+bombycine
+bombycinous
+Bombyliidae
+bombylious
+Bombyx
+bombyx
+bombyxes
+BOMFOG
+bomi
+Bomke
+Bomont
+bomos
+Bomoseen
+Bomu
+Bon
+bon
+Bona
+bona
+Bonacci
+bon-accord
+bonace
+bonaci
+bonacis
+Bonadoxin
+bona-fide
+bonagh
+bonaght
+bonailie
+Bonair
+bonair
+Bonaire
+bonaire
+bonairly
+bonairness
+bonally
+bonamano
+bonang
+bonanza
+bonanzas
+Bonaparte
+Bonapartean
+Bonapartism
+bonapartism
+Bonapartist
+bonapartist
+Bonaqua
+Bonar
+bona-roba
+Bonasa
+bonassus
+bonasus
+bonaught
+bonav
+Bonaventura
+Bonaventure
+bonaventure
+Bonaventurism
+Bonaveria
+bonavist
+Bonbo
+bon-bon
+bonbon
+bonbonniere
+bonbonnieres
+bonbons
+Boncarbo
+bonce
+bonchief
+Bond
+bond
+bondable
+bondage
+bondager
+bondages
+bondar
+bonded
+Bondelswarts
+bonder
+bonderize
+bonderman
+bonders
+Bondes
+bondfolk
+bondhold
+bondholder
+bondholders
+bondholding
+Bondie
+bondieuserie
+bonding
+bondings
+bond-land
+bondland
+bondless
+bondmaid
+bondmaids
+bondman
+bondmanship
+bondmen
+bondminder
+bondoc
+Bondon
+bondon
+bonds
+bond-servant
+bondservant
+bondship
+bondslave
+bondsman
+bondsmen
+bondstone
+Bondsville
+bondswoman
+bondswomen
+bonduc
+bonducnut
+bonducs
+Bonduel
+Bondurant
+Bondville
+bondwoman
+bondwomen
+Bondy
+Bone
+bone
+bone-ace
+boneache
+bonebinder
+boneblack
+bonebreaker
+bone-breaking
+bone-bred
+bone-bruising
+bone-carving
+bone-crushing
+boned
+bonedog
+bone-dry
+bonedry
+bone-dryness
+bone-eater
+boneen
+bonefish
+bonefishes
+boneflower
+bone-grinding
+bone-hard
+bonehead
+boneheaded
+boneheadedness
+boneheads
+bone-idle
+bone-lace
+bone-laced
+bone-lazy
+boneless
+bonelessly
+bonelessness
+bonelet
+bonelike
+Bonellia
+bonemeal
+bone-piercing
+boner
+bone-rotting
+boners
+bones
+boneset
+bonesets
+bone-setter
+bonesetter
+bonesetting
+boneshaker
+boneshave
+boneshaw
+Bonesteel
+bonetail
+bonete
+bone-tired
+bonetta
+Boneville
+bone-weary
+bone-white
+bonewood
+bonework
+bone-wort
+bonewort
+Boney
+boney
+boneyard
+boneyards
+Bonfield
+bonfire
+bonfires
+bong
+bongar
+bonged
+bonging
+Bongo
+bongo
+bongoes
+bongoist
+bongoists
+bongos
+bongrace
+bongs
+Bonham
+Bonheur
+bonheur-du-jour
+bonheurs-du-jour
+Bonhoeffer
+bonhomie
+bonhomies
+Bonhomme
+bonhomme
+bonhommie
+bonhomous
+bonhomously
+Boni
+boniata
+bonier
+boniest
+Boniface
+boniface
+bonifaces
+Bonifay
+bonification
+boniform
+bonify
+bonilass
+Bonilla
+Bonina
+Bonine
+boniness
+boninesses
+boning
+Bonington
+boninite
+Bonis
+bonism
+Bonita
+bonita
+bonitarian
+bonitary
+bonitas
+bonito
+bonitoes
+bonitos
+bonity
+bonjour
+bonk
+bonked
+bonkers
+bonking
+bonks
+Bonlee
+Bonn
+Bonnard
+Bonnaz
+bonnaz
+Bonne
+bonne
+Bonneau
+Bonnee
+Bonnell
+Bonner
+Bonnerdale
+bonnering
+Bonnes
+bonnes
+Bonnesbosq
+Bonnet
+bonnet
+bonneted
+bonneter
+Bonneterre
+bonnethead
+bonnet-headed
+bonnetiere
+bonnetieres
+bonneting
+bonnetless
+bonnetlike
+bonnetman
+bonnetmen
+bonnets
+Bonnette
+Bonneville
+Bonney
+Bonni
+bonnibel
+Bonnibelle
+Bonnice
+Bonnie
+bonnie
+bonnier
+bonniest
+Bonnieville
+bonnily
+bonniness
+bonnive
+bonnne
+bonnnes
+bonnock
+bonnocks
+Bonns
+bonnwis
+Bonny
+bonny
+bonny-clabber
+bonnyclabber
+bonnyish
+Bonnyman
+bonnyvis
+Bono
+bono
+Bononcini
+Bononian
+bonorum
+bonos
+Bonpa
+Bonpland
+bons
+bonsai
+Bonsall
+Bonsecour
+bonsela
+bonser
+bonsoir
+bonspell
+bonspells
+bonspiel
+bonspiels
+bontebok
+bonteboks
+bontebuck
+bontebucks
+bontee
+Bontempelli
+bontequagga
+Bontoc
+Bontocs
+Bontok
+Bontoks
+bon-ton
+Bonucci
+bonum
+bonus
+bonuses
+bon-vivant
+Bonwier
+bonxie
+bony
+bonyfish
+bonytail
+bonze
+bonzer
+bonzery
+bonzes
+bonzian
+boo
+boob
+boobed
+boobery
+boobialla
+boobie
+boobies
+boobily
+boobing
+boobish
+boobishness
+booboisie
+boo-boo
+booboo
+boobook
+boo-boos
+booboos
+boobs
+booby
+boobyalla
+boobyish
+boobyism
+booby-trap
+booby-trapped
+booby-trapping
+bood
+boodh
+boodie
+Boodin
+boodle
+boodled
+boodledom
+boodleism
+boodleize
+boodler
+boodlers
+boodles
+boodling
+Boody
+boody
+booed
+boof
+boogaloo
+booger
+boogerman
+boogers
+boogeyman
+boogeymen
+boogie
+boogied
+boogies
+boogie-woogie
+boogiewoogie
+boogum
+boogy
+boogying
+boogyman
+boogymen
+boohoo
+boohooed
+boohooing
+boohoos
+booing
+boojum
+Book
+book
+bookable
+bookbind
+bookbinder
+bookbinderies
+bookbinders
+bookbindery
+bookbinding
+bookboard
+book-case
+bookcase
+bookcases
+book-craft
+bookcraft
+bookdealer
+bookdom
+booked
+bookend
+bookends
+Booker
+booker
+bookers
+bookery
+bookfair
+book-fed
+book-fell
+book-flat
+bookfold
+book-folder
+bookful
+bookfuls
+bookholder
+bookhood
+bookie
+bookies
+bookiness
+booking
+bookings
+bookish
+bookishly
+bookishness
+bookism
+bookit
+bookkeep
+book-keeper
+bookkeeper
+bookkeepers
+book-keeping
+bookkeeping
+bookkeepings
+bookkeeps
+bookland
+book-latin
+booklear
+book-learned
+book-learning
+bookless
+booklet
+booklets
+booklice
+booklift
+booklike
+book-lined
+bookling
+booklists
+book-lore
+booklore
+booklores
+booklouse
+booklover
+book-loving
+book-maker
+bookmaker
+bookmakers
+bookmaking
+bookmakings
+Bookman
+bookman
+bookmark
+bookmarker
+bookmarks
+book-match
+bookmate
+bookmen
+book-minded
+bookmobile
+bookmobiles
+bookmonger
+book-plate
+bookplate
+bookplates
+bookpress
+bookrack
+bookracks
+book-read
+bookrest
+bookrests
+bookroom
+books
+bookseller
+booksellerish
+booksellerism
+booksellers
+bookselling
+book-sewer
+book-sewing
+bookshelf
+bookshelfs
+bookshelves
+bookshop
+bookshops
+bookstack
+bookstall
+bookstand
+book-stealer
+book-stitching
+bookstore
+bookstores
+booksy
+book-taught
+bookward
+bookwards
+book-ways
+bookways
+book-wing
+book-wise
+bookwise
+book-work
+bookwork
+book-worm
+bookworm
+bookworms
+bookwright
+booky
+bool
+Boole
+boolean
+booleans
+booley
+booleys
+Boolian
+boolies
+booly
+boolya
+boom
+Booma
+boomable
+boomage
+boomah
+boom-and-bust
+boomboat
+boombox
+boomboxes
+boomdas
+boomed
+boom-ended
+Boomer
+boomer
+boomerang
+boomeranged
+boomeranging
+boomerangs
+boomers
+boomier
+boomiest
+boominess
+booming
+boomingly
+boomkin
+boomkins
+boomless
+boomlet
+boomlets
+boomorah
+booms
+boomslang
+boomslange
+boomster
+boomtown
+boomtowns
+boomy
+boon
+boondock
+boondocker
+boondocks
+boondoggle
+boondoggled
+boondoggler
+boondogglers
+boondoggles
+boondoggling
+Boone
+Booneville
+boonfellow
+boong
+boongary
+Boonie
+boonies
+boonk
+boonless
+boons
+Boonsboro
+Boonton
+Boonville
+Boony
+Boophilus
+boopic
+boopis
+Boor
+boor
+boordly
+Boorer
+boorga
+boorish
+boorishly
+boorishness
+Boorman
+boors
+boort
+boos
+boose
+boosies
+boost
+boosted
+booster
+boosterism
+boosters
+boosting
+boosts
+boosy
+Boot
+boot
+bootable
+bootblack
+bootblacks
+bootboy
+boot-cleaning
+Boote
+booted
+bootee
+bootees
+booter
+booteries
+bootery
+Bootes
+bootes
+bootful
+Booth
+booth
+boothage
+boot-hale
+boothale
+Boothe
+bootheel
+boother
+boothes
+Boothia
+Boothian
+boothite
+Boothman
+bootholder
+boothose
+booths
+Boothville
+Bootid
+bootie
+bootied
+booties
+bootikin
+bootikins
+booting
+bootjack
+bootjacks
+bootlace
+bootlaces
+Bootle
+bootle
+bootle-blade
+boot-leg
+bootleg
+bootleger
+bootlegged
+bootlegger
+bootleggers
+bootlegging
+bootlegs
+bootless
+bootlessly
+bootlessness
+bootlick
+bootlicked
+bootlicker
+bootlickers
+bootlicking
+bootlicks
+bootloader
+bootmaker
+bootmaking
+bootman
+bootprint
+Boots
+boots
+bootstrap
+bootstrapped
+bootstrapping
+bootstraps
+boottop
+boot-topping
+boottopping
+booty
+bootyless
+Booz
+Booze
+booze
+boozed
+boozehound
+boozer
+boozers
+boozes
+booze-up
+boozier
+booziest
+boozify
+boozily
+booziness
+boozing
+boozy
+Bop
+bop
+Bo-peep
+Bopeep
+bo-peep
+bopeep
+Bophuthatswana
+Bopp
+bopped
+bopper
+boppers
+bopping
+boppist
+bops
+bopster
+bopyrid
+Bopyridae
+bopyridian
+Bopyrus
+BOQ
+Boqueron
+BOR
+Bor
+Bor'
+bor
+bor-
+bor.
+Bora
+bora
+borable
+boraces
+borachio
+boracic
+boraciferous
+boracite
+boracites
+boracium
+boracous
+borage
+borages
+Boraginaceae
+boraginaceous
+boragineous
+Borago
+Borah
+Borak
+borak
+boral
+borals
+Boran
+Borana
+borane
+boranes
+Borani
+boras
+borasca
+borasco
+borasque
+borasqueborate
+Borassus
+borassus
+borate
+borated
+borates
+borating
+borax
+boraxes
+borazon
+borazons
+Borboridae
+Borborus
+borborygm
+borborygmatic
+borborygmi
+borborygmic
+borborygmies
+borborygmus
+Borchers
+Borchert
+Bord
+bord
+Borda
+bordage
+bord-and-pillar
+bordar
+bordarius
+Bordeaux
+bordeaux
+bordel
+Bordelais
+Bordelaise
+bordelaise
+bordello
+bordellos
+Bordelonville
+bordels
+Borden
+Bordentown
+Border
+border
+bordereau
+bordereaux
+bordered
+borderer
+borderers
+Borderies
+bordering
+borderings
+borderism
+border-land
+borderland
+borderlander
+borderlands
+borderless
+borderlight
+borderline
+borderlines
+bordermark
+borders
+Borderside
+Bordet
+Bordie
+Bordiuk
+bord-land
+bord-lode
+bordman
+bordrag
+bordrage
+bordroom
+Bordulac
+bordun
+bordure
+bordured
+bordures
+Bordy
+Bore
+bore
+boreable
+boread
+Boreadae
+Boreades
+Boreal
+boreal
+Borealis
+borealis
+borean
+Boreas
+boreas
+borecole
+borecoles
+bored
+boredness
+boredom
+boredoms
+boree
+boreen
+boreens
+boregat
+borehole
+boreholes
+Boreiad
+boreism
+Borek
+Borel
+borel
+borele
+Borer
+borer
+borers
+Bores
+bores
+boresight
+boresome
+boresomely
+boresomeness
+Boreum
+Boreus
+Borg
+borg
+Borger
+Borgerhout
+Borges
+Borgeson
+borgh
+borghalpenny
+Borghese
+borghi
+Borghild
+Borgholm
+Borgia
+Borglum
+borh
+Bori
+bori
+boric
+borickite
+borid
+boride
+borides
+borine
+Boring
+boring
+boringly
+boringness
+borings
+Borinqueno
+Boris
+borish
+Borislav
+borism
+borith
+borities
+bority
+borize
+Bork
+Borlase
+borlase
+borley
+Borlow
+Borman
+Born
+born
+bornan
+bornane
+borne
+Bornean
+Borneo
+borneo
+borneol
+borneols
+Bornholm
+Bornie
+borning
+bornite
+bornites
+bornitic
+Bornstein
+Bornu
+bornyl
+Boro
+boro
+boro-
+Borocaine
+borocalcite
+borocarbide
+borocitrate
+Borodankov
+Borodin
+Borodino
+borofluohydric
+borofluoric
+borofluoride
+borofluorin
+boroglycerate
+boroglyceride
+boroglycerine
+borohydride
+borolanite
+boron
+boronatrocalcite
+Borongan
+Boronia
+boronia
+boronic
+borons
+borophenol
+borophenylic
+Bororo
+Bororoan
+borosalicylate
+borosalicylic
+borosilicate
+borosilicic
+Borotno
+borotungstate
+borotungstic
+borough
+Borough-english
+borough-English
+borough-english
+borough-holder
+boroughlet
+borough-man
+borough-master
+boroughmaster
+boroughmonger
+boroughmongering
+boroughmongery
+borough-reeve
+boroughs
+boroughship
+borough-town
+boroughwide
+borowolframic
+borracha
+borrachio
+Borras
+borrasca
+borrel
+Borrelia
+borrelia
+Borrell
+Borrelomycetaceae
+Borreri
+Borreria
+Borrichia
+Borries
+Borroff
+Borromean
+Borromini
+Borroughs
+Borrovian
+Borrow
+borrow
+borrowable
+borrowed
+borrower
+borrowers
+borrowing
+borrows
+Bors
+bors
+Borsalino
+borsch
+borsches
+borscht
+borschts
+borsholder
+borsht
+borshts
+borstal
+borstall
+borstals
+Borszcz
+bort
+Bortman
+borts
+bortsch
+borty
+Bortz
+bortz
+bortzes
+Boru
+Boruca
+Borup
+Borussian
+borwort
+boryl
+Borzicactus
+borzoi
+borzois
+BOS
+Bos
+bos
+Bosanquet
+Bosc
+boscage
+boscages
+Bosch
+bosch
+boschbok
+boschboks
+Boschneger
+boschvark
+boschveld
+Boscobel
+Boscovich
+Bose
+bose
+Boselaphus
+Boser
+boser
+bosey
+bosh
+Boshas
+boshbok
+boshboks
+bosher
+boshes
+boshvark
+boshvarks
+BOSIX
+Bosjesman
+bosjesman
+bosk
+boskage
+boskages
+bosker
+bosket
+boskets
+boskier
+boskiest
+boskiness
+Boskop
+boskopoid
+bosks
+bosky
+Bosler
+bo's'n
+bos'n
+bosn
+Bosnia
+Bosniac
+Bosniak
+Bosnian
+Bosnisch
+bosom
+bosom-breathing
+bosom-deep
+bosomed
+bosomer
+bosom-felt
+bosom-folded
+bosominess
+bosoming
+bosoms
+bosom-stricken
+bosomy
+boson
+Bosone
+bosonic
+bosons
+Bosphorus
+Bosporan
+Bosporanic
+Bosporian
+Bosporus
+bosporus
+Bosque
+bosque
+bosques
+bosquet
+bosquets
+BOSS
+boss
+bossa
+bossage
+bossboy
+bossdom
+bossdoms
+bossed
+bosselated
+bosselation
+bosser
+bosses
+bosset
+boss-eyed
+bosseyed
+bossier
+bossies
+bossiest
+bossily
+bossiness
+bossing
+bossism
+bossisms
+bosslet
+Bosson
+bossship
+Bossuet
+bossy
+bostal
+bostangi
+bostanji
+bosthoon
+Bostic
+Boston
+boston
+Bostonese
+Bostonian
+bostonian
+bostonians
+bostonite
+bostons
+Bostow
+bostrychid
+Bostrychidae
+bostrychoid
+bostrychoidal
+bostryx
+Bostwick
+bosun
+bosuns
+Boswall
+Boswell
+boswell
+Boswellia
+Boswellian
+boswellian
+Boswelliana
+Boswellism
+boswellism
+Boswellize
+boswellize
+boswellized
+boswellizing
+Bosworth
+BOT
+BoT
+bot
+bot.
+bota
+botan
+botanic
+botanica
+botanical
+botanically
+botanicas
+botanics
+botanies
+botanise
+botanised
+botaniser
+botanises
+botanising
+botanist
+botanists
+botanize
+botanized
+botanizer
+botanizes
+botanizing
+botano-
+botanomancy
+botanophile
+botanophilist
+botany
+botargo
+botargos
+botas
+Botaurinae
+Botaurus
+botch
+botched
+botchedly
+botched-up
+botcher
+botcheries
+botcherly
+botchers
+botchery
+botches
+botchier
+botchiest
+botchily
+botchiness
+botching
+botchka
+botchwork
+botchy
+bote
+Botein
+botel
+boteler
+botella
+botels
+boterol
+boteroll
+Botes
+botete
+botflies
+botfly
+both
+Botha
+Bothe
+Bothell
+bother
+botheration
+bothered
+botherer
+botherheaded
+bothering
+botherment
+bothers
+bothersome
+bothersomely
+bothersomeness
+both-handed
+both-handedness
+both-hands
+bothie
+bothies
+bothlike
+Bothnia
+Bothnian
+Bothnic
+bothrenchyma
+bothria
+bothridia
+bothridium
+bothridiums
+Bothriocephalus
+Bothriocidaris
+Bothriolepis
+bothriolepis
+bothrium
+bothriums
+Bothrodendron
+bothroi
+bothropic
+Bothrops
+bothros
+bothsided
+bothsidedness
+boththridia
+bothway
+Bothwell
+bothy
+boti
+Botkin
+Botkins
+botling
+Botnick
+Botocudo
+botone
+botonee
+botong
+botonn
+botonnee
+botonny
+botony
+botoyan
+bo-tree
+botry
+Botrychium
+botrycymose
+Botrydium
+botrylle
+Botryllidae
+Botryllus
+botryogen
+botryoid
+botryoidal
+botryoidally
+botryolite
+Botryomyces
+botryomycoma
+botryomycosis
+botryomycotic
+Botryopteriaceae
+botryopterid
+Botryopteris
+botryose
+botryotherapy
+Botrytis
+botrytis
+botrytises
+bots
+Botsares
+Botsford
+Botswana
+botswana
+bott
+Bottali
+botte
+bottega
+bottegas
+botteghe
+bottekin
+Bottger
+Botti
+Botticelli
+botticelli
+Botticellian
+bottier
+bottine
+Bottineau
+bottle
+bottle-bellied
+bottlebird
+bottle-blowing
+bottle-brush
+bottlebrush
+bottle-butted
+bottle-capping
+bottle-carrying
+bottle-cleaning
+bottle-corking
+bottled
+bottle-fed
+bottle-feed
+bottle-filling
+bottleflower
+bottleful
+bottlefuls
+bottle-green
+bottle-head
+bottlehead
+bottle-holder
+bottleholder
+bottlelike
+bottlemaker
+bottlemaking
+bottleman
+bottleneck
+bottlenecks
+bottlenest
+bottle-nose
+bottlenose
+bottle-nosed
+bottle-o
+bottler
+bottle-rinsing
+bottlers
+bottles
+bottlesful
+bottle-shaped
+bottle-soaking
+bottle-sterilizing
+bottlestone
+bottle-tailed
+bottle-tight
+bottle-washer
+bottle-washing
+bottling
+bottom
+bottomchrome
+bottomed
+bottomer
+bottomers
+bottoming
+bottomland
+bottomless
+bottomlessly
+bottomlessness
+bottommost
+bottomried
+bottomries
+bottomry
+bottomrying
+bottoms
+bottom-set
+bottonhook
+Bottrop
+botts
+bottstick
+bottu
+botuliform
+botulin
+botulinal
+botulins
+botulinum
+botulinus
+botulinuses
+botulism
+botulisms
+botulismus
+Botvinnik
+Botzow
+Bouak
+Bouake
+Bouar
+boubas
+boubou
+boubous
+boucan
+bouch
+bouchal
+bouchaleen
+Bouchard
+boucharde
+Bouche
+bouche
+bouchee
+bouchees
+Boucher
+boucher
+boucherism
+boucherize
+Bouches-du-Rh
+bouchette
+Bouchier
+bouchon
+bouchons
+Boucicault
+Bouckville
+boucl
+boucle
+boucles
+boud
+bouderie
+boudeuse
+Boudicca
+boudin
+boudoir
+boudoiresque
+boudoirs
+Boudreaux
+bouet
+Boufarik
+bouffage
+bouffancy
+bouffant
+bouffante
+bouffants
+bouffe
+bouffes
+bouffon
+Bougainvillaea
+bougainvillaea
+bougainvillaeas
+Bougainville
+Bougainvillea
+bougainvillea
+Bougainvillia
+Bougainvilliidae
+bougar
+bouge
+bougee
+bougeron
+bouget
+Bough
+bough
+boughed
+boughless
+bough-pot
+boughpot
+boughpots
+boughs
+bought
+boughten
+boughy
+bougie
+bougies
+Bouguer
+Bouguereau
+bouillabaisse
+bouilli
+bouillon
+bouillone
+bouillons
+bouk
+boukit
+boul
+Boulanger
+boulanger
+boulangerite
+Boulangism
+Boulangist
+Boulder
+boulder
+bouldered
+boulderhead
+bouldering
+boulders
+boulder-stone
+boulder-strewn
+bouldery
+Bouldon
+Boule
+boule
+Boule-de-suif
+boules
+bouleuteria
+bouleuterion
+boulevard
+boulevardier
+boulevardiers
+boulevardize
+boulevards
+bouleverse
+bouleversement
+boulework
+Bouley
+Boulez
+boulimia
+boulimy
+boulle
+boulles
+boullework
+Boulogne
+Boulogne-Billancourt
+Boulogne-sur-Mer
+Boulogne-sur-Seine
+Boult
+boult
+boultel
+boultell
+boulter
+boulterer
+Boumdienne
+boun
+bounce
+bounceable
+bounceably
+bounceback
+bounced
+bouncer
+bouncers
+bounces
+bouncier
+bounciest
+bouncily
+bounciness
+bouncing
+bouncingly
+bouncy
+Bound
+bound
+boundable
+boundaries
+boundary
+boundary-marking
+Boundbrook
+bounded
+boundedly
+boundedness
+bounden
+bounder
+bounderish
+bounderishly
+bounders
+bounding
+boundingly
+boundless
+boundlessly
+boundlessness
+boundlessnesses
+boundly
+boundness
+Bounds
+bounds
+boundure
+bounteous
+bounteously
+bounteousness
+bountied
+bounties
+Bountiful
+bountiful
+bountifully
+bountifulness
+bountihead
+bountiousness
+bountith
+bountree
+Bounty
+bounty
+bounty-fed
+bountyless
+Bouphonia
+bouquet
+bouquetiere
+bouquetin
+bouquets
+bouquiniste
+bour
+bourage
+bourasque
+Bourbaki
+Bourbon
+bourbon
+Bourbonesque
+Bourbonian
+Bourbonic
+Bourbonism
+bourbonism
+Bourbonist
+bourbonize
+Bourbonnais
+bourbons
+bourd
+bourder
+bourdis
+bourdon
+bourdons
+bourette
+Bourg
+bourg
+bourgade
+Bourgeois
+bourgeois
+bourgeoise
+bourgeoises
+bourgeoisie
+bourgeoisies
+bourgeoisify
+bourgeoisitic
+bourgeon
+bourgeoned
+bourgeoning
+bourgeons
+Bourges
+Bourget
+Bourgogne
+bourgs
+Bourguiba
+bourguignonne
+Bourignian
+Bourignianism
+Bourignianist
+Bourignonism
+Bourignonist
+Bourke
+bourkha
+bourlaw
+Bourn
+bourn
+Bourne
+bourne
+Bournemouth
+bournes
+Bourneville
+bournless
+bournonite
+bournous
+bourns
+bourock
+Bourout
+Bourque
+bourr
+bourran
+bourrasque
+bourre
+bourreau
+bourree
+bourrees
+bourrelet
+bourride
+bourrides
+Bourse
+bourse
+bourses
+Boursin
+bourtree
+bourtrees
+Bouse
+bouse
+boused
+bouser
+bouses
+bousing
+bousouki
+bousoukia
+bousoukis
+Boussingault
+Boussingaultia
+boussingaultite
+boustrophedon
+boustrophedonic
+bousy
+bout
+boutade
+boutefeu
+boutel
+boutell
+Bouteloua
+bouteria
+bouteselle
+boutique
+boutiques
+Boutis
+bouto
+Bouton
+bouton
+boutonniere
+boutonnieres
+boutons
+boutre
+bouts
+bouts-rimes
+Boutte
+Boutwell
+boutylka
+Bouvard
+Bouvardia
+bouvardia
+bouvier
+bouviers
+Bouvines
+bouw
+bouzouki
+bouzoukia
+bouzoukis
+Bouzoun
+Bovard
+bovarism
+bovarist
+bovaristic
+bovarysm
+bovate
+Bove
+bove
+bovenland
+Bovensmilde
+Bovet
+Bovey
+bovey
+Bovgazk
+bovicide
+boviculture
+bovid
+Bovidae
+bovids
+boviform
+Bovill
+Bovina
+bovine
+bovinely
+bovines
+bovinities
+bovinity
+Bovista
+bovld
+bovoid
+bovovaccination
+bovovaccine
+Bovril
+bovver
+Bow
+bow
+bowable
+bow-back
+bowback
+bow-backed
+bow-beaked
+bow-bearer
+Bow-bell
+bow-bell
+Bowbells
+bowbells
+bow-bending
+bowbent
+bowboy
+bow-compass
+Bowden
+bowden
+Bowdichia
+Bowditch
+bowditch
+Bowdle
+bowdlerisation
+bowdlerise
+bowdlerised
+bowdlerising
+bowdlerism
+bowdlerization
+bowdlerizations
+bowdlerize
+bowdlerized
+bowdlerizer
+bowdlerizes
+bowdlerizing
+Bowdoin
+Bowdoinham
+Bowdon
+bow-draught
+bowdrill
+bow-dye
+bow-dyer
+Bowe
+bowe
+bowed
+bowed-down
+bowedness
+bowel
+boweled
+boweling
+Bowell
+bowelled
+bowelless
+bowellike
+bowelling
+bowels
+Bowen
+bowenite
+Bower
+bower
+bower-bird
+bowerbird
+bowered
+boweries
+bowering
+bowerlet
+bowerlike
+bowerly
+bowermaiden
+Bowerman
+bowermay
+Bowers
+bowers
+Bowerston
+Bowersville
+bowerwoman
+Bowery
+bowery
+Boweryish
+Bowes
+bowess
+bowet
+bowfin
+bowfins
+bowfront
+bowge
+bowgrace
+bow-hand
+bowhead
+bowheads
+bow-houghd
+Bowie
+bowie
+bowieful
+bowie-knife
+bowing
+bowingly
+bowings
+bow-iron
+bowk
+bowkail
+bowker
+bowknot
+bowknots
+bowl
+bowla
+bowlder
+bowlderhead
+bowldering
+bowlders
+bowldery
+Bowlds
+bowle
+bowled
+bowleg
+bow-legged
+bowlegged
+bowleggedness
+Bowlegs
+bowlegs
+Bowler
+bowler
+bowlers
+Bowles
+bowles
+bow-less
+bowless
+bowlful
+bowlfuls
+bowlike
+bowlin
+bowline
+bowlines
+bowling
+bowlings
+bowllike
+bowlmaker
+bowls
+bowl-shaped
+Bowlus
+bowly
+bowmaker
+bowmaking
+Bowman
+bowman
+Bowmansdale
+Bowmanstown
+Bowmansville
+bowmen
+bown
+Bowne
+bowne
+bow-necked
+bow-net
+bowpin
+bowpot
+bowpots
+Bowra
+Bowrah
+bowralite
+Bowring
+bows
+bowsaw
+bowse
+bowsed
+bowser
+bowsery
+bowses
+bow-shaped
+bowshot
+bowshots
+bowsie
+bowsing
+bowsman
+bowsprit
+bowsprits
+bowssen
+bowstaff
+bowstave
+bow-street
+bow-string
+bowstring
+bowstringed
+bowstringing
+bowstrings
+bowstrung
+bowtel
+bowtell
+bowtie
+bow-window
+bow-windowed
+bowwoman
+bowwood
+bowwort
+bow-wow
+bowwow
+bowwowed
+bowwows
+bowyang
+bowyangs
+Bowyer
+bowyer
+bowyers
+Box
+box
+boxball
+boxberries
+boxberry
+boxboard
+boxboards
+box-bordered
+box-branding
+boxbush
+box-calf
+boxcar
+boxcars
+box-cleating
+box-covering
+boxed
+box-edged
+boxed-in
+Boxelder
+boxen
+Boxer
+boxer
+Boxerism
+boxer-off
+boxers
+boxer-up
+boxes
+boxfish
+boxfishes
+Boxford
+boxful
+boxfuls
+box-haul
+boxhaul
+boxhauled
+boxhauling
+boxhauls
+boxhead
+boxholder
+Boxholm
+boxiana
+boxier
+boxiest
+boxiness
+boxinesses
+boxing
+boxing-day
+boxing-in
+boxings
+boxkeeper
+box-leaved
+boxlike
+box-locking
+boxmaker
+boxmaking
+boxman
+box-nailing
+box-office
+box-plaited
+boxroom
+box-shaped
+box-strapping
+boxthorn
+boxthorns
+boxtop
+boxtops
+box-tree
+boxtree
+box-trimming
+box-turning
+boxty
+boxwallah
+boxwood
+boxwoods
+boxwork
+boxy
+Boy
+boy
+boyang
+boyar
+boyard
+boyardism
+boyardom
+boyards
+boyarism
+boyarisms
+boyars
+boyau
+boyaus
+boyaux
+Boyce
+Boyceville
+Boycey
+boychick
+boychicks
+boychik
+boychiks
+Boycie
+boycott
+boycottage
+boycotted
+boycotter
+boycotting
+boycottism
+boycotts
+Boyd
+boydekyn
+Boyden
+boydom
+Boyds
+Boydton
+Boyer
+boyer
+Boyers
+Boyertown
+Boyes
+boyfriend
+boyfriends
+boyg
+boyhood
+boyhoods
+boyish
+boyishly
+boyishness
+boyishnesses
+boyism
+Boykin
+Boykins
+boyla
+Boylan
+boylas
+Boyle
+boylike
+boylikeness
+Boylston
+boy-meets-girl
+Boyne
+Boynton
+boyo
+boyology
+boyos
+Boys
+boys
+Boyse
+boysenberries
+boysenberry
+boyship
+Boystown
+Boyt
+boyuna
+Boz
+boza
+bozal
+Bozcaada
+Bozeman
+Bozen
+bozine
+Bozman
+bozo
+Bozoo
+bozos
+Bozovich
+Bozrah
+Bozuwa
+Bozzaris
+bozze
+bozzetto
+B.P.
+B/P
+BP
+b.p.
+bp
+bp.
+BPA
+BPC
+BPDPA
+BPE
+BPetE
+BPH
+BPh
+BPharm
+B.Phil.
+BPhil
+BPI
+bpi
+BPOC
+BPOE
+BPPS
+BPS
+bps
+BPSS
+bpt
+B/R
+BR
+Br
+Br.
+br
+br.
+Bra
+bra
+Braasch
+braata
+brab
+brabagious
+Brabancon
+Brabant
+brabant
+Brabanter
+Brabantine
+Brabazon
+brabble
+brabbled
+brabblement
+brabbler
+brabblers
+brabbles
+brabbling
+brabblingly
+Brabejum
+Braca
+braca
+bracae
+braccae
+braccate
+Bracci
+braccia
+bracciale
+braccianite
+braccio
+Brace
+brace
+braced
+bracelet
+braceleted
+bracelets
+bracer
+bracero
+braceros
+bracers
+bracery
+braces
+Braceville
+Bracey
+brach
+brache
+Brachelytra
+brachelytrous
+bracherer
+brachering
+braches
+brachet
+brachets
+brachia
+brachial
+brachialgia
+brachialis
+brachials
+Brachiata
+brachiate
+brachiated
+brachiating
+brachiation
+brachiator
+brachiferous
+brachigerous
+Brachinus
+brachio-
+brachio-cephalic
+brachiocephalic
+brachiocrural
+brachiocubital
+brachiocyllosis
+brachiofacial
+brachiofaciolingual
+brachioganoid
+Brachioganoidei
+brachiolaria
+brachiolarian
+brachiopod
+Brachiopoda
+brachiopode
+brachiopodist
+brachiopodous
+brachioradial
+brachioradialis
+brachiorrhachidian
+brachiorrheuma
+brachiosaur
+Brachiosaurus
+brachiosaurus
+brachiostrophosis
+brachiotomy
+brachisto-
+brachistocephali
+brachistocephalic
+brachistocephalous
+brachistocephaly
+brachistochrone
+brachistochronic
+brachistochronous
+brachium
+brachman
+brachs
+brachtmema
+brachy-
+brachyaxis
+brachycardia
+brachycatalectic
+brachycephal
+brachycephales
+brachycephali
+brachycephalic
+brachycephalies
+brachycephalism
+brachycephalization
+brachycephalize
+brachycephalous
+brachycephaly
+Brachycera
+brachyceral
+brachyceric
+brachycerous
+brachychronic
+brachycnemic
+Brachycome
+brachycranial
+brachycranic
+brachycrany
+brachydactyl
+brachydactylia
+brachydactylic
+brachydactylism
+brachydactylous
+brachydactyly
+brachydiagonal
+brachydodrome
+brachydodromous
+brachydomal
+brachydomatic
+brachydome
+brachydont
+brachydontism
+brachyfacial
+brachyglossal
+brachygnathia
+brachygnathism
+brachygnathous
+brachygrapher
+brachygraphic
+brachygraphical
+brachygraphy
+brachyhieric
+brachylogies
+brachylogy
+brachymetropia
+brachymetropic
+Brachyoura
+brachyphalangia
+Brachyphyllum
+brachypinacoid
+brachypinacoidal
+brachypleural
+brachypnea
+brachypodine
+brachypodous
+brachyprism
+brachyprosopic
+brachypterous
+brachypyramid
+brachyrrhinia
+brachysclereid
+brachyskelic
+brachysm
+brachystaphylic
+Brachystegia
+brachystochrone
+Brachystomata
+brachystomatous
+brachystomous
+brachytic
+brachytmema
+brachytypous
+Brachyura
+brachyural
+brachyuran
+brachyuranic
+brachyure
+brachyurous
+Brachyurus
+bracing
+bracingly
+bracingness
+bracings
+braciola
+braciolas
+braciole
+bracioles
+brack
+brackebuschite
+bracked
+Brackely
+bracken
+brackened
+Brackenridge
+brackens
+bracker
+bracket
+bracketed
+bracketing
+brackets
+Brackett
+bracketted
+Brackettville
+bracketwise
+bracking
+brackish
+brackishness
+brackmard
+Bracknell
+Brackney
+bracky
+Bracon
+braconid
+Braconidae
+braconids
+braconniere
+bracozzo
+bract
+bractea
+bracteal
+bracteate
+bracted
+bracteiform
+bracteolate
+bracteole
+bracteose
+bractless
+bractlet
+bractlets
+bracts
+Brad
+brad
+Bradan
+bradawl
+bradawls
+Bradbury
+Bradburya
+bradded
+bradding
+Braddock
+Braddyville
+Brade
+Braden
+bradenhead
+Bradenton
+Bradenville
+Bradeord
+Brader
+Bradford
+Bradfordsville
+Bradlee
+Bradleianism
+Bradleigh
+Bradley
+Bradleyville
+Bradly
+bradmaker
+Bradman
+Bradner
+Bradney
+bradoon
+bradoons
+brads
+Bradshaw
+Bradski
+bradsot
+Bradstreet
+Bradway
+Bradwell
+Brady
+brady-
+bradyacousia
+bradyauxesis
+bradyauxetic
+bradyauxetically
+bradycardia
+bradycardic
+bradycauma
+bradycinesia
+bradycrotic
+bradydactylia
+bradyesthesia
+bradyglossia
+bradykinesia
+bradykinesis
+bradykinetic
+bradykinin
+bradylalia
+bradylexia
+bradylogia
+bradynosus
+bradypepsia
+bradypepsy
+bradypeptic
+bradyphagia
+bradyphasia
+bradyphemia
+bradyphrasia
+bradyphrenia
+bradypnea
+bradypnoea
+bradypod
+bradypode
+Bradypodidae
+bradypodoid
+Bradypus
+bradyseism
+bradyseismal
+bradyseismic
+bradyseismical
+bradyseismism
+bradyspermatism
+bradysphygmia
+bradystalsis
+bradyteleocinesia
+bradyteleokinesis
+bradytelic
+bradytely
+bradytocia
+bradytrophic
+bradyuria
+Bradyville
+brae
+braeface
+braehead
+braeman
+braes
+braeside
+Braeunig
+Brag
+brag
+Braga
+bragas
+Bragdon
+Brage
+brager
+Bragg
+braggadocian
+braggadocianism
+Braggadocio
+braggadocio
+braggadocios
+braggardism
+braggart
+braggartism
+braggartly
+braggartry
+braggarts
+braggat
+bragged
+bragger
+braggers
+braggery
+braggest
+bragget
+braggier
+braggiest
+bragging
+braggingly
+braggish
+braggishly
+braggite
+braggle
+Braggs
+braggy
+Bragi
+bragi
+bragite
+bragless
+bragly
+bragozzo
+brags
+braguette
+bragwort
+Braham
+Brahe
+Brahear
+Brahm
+brahm
+Brahma
+brahma
+brahmachari
+Brahmahood
+Brahmaic
+Brahmajnana
+Brahmaloka
+Brahman
+brahman
+Brahmana
+Brahmanaspati
+Brahmanda
+Brahmanee
+Brahmaness
+Brahmanhood
+Brahmani
+Brahmanic
+Brahmanical
+Brahmanis
+Brahmanism
+brahmanism
+Brahmanist
+brahmanist
+Brahmanistic
+brahmanists
+Brahmanize
+Brahmans
+brahmans
+Brahmany
+brahmapootra
+Brahmaputra
+brahmas
+Brahmi
+Brahmic
+brahmic
+Brahmin
+brahmin
+brahminee
+Brahminic
+Brahminical
+Brahminism
+brahminism
+Brahminist
+brahminist
+brahminists
+Brahmins
+brahmins
+brahmism
+Brahmoism
+Brahms
+brahms
+Brahmsian
+Brahmsite
+Brahui
+braid
+braided
+braider
+braiders
+braiding
+braidings
+Braidism
+braidism
+Braidist
+braids
+Braidwood
+braies
+brail
+Braila
+brailed
+brailing
+Braille
+braille
+Brailled
+brailled
+brailler
+brailles
+Braillewriter
+braillewriter
+Brailling
+brailling
+Braillist
+Brailowsky
+brails
+brain
+brainache
+Brainard
+Brainardsville
+brain-begot
+brain-born
+brain-breaking
+brain-bred
+braincap
+braincase
+brain-child
+brainchild
+brainchildren
+brain-cracked
+braincraft
+brain-crazed
+brain-crumpled
+brain-damaged
+brained
+brainer
+Brainerd
+brainfag
+brain-fevered
+brain-fretting
+brainge
+brainier
+brainiest
+brainily
+braininess
+braining
+brain-injured
+brainish
+brainless
+brainlessly
+brainlessness
+brainlike
+brainpan
+brainpans
+brainpower
+brain-purging
+brains
+brainsick
+brainsickly
+brainsickness
+brain-smoking
+brain-spattering
+brain-spun
+brainstem
+brainstems
+brainstone
+brainstorm
+brainstormer
+brainstorming
+brainstorms
+brain-strong
+brain-teaser
+brainteaser
+brainteasers
+brain-tire
+Braintree
+brain-trust
+brainward
+brain-wash
+brainwash
+brainwashed
+brainwasher
+brainwashers
+brainwashes
+brain-washing
+brainwashing
+brainwashjng
+brainwater
+brainwave
+brainwood
+brainwork
+brainworker
+brainy
+braird
+brairded
+brairding
+braireau
+brairo
+braise
+braised
+braises
+braising
+Braithwaite
+braize
+braizes
+brake
+brakeage
+brakeages
+braked
+brakehand
+brakehead
+brakeless
+brakeload
+brakemaker
+brakemaking
+brakeman
+brakemen
+braker
+brakeroot
+brakes
+brakesman
+brakesmen
+brake-testing
+brake-van
+brakie
+brakier
+brakiest
+braking
+Brakpan
+braky
+Brale
+braless
+Bram
+Bramah
+bramah
+Braman
+Bramante
+Bramantesque
+Bramantip
+bramantip
+bramble
+brambleberries
+brambleberry
+bramblebush
+brambled
+brambles
+bramblier
+brambliest
+brambling
+brambly
+brambrack
+brame
+Bramia
+Bramley
+Bramwell
+Bran
+bran
+Brana
+Branca
+brancard
+brancardier
+-branch
+Branch
+branch
+branchage
+branch-bearing
+branch-building
+branch-charmed
+branch-climber
+Branchdale
+branched
+branchedness
+Branchellion
+branch-embellished
+brancher
+branchery
+branches
+branchful
+branchi
+branchia
+branchiae
+branchial
+Branchiata
+branchiate
+branchicolous
+branchier
+branchiest
+branchiferous
+branchiform
+branchihyal
+branchiness
+branching
+branchings
+branchio-
+Branchiobdella
+branchiocardiac
+branchiogenous
+branchiomere
+branchiomeric
+branchiomerism
+branchiopallial
+branchiopneustic
+branchiopod
+Branchiopoda
+branchiopodan
+branchiopodous
+branchiopoo
+Branchiopulmonata
+branchiopulmonate
+branchiosaur
+Branchiosauria
+branchiosaurian
+Branchiosaurus
+branchiostegal
+branchiostegan
+branchiostege
+Branchiostegidae
+branchiostegite
+branchiostegous
+Branchiostoma
+branchiostomid
+Branchiostomidae
+branchiostomous
+Branchipodidae
+Branchipus
+branchireme
+Branchiura
+branchiurous
+Branchland
+branchless
+branchlet
+branchlike
+branchling
+branchman
+Branchport
+branch-rent
+branchstand
+branch-strewn
+Branchton
+Branchus
+Branchville
+branchway
+branchy
+Brancusi
+Brand
+brand
+brandade
+Brandais
+Brandamore
+Brande
+Brandea
+branded
+bran-deer
+Brandeis
+Branden
+Brandenburg
+Brandenburger
+brandenburgh
+brandenburgs
+Brander
+brander
+brandering
+branders
+Brandes
+brand-goose
+Brandi
+Brandice
+Brandie
+brandied
+brandies
+brandify
+branding
+brandiron
+Brandise
+brandise
+brandish
+brandished
+brandisher
+brandishers
+brandishes
+brandishing
+brandisite
+brandle
+brandless
+brandling
+brand-mark
+brand-new
+brand-newness
+Brando
+Brandon
+brandon
+Brandonville
+brandreth
+brandrith
+brands
+brandsolder
+Brandsville
+Brandt
+Brandtr
+Brandwein
+Brandy
+brandy
+brandyball
+brandy-bottle
+brandy-burnt
+brandy-faced
+brandying
+brandyman
+Brandyn
+brandy-pawnee
+Brandywine
+brandywine
+Branen
+Branford
+Branger
+brangle
+brangled
+branglement
+brangler
+brangling
+Brangus
+Branguses
+Branham
+branial
+Braniff
+brank
+brankie
+brankier
+brankiest
+brank-new
+branks
+brank-ursine
+brankursine
+branky
+branle
+branles
+branned
+branner
+brannerite
+branners
+bran-new
+brannier
+branniest
+brannigan
+branniness
+branning
+Brannon
+branny
+Brans
+brans
+Branscum
+Bransford
+bransle
+bransles
+bransolder
+Branson
+Branstock
+Brant
+brant
+Branta
+brantail
+brantails
+brantcorn
+Brantford
+brant-fox
+Branting
+Brantingham
+brantle
+Brantley
+brantness
+brants
+Brantsford
+Brantwood
+branular
+Branwen
+Braque
+braquemard
+brarow
+bras
+Brasca
+bras-dessus-bras-dessous
+Braselton
+brasen
+Brasenia
+brasero
+braseros
+brash
+Brashear
+brasher
+brashes
+brashest
+brashier
+brashiest
+brashiness
+brashly
+brashness
+brashy
+Brasia
+brasier
+brasiers
+Brasil
+brasil
+brasilein
+brasilete
+brasiletto
+Brasilia
+brasilia
+brasilin
+brasilins
+brasils
+Brasov
+brasque
+brasqued
+brasquing
+Brass
+brass
+brassage
+brassages
+brassard
+brassards
+brass-armed
+brassart
+brassarts
+brassate
+Brassavola
+brass-bold
+brassbound
+brassbounder
+brass-browed
+brass-cheeked
+brass-colored
+brasse
+brassed
+brasser
+brasserie
+brasseries
+brasses
+brasset
+brassey
+brass-eyed
+brasseys
+brass-finishing
+brass-fitted
+brass-footed
+brass-fronted
+brass-handled
+brass-headed
+brass-hilted
+brass-hooved
+Brassia
+brassic
+Brassica
+brassica
+Brassicaceae
+brassicaceous
+brassicas
+brassidic
+brassie
+brassier
+brassiere
+brassieres
+brassies
+brassiest
+brassily
+brassiness
+brassing
+brassish
+brasslike
+brass-lined
+brass-melting
+brass-mounted
+Brasso
+brass-plated
+brass-renting
+brass-shapen
+brass-smith
+brass-tipped
+Brasstown
+brass-visaged
+brassware
+brasswork
+brassworker
+brass-working
+brassworks
+brassy
+brassylic
+brast
+Braswell
+BRAT
+brat
+bratchet
+Brathwaite
+Bratianu
+bratina
+Bratislava
+bratling
+brats
+bratstva
+bratstvo
+brattach
+Brattain
+brattice
+bratticed
+bratticer
+brattices
+bratticing
+brattie
+brattier
+brattiest
+brattiness
+brattish
+brattishing
+brattle
+Brattleboro
+brattled
+brattles
+brattling
+Bratton
+bratty
+Bratwurst
+bratwurst
+Brauhaus
+Brauhauser
+braula
+Braun
+brauna
+Brauneberger
+Brauneria
+Braunfels
+braunite
+braunites
+Braunschweig
+Braunschweiger
+braunschweiger
+Braunstein
+Brauronia
+Brauronian
+Brause
+Brautlied
+Brava
+brava
+bravade
+bravado
+bravadoed
+bravadoes
+bravadoing
+bravadoism
+bravados
+Bravar
+bravas
+brave
+braved
+bravehearted
+brave-horsed
+brave-looking
+bravely
+brave-minded
+braveness
+braver
+braveries
+bravers
+bravery
+braves
+brave-sensed
+brave-showing
+brave-souled
+brave-spirited
+brave-spiritedness
+bravest
+bravi
+Bravin
+braving
+bravish
+bravissimo
+bravo
+bravoed
+bravoes
+bravoing
+bravoite
+bravos
+bravura
+bravuraish
+bravuras
+bravure
+braw
+brawer
+brawest
+brawl
+brawled
+brawler
+brawlers
+Brawley
+brawlie
+brawlier
+brawliest
+brawling
+brawlingly
+brawlis
+brawls
+brawlsome
+brawly
+brawlys
+brawn
+brawned
+brawnedness
+Brawner
+brawner
+brawnier
+brawniest
+brawnily
+brawniness
+brawns
+brawny
+braws
+braxies
+Braxton
+braxy
+Bray
+bray
+braye
+brayed
+brayer
+brayera
+brayerin
+brayers
+brayette
+braying
+Brayley
+Braymer
+Braynard
+brays
+braystone
+Brayton
+Braz
+Braz.
+braza
+brazas
+braze
+Brazeau
+brazed
+Brazee
+brazee
+braze-jointed
+brazen
+brazen-barking
+brazen-browed
+brazen-clawed
+brazen-colored
+brazened
+brazen-face
+brazenface
+brazen-faced
+brazenfaced
+brazen-facedly
+brazenfacedly
+brazenfacedness
+brazen-fisted
+brazen-floored
+brazen-footed
+brazen-fronted
+brazen-gated
+brazen-headed
+brazen-hilted
+brazen-hoofed
+brazen-imaged
+brazening
+brazen-leaved
+brazen-lunged
+brazenly
+brazen-mailed
+brazen-mouthed
+brazenness
+brazennesses
+brazen-pointed
+brazens
+brazer
+brazera
+brazers
+brazes
+brazier
+braziers
+braziery
+Brazil
+brazil
+brazilein
+brazilette
+braziletto
+Brazilian
+brazilian
+brazilianite
+brazilians
+brazilin
+brazilins
+brazilite
+Brazil-nut
+brazils
+brazilwood
+brazing
+Brazoria
+Brazos
+Brazzaville
+BRC
+BRCA
+B.R.C.S.
+BRCS
+BRE
+Bre
+Brea
+breach
+breached
+breacher
+breachers
+breaches
+breachful
+breaching
+breachy
+bread
+bread-and-butter
+bread-baking
+bread-basket
+breadbasket
+breadbaskets
+breadberry
+breadboard
+breadboards
+breadbox
+breadboxes
+bread-corn
+bread-crumb
+bread-crumbing
+bread-cutting
+breadearner
+breadearning
+bread-eating
+breaded
+breaden
+bread-faced
+bread-fruit
+breadfruit
+breadfruits
+breading
+breadless
+breadlessness
+breadline
+bread-liner
+breadmaker
+breadmaking
+breadman
+breadness
+breadnut
+breadnuts
+breadroot
+breads
+breadseller
+bread-stitch
+breadstitch
+bread-stuff
+breadstuff
+breadstuffs
+breadth
+breadthen
+breadthless
+breadthriders
+breadths
+breadthways
+breadthwise
+bread-tree
+bread-winner
+breadwinner
+breadwinners
+breadwinning
+bread-wrapping
+breaghe
+break
+break-
+breakability
+breakable
+breakableness
+breakables
+breakably
+breakage
+breakages
+breakaway
+breakax
+breakaxe
+break-back
+breakback
+breakbone
+breakbones
+break-circuit
+break-down
+breakdown
+breakdowns
+breaker
+breaker-down
+breakerman
+breakermen
+breaker-off
+breakers
+breaker-up
+break-even
+breakfast
+breakfasted
+breakfaster
+breakfasters
+breakfasting
+breakfastless
+breakfasts
+break-front
+breakfront
+breakfronts
+break-in
+breaking
+breaking-in
+breakings
+breakless
+breaklist
+break-neck
+breakneck
+break-off
+breakoff
+breakout
+breakouts
+breakover
+breakpoint
+breakpoints
+break-promise
+Breaks
+breaks
+breakshugh
+breakstone
+break-through
+breakthrough
+breakthroughes
+breakthroughs
+break-up
+breakup
+breakups
+breakwater
+breakwaters
+breakweather
+breakwind
+Bream
+bream
+breamed
+breaming
+breams
+Breana
+Breanne
+Brear
+breards
+breast
+breastband
+breast-beam
+breastbeam
+breast-beater
+breast-beating
+breast-board
+breastbone
+breastbones
+breast-deep
+Breasted
+breasted
+breaster
+breastfast
+breast-fed
+breast-feed
+breast-feeding
+breastfeeding
+breastful
+breastheight
+breast-high
+breast-hook
+breasthook
+breastie
+breasting
+breastless
+breastmark
+breastpiece
+breastpin
+breast-plate
+breastplate
+breastplates
+breast-plough
+breastplough
+breastplow
+breastrail
+breast-rending
+breastrope
+breasts
+breaststroke
+breaststroker
+breaststrokes
+breastsummer
+breastweed
+breast-wheel
+breastwise
+breastwood
+breastwork
+breastworks
+breath
+breathability
+breathable
+breathableness
+breathalyse
+Breathalyzer
+breath-bereaving
+breath-blown
+breathe
+breatheableness
+breathed
+breather
+breathers
+breathes
+breathful
+breath-giving
+breathier
+breathiest
+breathily
+breathiness
+breathing
+breathingly
+Breathitt
+breathless
+breathlessly
+breathlessness
+breaths
+breathseller
+breath-stopping
+breath-sucking
+breath-tainted
+breath-taking
+breathtaking
+breathtakingly
+breathy
+breba
+Breban
+Brebner
+breccia
+breccial
+breccias
+brecciate
+brecciated
+brecciating
+brecciation
+brecham
+brechams
+brechan
+brechans
+Brecher
+Brechites
+Brecht
+brecht
+Brechtel
+brechtian
+brecia
+breck
+brecken
+Breckenridge
+Breckinridge
+Brecknockshire
+Brecksville
+Brecon
+Breconshire
+Bred
+bred
+Breda
+bredbergite
+brede
+bredes
+bredestitch
+bredi
+bred-in-the-bone
+bredstitch
+Bree
+bree
+Breech
+breech
+breechblock
+breechcloth
+breechcloths
+breechclout
+breeched
+breeches
+breechesflower
+breechesless
+breeching
+breechless
+breech-loader
+breechloader
+breech-loading
+breechloading
+Breed
+breed
+breedable
+breedbate
+Breeden
+breeder
+breeders
+breediness
+Breeding
+breeding
+breedings
+breedling
+breeds
+Breedsville
+breedy
+breek
+breekless
+breeks
+breekums
+Breen
+Breena
+breenge
+breenger
+brees
+Breese
+Breesport
+Breeze
+breeze
+breeze-borne
+breezed
+breeze-fanned
+breezeful
+breezeless
+breeze-lifted
+breezelike
+breezes
+breeze-shaken
+breeze-swept
+breezeway
+breezeways
+Breezewood
+breeze-wooing
+breezier
+breeziest
+breezily
+breeziness
+breezing
+breezy
+Bregenz
+Breger
+bregma
+bregmata
+bregmate
+bregmatic
+brehon
+brehonia
+brehonship
+brei
+Breinigsville
+breird
+Breislak
+breislakite
+Breithablik
+breithauptite
+brekkle
+brekky
+brelan
+brelaw
+Brelje
+breloque
+brember
+Bremble
+breme
+bremely
+Bremen
+bremeness
+Bremer
+Bremerhaven
+Bremerton
+Bremia
+Bremond
+Bremser
+bremsstrahlung
+Bren
+bren
+Brena
+Brenan
+Brenda
+Brendan
+brended
+Brendel
+Brenden
+brendice
+Brendin
+Brendis
+Brendon
+Brengun
+Brenham
+Brenk
+Brenn
+Brenna
+brennage
+Brennan
+Brennen
+Brenner
+Brennschluss
+brennschluss
+brens
+Brent
+brent
+Brentano
+Brentford
+Brenthis
+brent-new
+Brenton
+brents
+Brentt
+Brentwood
+Brenza
+brephic
+brepho-
+br'er
+brerd
+brere
+Bres
+Brescia
+Brescian
+Bresee
+Breshkovsky
+Breskin
+Breslau
+Bress
+bressomer
+Bresson
+bressummer
+Brest
+brest
+Bret
+bret
+Bretagne
+bretelle
+bretesse
+bret-full
+breth
+brethel
+brethren
+brethrenism
+Breton
+breton
+Bretonian
+bretons
+Bretschneideraceae
+Brett
+brett
+Bretta
+brettice
+Bretwalda
+bretwalda
+Bretwaldadom
+Bretwaldaship
+Bretz
+breu-
+Breuer
+Breugel
+Breughel
+breunnerite
+brev
+breva
+Brevard
+breve
+breves
+brevet
+brevetcies
+brevetcy
+brevete
+breveted
+breveting
+brevets
+brevetted
+brevetting
+brevi
+brevi-
+breviaries
+breviary
+breviate
+breviature
+brevicauda
+brevicaudate
+brevicipitid
+Brevicipitidae
+brevicomis
+breviconic
+brevier
+breviers
+brevifoliate
+breviger
+brevilingual
+breviloquence
+breviloquent
+breviped
+brevipen
+brevipennate
+breviradiate
+brevirostral
+brevirostrate
+Brevirostrines
+brevis
+brevit
+brevities
+brevity
+Brew
+brew
+brewage
+brewages
+brewed
+Brewer
+brewer
+breweries
+brewers
+brewership
+Brewerton
+brewery
+brewhouse
+brewhouses
+brewing
+brewings
+brewis
+brewises
+brewmaster
+brews
+brewst
+Brewster
+brewster
+brewsterite
+Brewton
+Brey
+brey
+Brezhnev
+brezhnev
+Brezin
+BRG
+BRI
+Bria
+Brian
+brian
+Briana
+Briand
+Brianhead
+Brianna
+Brianne
+Briano
+Briant
+briar
+briarberry
+Briard
+briard
+briards
+Briarean
+briared
+Briareus
+briareus
+briar-hopper
+briarroot
+briars
+briarwood
+briary
+bribability
+bribable
+bribe
+bribeability
+bribeable
+bribed
+bribe-devouring
+bribee
+bribees
+bribe-free
+bribegiver
+bribegiving
+bribeless
+bribemonger
+briber
+briberies
+bribers
+bribery
+bribes
+bribetaker
+bribetaking
+bribeworthy
+bribing
+Bribri
+bric-a-brac
+bric-a-brackery
+Brice
+Bricelyn
+Briceville
+brichen
+brichette
+Brick
+brick
+brick-barred
+brickbat
+brickbats
+brickbatted
+brickbatting
+brick-bound
+brick-building
+brick-built
+brick-burning
+brick-colored
+brickcroft
+brick-cutting
+brick-drying
+brick-dust
+brick-earth
+bricked
+brickel
+bricken
+Bricker
+bricker
+Brickeys
+brick-field
+brickfield
+brickfielder
+brick-fronted
+brick-grinding
+brick-hemmed
+brickhood
+brickier
+brickiest
+bricking
+brickish
+brick-kiln
+brickkiln
+bricklay
+bricklayer
+bricklayers
+bricklaying
+bricklayings
+brickle
+brickleness
+brickles
+bricklike
+brickliner
+bricklining
+brickly
+brickmaker
+brickmaking
+brickmason
+brick-nogged
+brick-paved
+brick-red
+brickred
+bricks
+brickset
+bricksetter
+brick-testing
+bricktimber
+bricktop
+brickwall
+brick-walled
+brickwise
+brickwork
+bricky
+brickyard
+bricole
+bricoles
+brid
+bridal
+bridale
+bridaler
+bridally
+bridals
+bridalty
+Bridalveil
+Bride
+bride
+bride-ale
+bridebed
+bridebowl
+bridecake
+bridechamber
+bride-cup
+bridecup
+bridegod
+bridegroom
+bridegrooms
+bridegroomship
+bridehead
+bridehood
+bridehouse
+brideknot
+bride-lace
+bridelace
+brideless
+bridelike
+bridelope
+bridely
+bridemaid
+bridemaiden
+bridemaidship
+brideman
+brides
+brideship
+bridesmaid
+bridesmaiding
+bridesmaids
+bridesman
+bridesmen
+bridestake
+bride-to-be
+bridewain
+brideweed
+bridewell
+bridewort
+Bridey
+Bridge
+bridge
+bridgeable
+bridgeables
+bridgeboard
+bridgebote
+bridgebuilder
+bridgebuilding
+bridged
+Bridgehampton
+bridgehead
+bridgeheads
+bridge-house
+bridgekeeper
+Bridgeland
+bridgeless
+bridgelike
+bridgemaker
+bridgemaking
+bridgeman
+bridgemaster
+bridgemen
+Bridgeport
+bridgeport
+bridgepot
+Bridger
+bridger
+Bridges
+bridges
+Bridget
+bridgetin
+Bridgeton
+Bridgetown
+bridgetree
+Bridgette
+Bridgeville
+bridgewall
+bridgeward
+bridgewards
+Bridgewater
+bridgewater
+bridgeway
+bridgework
+Bridgid
+bridging
+bridgings
+Bridgman
+Bridgton
+Bridgwater
+Bridie
+bridie
+bridle
+bridled
+bridleless
+bridleman
+bridler
+bridlers
+bridles
+bridle-wise
+bridlewise
+bridling
+bridoon
+bridoons
+Bridport
+Bridwell
+Brie
+brie
+BRIEF
+brief
+briefcase
+briefcases
+briefed
+briefer
+briefers
+briefest
+briefing
+briefings
+briefless
+brieflessly
+brieflessness
+briefly
+briefness
+briefnesses
+briefs
+Brielle
+Brien
+Brier
+brier
+brierberry
+briered
+Brierfield
+brierroot
+briers
+brierwood
+briery
+bries
+Brieta
+Brietta
+Brieux
+brieve
+Brig
+Brig.
+brig
+brigade
+brigaded
+brigades
+brigadier
+brigadiers
+brigadiership
+brigading
+brigalow
+brigand
+brigandage
+brigander
+brigandine
+brigandish
+brigandishly
+brigandism
+brigands
+Brigantes
+Brigantia
+Brigantine
+brigantine
+brigantinebrigantines
+brigantines
+brigatry
+brigbote
+Brigette
+brigetty
+Brigg
+Briggs
+Briggsdale
+Briggsian
+Briggsville
+Brigham
+Brighella
+Brighid
+Brighouse
+Bright
+bright
+bright-bloomed
+bright-cheeked
+bright-colored
+bright-dyed
+brighten
+brightened
+brightener
+brighteners
+brightening
+brightens
+brighter
+brightest
+bright-eyed
+Brighteyes
+brighteyes
+bright-faced
+bright-featured
+bright-field
+bright-flaming
+bright-haired
+bright-headed
+bright-hued
+brightish
+bright-leaved
+brightly
+Brightman
+bright-minded
+brightness
+brightnesses
+Brighton
+bright-robed
+brights
+brightsmith
+brightsome
+brightsomeness
+bright-spotted
+bright-striped
+bright-studded
+bright-tinted
+Brightwaters
+bright-witted
+Brightwood
+brightwork
+Brigid
+Brigida
+Brigit
+Brigitta
+Brigitte
+Brigittine
+brigous
+brig-rigged
+brigs
+brigsail
+brigue
+brigued
+briguer
+briguing
+Brihaspati
+brike
+Brill
+brill
+brillante
+Brillat-Savarin
+brilliance
+brilliances
+brilliancies
+brilliancy
+brilliandeer
+Brilliant
+brilliant
+brilliant-cut
+brilliantine
+brilliantined
+brilliantly
+brilliantness
+brilliants
+brilliantwise
+brilliolette
+Brillion
+brillolette
+Brillouin
+brills
+brim
+brimborion
+brimborium
+Brimfield
+brimful
+brimfull
+brimfullness
+brimfully
+brimfulness
+Brimhall
+briming
+brimless
+Brimley
+brimly
+brimmed
+brimmer
+brimmered
+brimmering
+brimmers
+brimmimg
+brimming
+brimmingly
+Brimo
+brims
+brimse
+Brimson
+brimstone
+brimstones
+brimstonewort
+brimstony
+brin
+Brina
+brince
+brinded
+Brindell
+Brindisi
+brindisi
+Brindle
+brindle
+brindled
+brindles
+brindlish
+Brine
+brine
+brine-bound
+brine-cooler
+brine-cooling
+brined
+brine-dripping
+brinehouse
+brineless
+brineman
+brine-pumping
+briner
+briners
+brines
+brine-soaked
+Briney
+Bring
+bring
+bringal
+bringall
+bringdown
+bringed
+bringela
+bringer
+bringers
+bringer-up
+bringeth
+Bringhurst
+bringing
+bringing-up
+brings
+bringsel
+brinie
+brinier
+brinies
+briniest
+brininess
+brininesses
+brining
+brinish
+brinishness
+brinjal
+brinjaree
+brinjarries
+brinjarry
+brinjaul
+Brinje
+Brink
+brink
+Brinkema
+brinkless
+Brinkley
+Brinklow
+brinkmanship
+brinks
+brinksmanship
+Brinktown
+Brinn
+Brinna
+Brinnon
+brinny
+brins
+brinsell
+Brinsmade
+Brinson
+brinston
+Briny
+briny
+brio
+brioche
+brioches
+briolet
+briolette
+briolettes
+Brion
+Brioni
+brionies
+brionine
+briony
+brios
+Brioschi
+brique
+briquet
+briquets
+briquette
+briquetted
+briquettes
+briquetting
+bris
+brisa
+brisance
+brisances
+brisant
+Brisbane
+brisbane
+Brisbin
+Briscoe
+briscola
+brise
+Briseis
+briseis
+brisement
+brises
+brise-soleil
+Briseus
+Brisingamen
+brisk
+brisked
+brisken
+briskened
+briskening
+brisker
+briskest
+brisket
+briskets
+brisking
+briskish
+briskly
+briskness
+brisknesses
+brisks
+brisky
+brisling
+brislings
+brisque
+briss
+brisses
+Brissotin
+Brissotine
+brist
+bristle
+bristlebird
+bristlecone
+bristled
+bristle-faced
+bristle-grass
+bristleless
+bristlelike
+bristlemouth
+bristlemouths
+bristle-pointed
+bristler
+bristles
+bristle-stalked
+bristletail
+bristle-tailed
+bristle-thighed
+bristle-toothed
+bristlewort
+bristlier
+bristliest
+bristliness
+bristling
+bristly
+Bristo
+Bristol
+bristol
+bristols
+Bristolville
+Bristow
+brisure
+Brit
+Brit.
+brit
+Brita
+Britain
+britain
+Britannia
+britannia
+Britannian
+Britannic
+britannic
+Britannica
+britannica
+Britannically
+Britannicus
+britany
+britchel
+britches
+britchka
+brite
+Brith
+brith
+brither
+Briticism
+briticism
+British
+british
+Britisher
+britisher
+britishers
+Britishhood
+Britishism
+British-israel
+Britishly
+Britishness
+Britney
+Britni
+Brito-icelandic
+Britomartis
+Briton
+briton
+Britoness
+britons
+brits
+britska
+britskas
+Britt
+britt
+Britta
+Brittain
+Brittan
+Brittaney
+Brittani
+Brittany
+Britte
+Britten
+britten
+Britteny
+brittle
+brittlebush
+brittled
+brittlely
+brittleness
+brittler
+brittles
+brittlest
+brittle-star
+brittlestem
+brittlewood
+brittlewort
+brittling
+brittly
+Brittne
+Brittnee
+Brittney
+Brittni
+Britton
+Brittonic
+brittonic
+britts
+britzka
+britzkas
+britzska
+britzskas
+Brix
+Brixey
+Briza
+briza
+Brize
+Brizo
+brizz
+BRL
+brl
+BRM
+BRN
+Brnaba
+Brnaby
+Brno
+Bro
+bro
+broach
+broached
+broacher
+broachers
+broaches
+broaching
+Broad
+broad
+broadacre
+Broadalbin
+broad-arrow
+broadax
+broad-axe
+broadaxe
+broadaxes
+broad-backed
+broadband
+broad-based
+broad-beamed
+Broadbent
+broadbill
+broad-billed
+broad-bladed
+broad-blown
+broad-bodied
+broad-bosomed
+broad-bottomed
+broad-boughed
+broad-bowed
+broad-breasted
+Broadbrim
+broad-brim
+broadbrim
+broad-brimmed
+Broadbrook
+broad-built
+broadcast
+broadcasted
+broadcaster
+broadcasters
+broadcasting
+broadcastings
+broadcasts
+broad-chested
+broad-chinned
+broadcloth
+broadcloths
+broad-crested
+Broaddus
+broad-eared
+broaden
+broadened
+broadener
+broadeners
+broadening
+broadenings
+broadens
+broader
+broadest
+broad-eyed
+broad-faced
+broad-flapped
+Broadford
+broad-fronted
+broad-gage
+broadgage
+broad-gaged
+broad-gauge
+broad-gauged
+broad-guage
+broad-handed
+broadhead
+broad-headed
+broadhearted
+broad-hoofed
+broadhorn
+broad-horned
+broadish
+broad-jump
+Broadlands
+Broadleaf
+broadleaf
+broad-leafed
+broad-leaved
+broadleaves
+broad-limbed
+broadling
+broadlings
+broad-lipped
+broad-listed
+broadloom
+broadlooms
+broadly
+broad-margined
+broad-minded
+broad-mindedly
+broadmindedly
+broad-mindedness
+Broadmoor
+broadmouth
+broad-mouthed
+broadness
+broadnesses
+broad-nosed
+broad-piece
+broadpiece
+broad-ribbed
+broad-roomed
+Broadrun
+Broads
+broads
+broad-set
+broadshare
+broadsheet
+broad-shouldered
+broadside
+broadsided
+broadsider
+broadsides
+broadsiding
+broad-skirted
+broad-souled
+broad-spectrum
+broad-spoken
+broadspread
+broad-spreading
+broad-sterned
+broad-striped
+broadsword
+broadswords
+broadtail
+broad-tailed
+broad-thighed
+broadthroat
+broad-tired
+broad-toed
+broad-toothed
+Broadus
+Broadview
+Broadwater
+Broadway
+broadway
+broad-wayed
+Broadwayite
+broadways
+Broadwell
+broad-wheeled
+broadwife
+broad-winged
+broadwise
+broadwives
+brob
+Brobdingnag
+brobdingnag
+Brobdingnagian
+brobdingnagian
+Broca
+brocade
+brocaded
+brocades
+brocading
+brocage
+brocard
+brocardic
+brocatel
+brocatelle
+brocatello
+brocatels
+Broccio
+broccoli
+broccolis
+broch
+brochan
+brochant
+brochantite
+broche
+brochette
+brochettes
+brochidodromous
+brocho
+brochophony
+brocht
+brochure
+brochures
+Brock
+brock
+brockage
+brockages
+brocked
+Brocken
+Brocket
+brocket
+brockets
+brock-faced
+Brockie
+brockish
+brockle
+Brocklin
+Brockport
+brocks
+Brockton
+Brockway
+Brockwell
+Brocky
+brocoli
+brocolis
+Brocton
+Brod
+brod
+brodder
+Broddie
+broddle
+Broddy
+brodee
+brodeglass
+Brodehurst
+brodekin
+Brodench
+brodequin
+Broder
+broderer
+Broderic
+Broderick
+broderie
+Brodeur
+Brodhead
+Brodheadsville
+Brodiaea
+Brodie
+brodie
+Brodnax
+Brodsky
+Brody
+brodyaga
+brodyagi
+broeboe
+Broeder
+Broederbond
+Broek
+Broeker
+brog
+Brogan
+brogan
+brogans
+brogger
+broggerite
+broggle
+brogh
+Brogle
+Broglie
+Brogue
+brogue
+brogued
+brogueful
+brogueneer
+broguer
+brogueries
+broguery
+brogues
+broguing
+broguish
+Brohard
+Brohman
+broid
+Broida
+broiden
+broider
+broidered
+broiderer
+broideress
+broideries
+broidering
+broiders
+broidery
+broigne
+broil
+broiled
+broiler
+broilers
+broilery
+broiling
+broilingly
+broils
+Brok
+brokage
+brokages
+Brokaw
+broke
+broken
+broken-arched
+broken-backed
+broken-bellied
+Brokenbow
+broken-check
+broken-down
+broken-ended
+broken-footed
+broken-fortuned
+broken-handed
+broken-headed
+broken-hearted
+brokenhearted
+broken-heartedly
+brokenheartedly
+broken-heartedness
+brokenheartedness
+broken-hipped
+broken-hoofed
+broken-in
+broken-kneed
+broken-legged
+brokenly
+broken-minded
+broken-mouthed
+brokenness
+broken-nosed
+broken-paced
+broken-record
+broken-shanked
+broken-spirited
+broken-winded
+broken-winged
+broker
+brokerage
+brokerages
+brokered
+brokeress
+brokerly
+brokers
+brokership
+brokery
+brokes
+broking
+broletti
+broletto
+brolga
+broll
+brollies
+brolly
+brolly-hop
+Brom
+brom-
+broma
+bromacetanilide
+bromacetate
+bromacetic
+bromacetone
+bromal
+bromalbumin
+bromals
+bromamide
+bromargyrite
+bromate
+bromated
+bromates
+bromating
+bromatium
+bromatology
+bromaurate
+bromauric
+brombenzamide
+brombenzene
+brombenzyl
+Bromberg
+bromcamphor
+bromcresol
+Brome
+brome
+bromegrass
+bromeigon
+Bromeikon
+bromeikon
+Bromelia
+Bromeliaceae
+bromeliaceous
+bromeliad
+bromelin
+bromelins
+bromellite
+bromeosin
+bromes
+bromethyl
+bromethylene
+Bromfield
+bromgelatin
+bromhidrosis
+bromhydrate
+bromhydric
+Bromian
+bromic
+bromid
+bromide
+bromides
+bromidic
+bromidically
+bromidrosiphobia
+bromidrosis
+bromids
+bromin
+brominate
+brominated
+brominating
+bromination
+bromindigo
+bromine
+bromines
+brominism
+brominize
+bromins
+bromiodide
+Bromios
+bromisation
+bromise
+bromised
+bromising
+bromism
+bromisms
+bromite
+Bromius
+bromization
+bromize
+bromized
+bromizer
+bromizes
+bromizing
+Bromleigh
+Bromley
+bromlite
+bromo
+bromo-
+bromoacetone
+bromoaurate
+bromoaurates
+bromoauric
+bromobenzene
+bromobenzyl
+bromocamphor
+bromochloromethane
+bromochlorophenol
+bromocresol
+bromocyanid
+bromocyanidation
+bromocyanide
+bromocyanogen
+bromodeoxyuridine
+bromoethylene
+bromoform
+bromogelatin
+bromohydrate
+bromohydrin
+bromoil
+bromoiodid
+bromoiodide
+bromoiodism
+bromoiodized
+bromoketone
+bromol
+bromomania
+bromomenorrhea
+bromomethane
+bromometric
+bromometrical
+bromometrically
+bromometry
+bromonaphthalene
+bromophenol
+bromopicrin
+bromopikrin
+bromopnea
+bromoprotein
+bromos
+bromothymol
+bromouracil
+bromous
+bromphenol
+brompicrin
+Bromsgrove
+bromthymol
+bromuret
+Bromus
+bromvoel
+bromvogel
+bromyrite
+Bron
+Bronaugh
+bronc
+bronch-
+bronchadenitis
+bronchi
+bronchia
+bronchial
+bronchially
+bronchiarctia
+bronchiectasis
+bronchiectatic
+bronchiloquy
+bronchio-
+bronchiocele
+bronchiocrisis
+bronchiogenic
+bronchiolar
+bronchiole
+bronchioles
+bronchioli
+bronchiolitis
+bronchiolus
+bronchiospasm
+bronchiostenosis
+bronchitic
+bronchitis
+bronchium
+broncho
+broncho-
+bronchoadenitis
+bronchoalveolar
+bronchoaspergillosis
+bronchoblennorrhea
+bronchobuster
+bronchocavernous
+bronchocele
+bronchocephalitis
+bronchoconstriction
+bronchoconstrictor
+bronchodilatation
+bronchodilator
+bronchoegophony
+bronchoesophagoscopy
+bronchogenic
+bronchographic
+bronchography
+bronchohemorrhagia
+broncholemmitis
+broncholith
+broncholithiasis
+bronchomotor
+bronchomucormycosis
+bronchomycosis
+bronchopathy
+bronchophonic
+bronchophony
+bronchophthisis
+bronchoplasty
+bronchoplegia
+bronchopleurisy
+bronchopneumonia
+bronchopneumonic
+bronchopulmonary
+bronchorrhagia
+bronchorrhaphy
+bronchorrhea
+bronchos
+bronchoscope
+bronchoscopic
+bronchoscopically
+bronchoscopist
+Bronchoscopy
+bronchoscopy
+bronchospasm
+bronchostenosis
+bronchostomies
+bronchostomy
+bronchotetany
+bronchotome
+bronchotomist
+bronchotomy
+bronchotracheal
+bronchotyphoid
+bronchotyphus
+bronchovesicular
+bronchus
+bronco
+broncobuster
+broncobusters
+broncobusting
+broncos
+broncs
+Bronder
+Bronez
+brongniardite
+Bronislaw
+Bronk
+bronk
+Bronnie
+Bronny
+Bronson
+Bronston
+bronstrops
+Bront
+Bronte
+Bronteana
+bronteon
+brontephobia
+Brontes
+Brontesque
+bronteum
+brontide
+brontides
+brontogram
+brontograph
+brontolite
+brontolith
+brontology
+brontometer
+brontophobia
+Brontops
+brontops
+brontosaur
+brontosauri
+brontosaurs
+Brontosaurus
+brontosaurus
+brontosauruses
+brontoscopy
+brontothere
+Brontotherium
+Brontozoum
+Bronwen
+Bronwood
+Bronwyn
+Bronx
+bronx
+Bronxite
+Bronxville
+bronze
+bronze-bearing
+bronze-bound
+bronze-brown
+bronze-casting
+bronze-clad
+bronze-colored
+bronze-covered
+bronzed
+bronze-foreheaded
+bronze-gilt
+bronze-gleaming
+bronze-golden
+bronze-haired
+bronzelike
+bronzen
+bronze-purple
+bronzer
+bronzers
+bronzes
+bronze-shod
+bronzesmith
+bronzewing
+bronze-winged
+bronze-yellow
+bronzier
+bronziest
+bronzify
+bronzine
+bronzing
+bronzings
+Bronzino
+bronzite
+bronzitite
+bronzy
+broo
+brooch
+brooched
+brooches
+brooching
+brood
+brooded
+brooder
+brooders
+broodier
+broodiest
+broodily
+broodiness
+brooding
+broodingly
+broodless
+broodlet
+broodling
+broodmare
+broods
+broodsac
+broody
+Brook
+brook
+brookable
+Brookdale
+Brooke
+brooked
+Brookeland
+Brooker
+Brookes
+Brookesmith
+Brookeville
+Brookfield
+brookflower
+Brookhaven
+Brookhouse
+brookie
+brookier
+brookiest
+Brooking
+brooking
+Brookings
+brookite
+brookites
+Brookland
+Brooklandville
+Brooklawn
+brookless
+Brooklet
+brooklet
+brooklets
+brooklike
+brooklime
+Brooklin
+Brookline
+brookline
+Brooklyn
+brooklyn
+Brooklynese
+Brooklynite
+Brookneal
+Brookner
+Brookport
+Brooks
+brooks
+Brookshire
+brookside
+Brookston
+Brooksville
+Brookton
+Brooktondale
+Brookview
+Brookville
+brookweed
+Brookwood
+brooky
+brool
+broom
+Broomall
+broomball
+broomballer
+broombush
+broomcorn
+Broome
+broomed
+broomer
+Broomfield
+broomier
+broomiest
+brooming
+broom-leaved
+broommaker
+broommaking
+broomrape
+broomroot
+brooms
+broom-sewing
+broomshank
+broomsquire
+broomstaff
+broomstick
+broomsticks
+broomstraw
+broomtail
+broomweed
+broomwood
+broomwort
+broomy
+broon
+Broonzy
+broos
+broose
+Brooten
+broozled
+broquery
+broquineer
+Bros
+bros
+bros.
+Brose
+brose
+Broseley
+broses
+Brosimum
+Brosine
+brosot
+brosse
+Brost
+Brosy
+brosy
+brot
+brotan
+brotany
+brotchen
+Brote
+Broteas
+brotel
+broth
+brothe
+brothel
+brotheler
+brothellike
+brothelry
+brothels
+Brother
+brother
+brothered
+brother-german
+brotherhood
+brotherhoods
+brother-in-arms
+brothering
+brother-in-law
+brotherless
+brotherlike
+brotherliness
+brotherlinesses
+brotherly
+brotherred
+Brothers
+brothers
+brothership
+brothers-in-law
+Brotherson
+Brotherton
+brotherwort
+brothier
+brothiest
+broths
+brothy
+brotocrystal
+Brott
+brott
+Brottman
+Brotula
+brotula
+brotulid
+Brotulidae
+brotuliform
+Broucek
+brouette
+brough
+brougham
+brougham-landaulet
+broughams
+brought
+broughta
+broughtas
+Broughton
+brouhaha
+brouhahas
+brouille
+brouillon
+Broun
+Broussard
+Broussonetia
+Brout
+Brouwer
+brouze
+brow
+browache
+Browallia
+browallia
+browband
+browbands
+browbeat
+browbeaten
+browbeater
+browbeating
+browbeats
+brow-bent
+browbound
+browd
+browden
+Browder
+browed
+Brower
+Browerville
+browet
+browis
+browless
+browman
+Brown
+brown
+brown-armed
+brownback
+brown-backed
+brown-banded
+brown-barreled
+brown-bearded
+brown-berried
+brown-colored
+brown-complexioned
+Browne
+browned
+browned-off
+Brownell
+browner
+brownest
+brown-eyed
+brown-faced
+Brownfield
+brown-green
+brown-haired
+brown-headed
+Brownian
+brownian
+Brownie
+brownie
+brownier
+brownies
+browniest
+browniness
+Browning
+browning
+Browningesque
+brownish
+brownishness
+brownish-red
+brownish-yellow
+Brownism
+brownism
+Brownist
+Brownistic
+Brownistical
+brown-leaved
+Brownlee
+Brownley
+brown-locked
+brownly
+brownness
+brown-nose
+brownnose
+brown-nosed
+brown-noser
+brownnoser
+brown-nosing
+brownout
+brownouts
+brownprint
+brown-purple
+brown-red
+brown-roofed
+Browns
+browns
+brown-sailed
+Brownsboro
+Brownsburg
+Brownsdale
+brownshirt
+brown-skinned
+brown-sleeve
+Brownson
+brown-spotted
+brown-state
+brown-stemmed
+brownstone
+brownstones
+Brownstown
+brown-strained
+Brownsville
+browntail
+brown-tailed
+Brownton
+browntop
+Browntown
+Brownville
+brown-washed
+brownweed
+Brownwood
+brownwort
+browny
+browpiece
+browpost
+brows
+browsability
+browsage
+browse
+browsed
+browser
+browsers
+browses
+browsick
+browsing
+browst
+brow-wreathed
+browzer
+Broxton
+Broz
+Brozak
+brr
+brrr
+BRS
+BRT
+bruang
+Bruant
+Brubaker
+Brubeck
+brubru
+brubu
+Bruce
+bruce
+Brucella
+brucella
+brucellae
+brucellas
+brucellosis
+Bruceton
+Brucetown
+Bruceville
+Bruch
+bruchid
+Bruchidae
+Bruchus
+bruchus
+brucia
+Brucie
+brucin
+brucina
+brucine
+brucines
+brucins
+brucite
+bruckle
+bruckled
+bruckleness
+Bruckner
+Bructeri
+Bruegel
+Brueghel
+Bruell
+bruet
+Brufsky
+Bruges
+bruges
+Brugge
+brugh
+brughs
+brugnatellite
+Bruhn
+Bruin
+bruin
+Bruington
+bruins
+Bruis
+bruise
+bruised
+bruiser
+bruisers
+bruises
+bruisewort
+bruising
+bruisingly
+bruit
+bruited
+bruiter
+bruiters
+bruiting
+bruits
+bruja
+brujas
+brujeria
+brujo
+brujos
+bruke
+Brule
+brule
+brulee
+brules
+brulot
+brulots
+brulyie
+brulyiement
+brulyies
+brulzie
+brulzies
+brum
+Brumaire
+brumaire
+brumal
+Brumalia
+brumbee
+brumbie
+brumbies
+brumby
+brume
+brumes
+Brumidi
+Brumley
+Brummagem
+brummagem
+brummagen
+Brummell
+brummer
+Brummie
+brummy
+brumous
+brumstane
+brumstone
+Brunanburh
+brunch
+brunched
+brunches
+brunching
+brunch-word
+Brundidge
+Brundisium
+brune
+Bruneau
+Brunei
+Brunel
+brunel
+Brunell
+Brunella
+Brunelle
+Brunelleschi
+Brunellesco
+Brunellia
+Brunelliaceae
+brunelliaceous
+Bruner
+brunet
+Brunetiere
+brunetness
+brunets
+brunette
+brunetteness
+brunettes
+Brunfelsia
+Brunhild
+brunhild
+Brunhilda
+Brunhilde
+Bruni
+Bruning
+brunion
+brunissure
+Brunistic
+brunizem
+brunizems
+Brunk
+Brunn
+brunneous
+Brunner
+Brunnhilde
+Brunnichia
+Bruno
+Brunonia
+Brunoniaceae
+Brunonian
+brunonian
+Brunonism
+Bruns
+Brunson
+Brunsville
+Brunswick
+brunswick
+brunt
+brunts
+Brusa
+bruscha
+bruscus
+Brusett
+Brush
+brush
+brushability
+brushable
+brushback
+brushball
+brushbird
+brush-breaking
+brushbush
+brushcut
+brushed
+brusher
+brusher-off
+brushers
+brusher-up
+brushes
+brushet
+brush-fire
+brushfire
+brushfires
+brush-footed
+brushful
+brushier
+brushiest
+brushiness
+brushing
+brushite
+brushland
+brushless
+brushlessness
+brushlet
+brushlike
+brushmaker
+brushmaking
+brushman
+brushmen
+brush-off
+brushoff
+brushoffs
+brushpopper
+brushproof
+brush-shaped
+brush-tail
+brush-tailed
+Brushton
+brush-tongued
+brush-treat
+brushup
+brushups
+brushwood
+brushwork
+brushy
+brusk
+brusker
+bruskest
+bruskly
+bruskness
+Brusly
+brusque
+brusquely
+brusqueness
+brusquer
+brusquerie
+brusquest
+Brussel
+brussel
+Brussels
+brussels
+brustle
+brustled
+brustling
+brusure
+Brut
+brut
+Bruta
+brutage
+brutal
+brutalisation
+brutalise
+brutalised
+brutalising
+brutalism
+brutalist
+brutalitarian
+brutalitarianism
+brutalities
+brutality
+brutalization
+brutalize
+brutalized
+brutalizes
+brutalizing
+brutally
+brutalness
+brute
+bruted
+brutedom
+brutelike
+brutely
+bruteness
+brutes
+brutification
+brutified
+brutifies
+brutify
+brutifying
+bruting
+brutish
+brutishly
+brutishness
+brutism
+brutisms
+brutter
+Brutus
+brutus
+Bruxelles
+bruxism
+bruxisms
+bruyere
+Bruyeres
+Bruyn
+bruzz
+bry-
+Bryaceae
+bryaceous
+Bryales
+Bryan
+bryan
+Bryana
+Bryanism
+Bryanite
+Bryansk
+Bryant
+Bryanthus
+Bryantown
+Bryantsville
+Bryantville
+Bryanty
+Bryce
+Bryceland
+Bryceville
+Bryn
+Bryna
+Brynathyn
+bryndza
+Bryner
+Brynhild
+brynhild
+Brynmawr
+Brynn
+Brynna
+Brynne
+Brynza
+brynza
+bryogenin
+bryological
+bryologies
+bryologist
+bryology
+Bryon
+bryon
+Bryonia
+bryonia
+bryonidin
+bryonies
+bryonin
+bryony
+Bryophyllum
+Bryophyta
+bryophyta
+bryophyte
+bryophytes
+bryophytic
+Bryozoa
+bryozoa
+bryozoan
+bryozoans
+bryozoon
+bryozoum
+brys-
+Bryson
+Brython
+brython
+Brythonic
+brythonic
+Bryum
+Brzegiem
+B.S.
+B/S
+BS
+b.s.
+b/s
+bs
+BSA
+BSAA
+BSAdv
+BSAE
+BSAeE
+BSAgE
+BSAgr
+BSArch
+BSArchE
+BSArchEng
+BSBA
+BSBH
+BSBus
+BSBusMgt
+B.Sc.
+BSC
+BSc
+BSCE
+BSCh
+BSChE
+BSchMusic
+BSCM
+BSCom
+B-scope
+BSCP
+BSD
+BSDes
+BSDHyg
+BSE
+BSEc
+BSEd
+BSEE
+BSEEngr
+BSElE
+BSEM
+BSEng
+BSEP
+BSES
+BSF
+bsf
+BSFM
+BSFMgt
+BSFS
+BSFT
+BSGE
+BSGeNEd
+BSGeolE
+BSGMgt
+BSGph
+bsh
+BSHA
+B-shaped
+BSHE
+BSHEc
+BSHEd
+BSHyg
+BSI
+BSIE
+BSIndEd
+BSIndEngr
+BSIndMgt
+BSIR
+BSIT
+BSJ
+bskt
+BSL
+Bs/L
+BSLabRel
+BSLArch
+BSLM
+BSLS
+BSM
+BSME
+BSMedTech
+BSMet
+BSMetE
+BSMin
+BSMT
+BSMTP
+BSMusEd
+BSN
+BSNA
+BSO
+BSOC
+BSOrNHort
+BSOT
+BSP
+BSPA
+BSPE
+BSPH
+BSPhar
+BSPharm
+BSPHN
+BSPhTh
+BSPT
+BSRec
+BSRet
+BSRFS
+BSRT
+B.S.S.
+BSS
+BSSA
+BSSc
+BSSE
+BSSS
+BST
+BSTIE
+BSTJ
+BSTrans
+BSW
+BT
+Bt
+Bt.
+bt
+BTAM
+BTCh
+BTE
+BTh
+BTHU
+BThU
+btise
+BTL
+btl
+btl.
+BTN
+BTO
+BTOL
+btry
+btry.
+BTS
+B.T.U.
+BTU
+Btu
+btu
+BTW
+B-type
+BU
+Bu
+bu
+bu.
+BuAer
+bual
+buat
+Buatti
+buaze
+Bub
+bub
+buba
+bubal
+bubale
+bubales
+bubaline
+Bubalis
+bubalis
+bubalises
+Bubalo
+bubals
+bubas
+Bubastid
+Bubastite
+Bubb
+Bubba
+bubba
+bubber
+bubbies
+bubble
+bubble-and-squeak
+bubble-bow
+bubblebow
+bubbled
+bubbleless
+bubblelike
+bubblement
+bubbler
+bubblers
+bubbles
+bubbletop
+bubbletops
+bubblier
+bubblies
+bubbliest
+bubbliness
+bubbling
+bubblingly
+bubblish
+bubbly
+bubbly-jock
+bubby
+bubbybush
+Bube
+Buber
+bubinga
+bubingas
+Bubo
+bubo
+buboed
+buboes
+Bubona
+bubonalgia
+bubonic
+Bubonidae
+bubonocele
+bubonoceze
+bubos
+bubs
+bubukle
+Bucaramanga
+bucare
+bucayo
+bucca
+buccal
+buccally
+buccan
+buccaned
+buccaneer
+buccaneering
+buccaneerish
+buccaneers
+buccaning
+buccanned
+buccanning
+buccaro
+buccate
+Buccellarius
+bucchero
+buccheros
+buccin
+buccina
+buccinae
+buccinal
+buccinator
+buccinatory
+Buccinidae
+bucciniform
+buccinoid
+Buccinum
+buccinum
+Bucco
+buccobranchial
+buccocervical
+buccogingival
+buccolabial
+buccolingual
+bucconasal
+Bucconidae
+Bucconinae
+buccopharyngeal
+buccula
+bucculae
+Bucculatrix
+Bucelas
+Bucella
+bucellas
+bucentaur
+bucentur
+Bucephala
+Bucephalus
+bucephalus
+Buceros
+Bucerotes
+Bucerotidae
+Bucerotinae
+Buch
+Buchalter
+Buchan
+Buchanan
+buchanan
+Buchanite
+Bucharest
+bucharest
+Buchbinder
+Buchenwald
+Bucher
+Buchheim
+buchite
+Buchloe
+Buchman
+Buchmanism
+Buchmanite
+Buchner
+Buchnera
+buchnerite
+buchonite
+Buchtel
+buchu
+Buchwald
+Buck
+buck
+buck-and-wing
+buckaroo
+buckaroos
+buckass
+Buckatunna
+buckayro
+buckayros
+buck-bean
+buckbean
+buckbeans
+buckberry
+buckboard
+buckboards
+buckbrush
+buckbush
+Buckden
+bucked
+buckeen
+buckeens
+Buckels
+bucker
+buckeroo
+buckeroos
+buckers
+bucker-up
+bucket
+bucketed
+bucketeer
+bucketer
+bucket-eyed
+bucketful
+bucketfull
+bucketfuls
+bucketing
+bucketmaker
+bucketmaking
+bucketman
+buckets
+bucketsful
+bucket-shaped
+bucket-shop
+bucketshop
+buckety
+buck-eye
+buckeye
+buck-eyed
+buckeyed
+buckeyes
+Buckeystown
+Buckfield
+Buckhannon
+Buckhead
+Buckholts
+buck-horn
+buckhorn
+buck-hound
+buckhound
+buckhounds
+Buckie
+buckie
+bucking
+Buckingham
+Buckinghamshire
+buckish
+buckishly
+buckishness
+buckism
+buck-jump
+buckjump
+buckjumper
+Buckland
+buckland
+bucklandite
+Buckle
+buckle
+buckle-beggar
+buckled
+buckleless
+Buckler
+buckler
+bucklered
+buckler-fern
+buckler-headed
+bucklering
+bucklers
+buckler-shaped
+buckles
+Buckley
+Buckleya
+Bucklin
+buckling
+bucklum
+Buckman
+buck-mast
+Bucknell
+Buckner
+bucko
+buckoes
+buck-one
+buckone
+buck-passing
+buckplate
+buckpot
+buckra
+buckram
+buckramed
+buckraming
+buckrams
+buckras
+Bucks
+bucks
+bucksaw
+bucksaws
+bucks-beard
+buckshee
+buckshees
+buck's-horn
+buck-shot
+buckshot
+buckshots
+buckskin
+buckskinned
+buckskins
+Bucksport
+buck-stall
+buckstall
+buckstay
+buckstone
+bucktail
+bucktails
+buckteeth
+buckthorn
+buck-tooth
+bucktooth
+buck-toothed
+bucktoothed
+bucktooths
+bucku
+buckwagon
+buckwash
+buckwasher
+buck-washing
+buckwashing
+buckwheat
+buckwheater
+buckwheatlike
+buckwheats
+Bucky
+bucky
+Bucoda
+bucoliast
+bucolic
+bucolical
+bucolically
+bucolicism
+Bucolics
+bucolics
+Bucolion
+Bucorvinae
+Bucorvus
+Bucovina
+bucrane
+bucrania
+bucranium
+bucrnia
+Bucure
+Bucuresti
+Bucyrus
+Bud
+bud
+Buda
+buda
+Budapest
+budapest
+budbreak
+Budd
+buddage
+buddah
+Budde
+budded
+Buddenbrooks
+budder
+budders
+Buddh
+Buddha
+buddha
+Buddha-field
+Buddhahood
+buddhahood
+Buddhaship
+buddhi
+Buddhic
+Buddhism
+buddhism
+Buddhist
+buddhist
+Buddhistic
+Buddhistical
+Buddhistically
+buddhists
+Buddhological
+Buddhology
+Buddie
+buddie
+buddied
+buddies
+Budding
+budding
+buddings
+buddle
+buddled
+Buddleia
+buddleia
+buddleias
+buddleman
+buddler
+buddles
+buddling
+Buddy
+buddy
+buddy-boy
+buddy-buddy
+buddying
+Bude
+bude
+Budennovsk
+Budenny
+Buderus
+Budge
+budge
+budge-barrel
+budged
+budger
+budgeree
+budgereegah
+budgerigah
+budgerigar
+budgerigars
+budgero
+budgerow
+budgers
+budgerygah
+budges
+Budget
+budget
+budgetary
+budgeted
+budgeteer
+budgeter
+budgeters
+budgetful
+budgeting
+budgets
+budgie
+budgies
+budging
+budgy
+Budh
+budless
+budlet
+budlike
+budling
+budmash
+Budorcas
+buds
+budtime
+Budukha
+Buduma
+Budweis
+Budweiser
+Budwig
+budwood
+budworm
+budworms
+Budworth
+budzart
+budzat
+Bueche
+Buehler
+Buehrer
+Buell
+Buellton
+Buena
+buenas
+Buenaventura
+Bueno
+bueno
+Buenos
+buenos
+Buerger
+Bueschel
+Buettneria
+Buettneriaceae
+Bueyeros
+BUF
+bufagin
+Buff
+buff
+buffa
+buffability
+buffable
+Buffalo
+buffalo
+buffaloback
+buffaloed
+buffaloes
+buffalofish
+buffalofishes
+buffalo-headed
+buffaloing
+buffalos
+buff-backed
+buffball
+buffbar
+buff-bare
+buff-breasted
+buff-citrine
+buffcoat
+buff-colored
+buffe
+buffed
+buffer
+buffered
+Bufferin
+buffering
+bufferrer
+bufferrers
+buffers
+Buffet
+buffet
+buffeted
+buffeter
+buffeters
+buffeting
+buffetings
+buffets
+buffi
+buffier
+buffiest
+buffin
+buffing
+buffle
+bufflehead
+buffle-headed
+buffleheaded
+bufflehorn
+Buffo
+buffo
+Buffon
+buffone
+buffont
+buffoon
+buffooneries
+buffoonery
+buffoonesque
+buffoonish
+buffoonishness
+buffoonism
+buffoons
+buff-orange
+buffos
+buffs
+buff-tipped
+Buffum
+buffware
+buff-washed
+Buffy
+buffy
+buff-yellow
+bufidin
+bufo
+bufonid
+Bufonidae
+bufonite
+Buford
+bufotalin
+bufotenin
+bufotenine
+bufotoxin
+Bug
+bug
+bugaboo
+bugaboos
+bugala
+bugan
+Buganda
+bugara
+Bugas
+Bugayev
+bugbane
+bugbanes
+bugbear
+bugbeardom
+bugbearish
+bugbears
+Bugbee
+bugbite
+bugdom
+bugeye
+bug-eyed
+bugeyed
+bug-eyes
+bugeyes
+bugfish
+buggane
+bugged
+bugger
+buggered
+buggeries
+buggering
+buggers
+buggery
+buggess
+buggier
+buggies
+buggiest
+bugginess
+bugging
+buggy
+buggyman
+buggymen
+bughead
+bughouse
+bughouses
+bught
+Bugi
+Buginese
+Buginvillaea
+bug-juice
+bugle
+bugled
+bugle-horn
+bugler
+buglers
+bugles
+buglet
+bugle-weed
+bugleweed
+buglewort
+bugling
+bugloss
+buglosses
+bugologist
+bugology
+bugong
+bugout
+bugproof
+bugre
+bugs
+bugseed
+bugseeds
+bugsha
+bugshas
+bugweed
+bug-word
+bugwort
+Buhl
+buhl
+buhlbuhl
+Buhler
+buhls
+buhlwork
+buhlworks
+buhr
+buhrmill
+buhrs
+buhrstone
+Bui
+Buia
+buibui
+Buick
+buick
+buicks
+build
+buildable
+builded
+builder
+builders
+building
+buildingless
+buildings
+buildress
+builds
+build-up
+buildup
+buildups
+built
+built-in
+builtin
+built-up
+Buine
+buirdly
+Buiron
+Buisson
+buisson
+buist
+Buitenzorg
+Bujumbura
+Buka
+Bukat
+Bukavu
+Buke
+Bukeyef
+bukh
+Bukhara
+Bukharin
+Bukidnon
+Bukittinggi
+bukk-
+Bukovina
+bukshee
+bukshi
+Bukum
+Bul
+bul
+bul.
+Bula
+Bulacan
+bulak
+Bulan
+Bulanda
+Bulawayo
+bulb
+bulbaceous
+bulbar
+bulbed
+bulbel
+bulbels
+bulbier
+bulbiest
+bulbiferous
+bulbiform
+bulbil
+Bulbilis
+bulbilla
+bulbils
+bulbine
+bulbless
+bulblet
+bulblets
+bulblike
+bulbo-
+bulbocapnin
+bulbocapnine
+bulbocavernosus
+bulbocavernous
+Bulbochaete
+Bulbocodium
+bulbomedullary
+bulbomembranous
+bulbonuclear
+Bulbophyllum
+bulborectal
+bulbose
+bulbospinal
+bulbotuber
+bulbo-urethral
+bulbourethral
+bulbous
+bulbously
+bulbous-rooted
+bulbs
+bulb-tee
+bulbul
+bulbule
+bulbuls
+bulbus
+bulby
+bulchin
+bulder
+Bulfinch
+Bulg
+Bulg.
+Bulganin
+Bulgar
+bulgar
+Bulgari
+Bulgaria
+bulgaria
+Bulgarian
+bulgarian
+bulgarians
+Bulgaric
+Bulgarophil
+Bulge
+bulge
+bulged
+Bulger
+bulger
+bulgers
+bulges
+bulgier
+bulgiest
+bulginess
+bulging
+bulgingly
+bulgur
+bulgurs
+bulgy
+bulies
+bulimia
+bulimiac
+bulimias
+bulimic
+bulimiform
+bulimoid
+Bulimulidae
+Bulimus
+bulimus
+bulimy
+bulk
+bulkage
+bulkages
+bulked
+bulker
+bulkhead
+bulkheaded
+bulkheading
+bulkheads
+bulkier
+bulkiest
+bulkily
+bulkin
+bulkiness
+bulking
+bulkish
+bulk-pile
+bulks
+bulky
+Bull
+bull
+bull-
+bull.
+bulla
+bullace
+bullaces
+bullae
+bullalaria
+bullamacow
+bullan
+Bullard
+bullaria
+bullaries
+bullarium
+bullary
+bullate
+bullated
+bullation
+bullback
+bull-bait
+bull-baiter
+bull-baiting
+bullbaiting
+bullbat
+bullbats
+bull-bearing
+bull-beggar
+bullbeggar
+bullberry
+bullbird
+bull-bitch
+bullboat
+bull-bragging
+bull-browed
+bullcart
+bullcomber
+bull-dog
+bulldog
+bulldogged
+bulldoggedness
+bulldogger
+bulldogging
+bulldoggish
+bulldoggishly
+bulldoggishness
+bulldoggy
+bulldogism
+bulldogs
+bull-dose
+bulldoze
+bulldozed
+bulldozer
+bulldozers
+bulldozes
+bulldozing
+bulldust
+bulled
+Bullen
+bullen-bullen
+Buller
+buller
+bullescene
+bullet
+bulleted
+bullet-head
+bullethead
+bulletheaded
+bulletheadedness
+bullet-hole
+bulletin
+bulletined
+bulleting
+bulletining
+bulletins
+bulletless
+bulletlike
+bulletmaker
+bulletmaking
+bulletproof
+bulletproofed
+bulletproofing
+bulletproofs
+bullets
+bulletwood
+bullety
+Bulley
+bull-faced
+bullfeast
+bullfice
+bull-fight
+bullfight
+bullfighter
+bullfighters
+bullfighting
+bullfights
+bullfinch
+bullfinches
+bullfist
+bullflower
+bullfoot
+bull-frog
+bullfrog
+bullfrogs
+bull-fronted
+bullgine
+bull-god
+bull-grip
+bullhead
+bull-headed
+bullheaded
+bullheadedly
+bullheadedness
+bullheads
+bullhide
+bullhoof
+bull-horn
+bullhorn
+bullhorns
+Bullialdus
+Bullidae
+bullied
+bullier
+bullies
+bulliest
+bulliform
+bullimong
+bulling
+Bullion
+bullion
+bullionism
+bullionist
+bullionless
+bullions
+Bullis
+bullish
+bullishly
+bullishness
+bullism
+bullit
+bullition
+Bullitt
+Bullivant
+bull-like
+bulllike
+bull-man
+bull-mastiff
+bull-mouthed
+bullneck
+bull-necked
+bullnecked
+bullnecks
+bullnose
+bull-nosed
+bullnoses
+bullnut
+Bullock
+bullock
+bullocker
+Bullockite
+bullockman
+bullocks
+bullock's-heart
+bullocky
+Bullom
+bullose
+Bullough
+bullous
+bullpates
+bullpen
+bullpens
+bullpoll
+bullpout
+bullpouts
+Bullpup
+bullpup
+bullragged
+bullragging
+bullring
+bullrings
+bull-roarer
+bullroarer
+bull-roaring
+bull-run
+bull-running
+bullrush
+bullrushes
+bulls
+bull's-eye
+bullseye
+bull's-eyed
+bull's-eyes
+bullshit
+bullshits
+bullshitted
+bullshitting
+Bullshoals
+bullshot
+bullshots
+bullskin
+bullsnake
+bullsticker
+bullsucker
+bullswool
+bull-terrier
+bullterrier
+bulltoad
+bull-tongue
+bull-tongued
+bull-tonguing
+bull-trout
+bullule
+Bullville
+bull-voiced
+bullweed
+bullweeds
+bull-whack
+bullwhack
+bullwhacker
+bull-whip
+bullwhip
+bullwhipped
+bullwhipping
+bullwhips
+bullwork
+bullwort
+Bully
+bully
+bullyable
+bullyboy
+bullyboys
+bullydom
+bullyhuff
+bullying
+bullyingly
+bullyism
+bully-off
+bullyrag
+bullyragged
+bullyragger
+bullyragging
+bullyrags
+bully-rock
+bullyrock
+bullyrook
+Bulmer
+bulnbuln
+Bulolo
+Bulow
+Bulpitt
+bulreedy
+bulrush
+bulrushes
+bulrushlike
+bulrushy
+bulse
+bult
+bultell
+bulten
+bulter
+bultey
+Bultman
+Bultmann
+bultong
+bultow
+bulwand
+bulwark
+bulwarked
+bulwarking
+bulwarks
+Bulwer
+Bulwer-Lytton
+Bum
+bum
+bum-
+bumaloe
+bumaree
+bumbailiff
+bumbailiffship
+bumbard
+bumbarge
+bumbass
+bumbaste
+bumbaze
+bumbee
+bumbelo
+bumbershoot
+bumble
+bumble-bee
+bumblebee
+bumblebeefish
+bumblebeefishes
+bumblebees
+bumbleberry
+bumblebomb
+bumbled
+Bumbledom
+bumbledom
+bumblefoot
+bumblekite
+bumble-puppy
+bumblepuppy
+bumbler
+bumblers
+bumbles
+bumbling
+bumblingly
+bumblingness
+bumblings
+bumbo
+bumboat
+bumboatman
+bumboatmen
+bumboats
+bumboatwoman
+bumclock
+Bumelia
+bumf
+bumfeg
+bumfs
+bumfuzzle
+Bumgardner
+bumicky
+bumkin
+bumkins
+bummack
+bummalo
+bummalos
+bummaree
+bummed
+bummel
+bummer
+bummerish
+bummers
+bummery
+bummest
+bummie
+bummil
+bumming
+bummle
+bummler
+bummock
+bump
+bumped
+bumpee
+bumper
+bumpered
+bumperette
+bumpering
+bumpers
+bumph
+bumphs
+bumpier
+bumpiest
+bumpily
+bumpiness
+bumping
+bumpingly
+bumping-off
+bumpity
+bumpkin
+bumpkinet
+bumpkinish
+bumpkinly
+bumpkins
+bump-off
+bumpoff
+bumpology
+bumps
+bump-start
+bumpsy
+bumptious
+bumptiously
+bumptiousness
+bumpy
+bums
+bumsucking
+bumtrap
+bumwood
+bun
+Buna
+buna
+Bunaea
+buncal
+Bunce
+bunce
+Bunceton
+Bunch
+bunch
+bunch-backed
+bunchbacked
+bunchberries
+bunchberry
+Bunche
+bunched
+buncher
+bunches
+bunchflower
+bunchier
+bunchiest
+bunchily
+bunchiness
+bunching
+bunch-word
+bunchy
+bunco
+buncoed
+buncoing
+Buncombe
+buncombe
+buncombes
+buncos
+Bund
+bund
+Bunda
+Bundaberg
+Bundahish
+Bunde
+Bundeli
+Bundelkhand
+Bunder
+bunder
+Bundesrat
+Bundesrath
+Bundestag
+bundh
+bundies
+Bundist
+bundist
+bundists
+bundle
+bundled
+bundler
+bundle-rooted
+bundlerooted
+bundlers
+bundles
+bundlet
+bundling
+bundlings
+bundobust
+bundoc
+bundocks
+bundook
+Bundoora
+bunds
+bundt
+bundts
+Bundu
+bundu
+bundweed
+Bundy
+bundy
+bunemost
+bung
+Bunga
+bungaloid
+bungalow
+bungalows
+bungarum
+Bungarus
+bunged
+bungee
+bunger
+bungerly
+bungey
+bungfu
+bung-full
+bungfull
+bunghole
+bungholes
+bunging
+bungle
+bungled
+bungler
+bunglers
+bungles
+bunglesome
+bungling
+bunglingly
+bunglings
+bungmaker
+bungo
+bungos
+bungs
+bungstarter
+bungtown
+bungwall
+bungy
+Bunia
+Bunin
+Buninahua
+bunion
+bunions
+bunjara
+bunji-bunji
+bunk
+bunked
+Bunker
+bunker
+bunkerage
+bunkered
+bunkering
+bunkerman
+bunkermen
+bunkers
+Bunkerville
+bunkery
+bunkhouse
+bunkhouses
+Bunkie
+bunkie
+bunking
+bunkload
+bunkmate
+bunkmates
+bunko
+bunkoed
+bunkoing
+bunkos
+bunks
+bunkum
+bunkums
+Bunky
+bunky
+Bunn
+bunn
+Bunnell
+bunnell
+Bunni
+bunnia
+Bunnie
+bunnies
+bunning
+Bunns
+bunns
+Bunny
+bunny
+bunnymouth
+bunodont
+Bunodonta
+Bunola
+bunolophodont
+Bunomastodontidae
+bunoselenodont
+Bunow
+bunraku
+bunrakus
+buns
+Bunsen
+bunsen
+bunsenite
+bunt
+buntal
+bunted
+Bunter
+bunter
+bunters
+buntine
+Bunting
+bunting
+buntings
+buntline
+buntlines
+bunton
+bunts
+bunty
+Bunuel
+bunuelo
+Bunus
+bunya
+bunya-bunya
+bunyah
+Bunyan
+bunyan
+Bunyanesque
+bunyas
+bunyip
+Bunyoro
+buonamani
+buonamano
+Buonaparte
+Buonarroti
+Buonomo
+Buononcini
+Buote
+buoy
+buoyage
+buoyages
+buoyance
+buoyances
+buoyancies
+buoyancy
+buoyant
+buoyantly
+buoyantness
+buoyed
+buoyed-up
+buoying
+buoys
+buoy-tender
+Buphaga
+Buphagus
+Buphonia
+buphthalmia
+buphthalmic
+buphthalmos
+Buphthalmum
+bupleurol
+Bupleurum
+buplever
+buprestid
+Buprestidae
+buprestidan
+Buprestis
+buprestis
+buqsha
+buqshas
+BUR
+Bur
+Bur.
+bur
+bura
+Burack
+Buran
+buran
+burans
+burao
+Buraq
+Buras
+buras
+Burayan
+Buraydah
+Burbage
+Burbank
+burbank
+burbankian
+Burbankism
+burbark
+Burberries
+Burberry
+burberry
+burble
+burbled
+burbler
+burblers
+burbles
+burblier
+burbliest
+burbling
+burbly
+burbolt
+burbot
+burbots
+burbs
+burbush
+Burch
+Burchard
+Burchett
+Burchfield
+Burck
+Burckhardt
+Burd
+burd
+burd-alone
+burdalone
+burdash
+Burdelle
+burden
+burdenable
+burdened
+burdener
+burdeners
+burdening
+burdenless
+burdenous
+burdens
+burdensome
+burdensomely
+burdensomeness
+Burdett
+Burdette
+Burdick
+burdie
+burdies
+Burdigalian
+Burdine
+burdock
+burdocks
+burdon
+burds
+Bure
+bure
+bureau
+bureaucracies
+bureaucracy
+bureaucrat
+bureaucratese
+bureaucratic
+bureaucratical
+bureaucratically
+bureaucratism
+bureaucratist
+bureaucratization
+bureaucratize
+bureaucratized
+bureaucratizes
+bureaucratizing
+bureaucrats
+bureaus
+bureaux
+burel
+burelage
+burele
+burelle
+burelly
+burely
+Buren
+buret
+burets
+burette
+burettes
+burez
+burfish
+Burford
+Burfordville
+Burg
+burg
+burga
+burgage
+burgages
+burgality
+burgall
+burgamot
+burganet
+Burgas
+burgau
+burgaudine
+Burgaw
+burg-bryce
+burge
+burgee
+burgees
+Burgener
+Burgenland
+burgensic
+burgeon
+burgeoned
+burgeoning
+burgeons
+Burger
+burger
+burgers
+Burgess
+burgess
+burgessdom
+burgesses
+burgess-ship
+Burget
+Burgettstown
+burggrave
+burgh
+burghal
+burghal-penny
+burghalpenny
+burghbote
+burghemot
+burgh-english
+burgher
+burgherage
+burgherdom
+burgheress
+burgherhood
+burgheristh
+burghermaster
+burghers
+burghership
+Burghley
+burghmaster
+burghmoot
+burghmote
+burghs
+Burgin
+burglar
+burglaries
+burglarious
+burglariously
+burglarise
+burglarised
+burglarising
+burglarize
+burglarized
+burglarizes
+burglarizing
+burglarproof
+burglarproofed
+burglarproofing
+burglarproofs
+burglars
+burglary
+burgle
+burgled
+burgles
+burgling
+burgomaster
+burgomasters
+burgomastership
+burgonet
+burgonets
+burgoo
+Burgoon
+burgoos
+Burgos
+burgout
+burgouts
+Burgoyne
+burgoyne
+burgrave
+burgraves
+burgraviate
+burgs
+burgul
+burgullian
+Burgundian
+burgundian
+Burgundies
+burgundies
+Burgundy
+burgundy
+burgus
+burgware
+Burgwell
+burgwere
+burh
+Burhans
+burhead
+burhel
+Burhinidae
+Burhinus
+burhmoot
+Buri
+buri
+buriable
+burial
+burial-ground
+burial-place
+burials
+burian
+Buriat
+buried
+buriels
+burier
+buriers
+buries
+burin
+burinist
+burins
+burion
+buriti
+Burk
+burk
+burka
+Burkburnett
+Burke
+burke
+burked
+burkei
+burker
+burkers
+burkes
+Burkesville
+Burket
+Burkett
+Burkettsville
+Burkeville
+burkha
+Burkhard
+Burkhardt
+Burkhart
+burking
+burkite
+burkites
+Burkitt
+Burkittsville
+Burkle
+Burkley
+burkundauze
+burkundaz
+Burkville
+Burl
+burl
+burlace
+burladero
+burlap
+burlaps
+burlecue
+burled
+Burleigh
+burler
+burlers
+burlesk
+burlesks
+Burleson
+burlesque
+burlesqued
+burlesquely
+burlesquer
+burlesques
+burlesquing
+burlet
+burletta
+Burley
+burley
+burleycue
+burleys
+Burlie
+burlier
+burlies
+burliest
+burlily
+burliness
+burling
+Burlingame
+Burlingham
+Burlington
+Burlison
+burls
+burly
+burly-boned
+burly-faced
+burly-headed
+Burma
+burma
+Burman
+Burmannia
+Burmanniaceae
+burmanniaceous
+Burmans
+Burmese
+burmese
+burmite
+Burmo-chinese
+Burn
+burn
+burn-
+Burna
+burnable
+Burnaby
+Burnard
+burn-beat
+burnbeat
+Burne
+burned
+burned-out
+burned-over
+Burne-Jones
+Burner
+burner
+burner-off
+burners
+Burnet
+burnet
+burnetize
+burnets
+Burnett
+burnettize
+burnettized
+burnettizing
+Burnettsville
+burnewin
+Burney
+Burneyville
+burnfire
+Burnham
+Burnie
+burnie
+burniebee
+burnies
+Burnight
+burning
+burning-bush
+burning-glass
+burningly
+burnings
+burning-wood
+Burnips
+burnish
+burnishable
+burnished
+burnished-gold
+burnisher
+burnishers
+burnishes
+burnishing
+burnishment
+Burnley
+burn-nose
+burnoose
+burnoosed
+burnooses
+burnous
+burnoused
+burnouses
+burnout
+burnouts
+burnover
+Burns
+burns
+Burnsed
+Burnsian
+Burnside
+burnside
+burnsides
+Burnsville
+burnt
+burnt-child
+Burntcorn
+burn-the-wind
+burntly
+burntness
+burnt-out
+burnt-umber
+burnt-up
+burntweed
+burn-up
+burnup
+burnut
+burnweed
+Burnwell
+burnwood
+Burny
+burny
+buro
+Buroker
+buroo
+BURP
+burp
+burped
+burping
+burps
+Burr
+burr
+Burra
+burrah
+burras-pipe
+burratine
+burrawang
+burrbark
+burred
+burree
+bur-reed
+burrel
+burrel-fly
+Burrell
+burrel-shot
+burrer
+burrers
+burrfish
+burrfishes
+burrgrailer
+burrhead
+burrheaded
+burrheadedness
+burrhel
+burrier
+burriest
+Burrill
+burring
+burrio
+Burris
+burrish
+burrito
+burritos
+burrknot
+burro
+burro-back
+burrobrush
+burrock
+burros
+Burroughs
+burroughs
+Burrow
+burrow
+burrow-duck
+burrowed
+burroweed
+burrower
+burrowers
+burrowing
+Burrows
+burrows
+burrows-town
+burrowstown
+burr-pump
+burrs
+burr-stone
+burrstone
+Burrton
+Burrus
+burry
+burs
+Bursa
+bursa
+bursae
+bursal
+bursar
+bursarial
+bursaries
+bursars
+bursarship
+bursary
+bursas
+bursate
+bursati
+bursattee
+bursautee
+bursch
+Burschenschaft
+Burschenschaften
+burse
+bursectomy
+burseed
+burseeds
+Bursera
+bursera
+Burseraceae
+Burseraceous
+burseraceous
+burses
+bursicle
+bursiculate
+bursiform
+bursitis
+bursitises
+bursitos
+Burson
+burst
+burst-cow
+bursted
+burster
+bursters
+burstiness
+bursting
+burstone
+burstones
+bursts
+burstwort
+bursty
+bursula
+Burt
+burt
+Burta
+burthen
+burthened
+burthening
+burthenman
+burthens
+burthensome
+Burtie
+Burtis
+Burton
+burton
+burtonization
+burtonize
+burtons
+Burtonsville
+Burton-upon-Trent
+burtree
+Burtrum
+Burtt
+Burty
+burucha
+Burundi
+burundi
+burundians
+Burushaski
+Burut
+burweed
+burweeds
+Burwell
+Bury
+bury
+Buryat
+Buryats
+burying
+burying-ground
+burying-place
+burys
+BUS
+bus
+bus.
+Busaos
+busbar
+busbars
+busbies
+busboy
+busboys
+Busby
+busby
+buscarl
+buscarle
+Busch
+Buschi
+Busching
+Buseck
+bused
+busera
+buses
+Busey
+Bush
+bush
+bushbaby
+bushbashing
+bushbeater
+bushbeck
+bushbodies
+bushbody
+bushboy
+bushbuck
+bushbucks
+bushcraft
+bushed
+Bushel
+bushel
+bushelage
+bushelbasket
+busheled
+busheler
+bushelers
+bushelful
+bushelfuls
+busheling
+bushelled
+busheller
+bushelling
+bushelman
+bushelmen
+bushels
+bushelwoman
+busher
+bushers
+bushes
+bushet
+Bushey
+bush-fighter
+bushfighter
+bushfighting
+bushfire
+bushfires
+bushful
+bushgoat
+bushgoats
+bushgrass
+bush-grown
+bush-haired
+bush-hammer
+bushhammer
+bush-harrow
+bush-head
+bush-headed
+bushi
+Bushido
+bushido
+bushidos
+bushie
+bushier
+bushiest
+bushily
+bushiness
+bushing
+bushings
+Bushire
+Bushkill
+Bushland
+bushland
+bushlands
+bush-league
+bushless
+bushlet
+bushlike
+bushmaker
+bushmaking
+Bushman
+bushman
+bushmanship
+bushmaster
+bushmasters
+bushmen
+bushment
+Bushnell
+Bushongo
+Bushore
+bushpig
+bush-ranger
+bushranger
+bushranging
+bush-rope
+bushrope
+bush-shrike
+bush-skirted
+bush-tailed
+bushtit
+bushtits
+Bushton
+Bushveld
+bushveld
+bushwa
+bushwack
+bushwah
+bushwahs
+bushwalking
+bushwas
+Bushweller
+bushwhack
+bushwhacked
+bushwhacker
+bushwhackers
+bushwhacking
+bushwhacks
+bushwife
+bushwoman
+Bushwood
+bushwood
+bushy
+bushy-bearded
+bushy-browed
+bushy-eared
+bushy-haired
+bushy-headed
+bushy-legged
+bushy-tailed
+bushy-whiskered
+bushy-wigged
+busied
+Busiek
+busier
+busies
+busiest
+busily
+busine
+business
+businesses
+businessese
+businesslike
+businesslikeness
+businessman
+businessmen
+businesswoman
+businesswomen
+busing
+busings
+Busiris
+busk
+busked
+busker
+buskers
+busket
+buskin
+buskined
+busking
+buskins
+Buskirk
+buskle
+busks
+Buskus
+busky
+busload
+busman
+busmen
+Busoni
+Busra
+Busrah
+buss
+bussed
+busser
+busser-in
+busses
+Bussey
+bussing
+bussings
+bussock
+bussu
+Bussy
+bussy
+Bust
+bust
+bustard
+bustards
+busted
+bustee
+Buster
+buster
+busters
+busthead
+busti
+bustian
+bustic
+busticate
+bustics
+bustier
+bustiers
+bustiest
+busting
+bustle
+bustled
+bustler
+bustlers
+bustles
+bustling
+bustlingly
+busto
+busts
+bust-up
+busty
+busulfan
+busulfans
+busuuti
+busway
+busy
+busybodied
+busybodies
+busybody
+busybodyish
+busybodyism
+busybodyness
+busy-brained
+Busycon
+busy-fingered
+busyhead
+busy-headed
+busy-idle
+busying
+busyish
+busyness
+busynesses
+busy-tongued
+busywork
+busyworks
+BUT
+but
+but-
+butacaine
+butadiene
+butadiyne
+butanal
+but-and-ben
+butane
+butanes
+butanoic
+butanol
+butanolid
+butanolide
+butanols
+butanone
+butanones
+butat
+Butazolidin
+Butch
+butch
+butcha
+Butcher
+butcher
+butcher-bird
+butcherbird
+butcherbroom
+butcherdom
+butchered
+butcherer
+butcheress
+butcheries
+butchering
+butcherless
+butcherliness
+butcherly
+butcherous
+butcher-row
+butchers
+butcher's-broom
+butchery
+butches
+Bute
+Butea
+butein
+Butenandt
+but-end
+butene
+butenes
+butenyl
+Buteo
+buteo
+buteonine
+buteos
+Butes
+Buteshire
+butic
+butin
+butine
+butle
+butled
+Butler
+butler
+butlerage
+butlerdom
+butleress
+butleries
+butlerism
+butlerlike
+butlers
+butlership
+Butlerville
+butlery
+butles
+butling
+butment
+Butner
+butolism
+Butomaceae
+butomaceous
+Butomus
+butoxy
+butoxyl
+buts
+buts-and-bens
+Butsu
+butsudan
+Butt
+butt
+Butta
+buttal
+buttals
+Buttaro
+Butte
+butte
+butted
+butter
+butteraceous
+butter-and-eggs
+butterback
+butterball
+butterbill
+butter-billed
+butterbird
+butterboat-bill
+butterboat-billed
+butterbough
+butter-box
+butterbox
+butter-bump
+butterbump
+butterbur
+butterburr
+butterbush
+butter-colored
+buttercup
+buttercups
+butter-cutting
+buttered
+butterer
+butterers
+butterfat
+butterfats
+Butterfield
+butter-fingered
+butterfingered
+butterfingers
+butterfish
+butterfishes
+butterflied
+butterflies
+butterflower
+butterfly
+butterflyer
+butterflyfish
+butterflyfishes
+butterfly-flower
+butterflying
+butterflylike
+butterfly-pea
+butterhead
+butterier
+butteries
+butteriest
+butterine
+butteriness
+buttering
+butteris
+butterjags
+butterless
+butterlike
+buttermaker
+buttermaking
+butterman
+Buttermere
+buttermilk
+buttermonger
+buttermouth
+butter-mouthed
+butternose
+butter-nut
+butternut
+butternuts
+butterpaste
+butter-print
+butter-rigged
+butterroot
+butter-rose
+Butters
+butters
+butterscotch
+butterscotches
+butter-smooth
+butter-toothed
+butterweed
+butterwife
+butterwoman
+butterworker
+butterwort
+Butterworth
+butterwright
+buttery
+butteryfingered
+buttes
+buttgenbachite
+butt-headed
+butties
+butt-in
+butting
+butting-in
+butting-joint
+buttinski
+buttinskies
+buttinsky
+buttle
+buttled
+buttling
+buttock
+buttocked
+buttocker
+buttocks
+Button
+button
+buttonball
+buttonbur
+buttonbush
+button-covering
+button-down
+button-eared
+buttoned
+buttoner
+buttoners
+buttoner-up
+button-fastening
+button-headed
+button-hold
+buttonhold
+button-holder
+buttonholder
+button-hole
+buttonhole
+buttonholed
+buttonholer
+buttonholes
+buttonholing
+buttonhook
+buttoning
+buttonless
+buttonlike
+buttonmold
+buttonmould
+buttons
+button-sewing
+button-shaped
+button-slitting
+button-tufting
+buttonweed
+Buttonwillow
+buttonwood
+buttony
+buttress
+buttressed
+buttresses
+buttressing
+buttressless
+buttresslike
+Buttrick
+butts
+butt-stock
+buttstock
+buttstrap
+buttstrapped
+buttstrapping
+buttwoman
+buttwomen
+buttwood
+butty
+buttyman
+Buttzville
+Butung
+butut
+bututs
+Butyl
+butyl
+butylamine
+butylate
+butylated
+butylates
+butylating
+butylation
+butyl-chloral
+butylene
+butylenes
+butylic
+butyls
+Butyn
+butyne
+butyr
+butyr-
+butyraceous
+butyral
+butyraldehyde
+butyrals
+butyrate
+butyrates
+butyric
+butyrically
+butyrin
+butyrinase
+butyrins
+butyro-
+butyrochloral
+butyrolactone
+butyrometer
+butyrometric
+butyrone
+butyrous
+butyrousness
+butyryl
+butyryls
+Butzbach
+buvette
+Buxaceae
+buxaceous
+Buxbaumia
+Buxbaumiaceae
+buxeous
+buxerries
+buxerry
+buxine
+buxom
+buxomer
+buxomest
+buxomly
+buxomness
+Buxtehude
+Buxton
+Buxus
+buy
+buyable
+buyback
+buybacks
+Buyer
+buyer
+Buyers
+buyers
+Buyides
+buying
+buyout
+buyouts
+buys
+Buyse
+buz
+buzane
+buzuki
+buzukia
+buzukis
+buzylene
+Buzz
+buzz
+Buzzard
+buzzard
+buzzardlike
+buzzardly
+buzzards
+buzzbomb
+buzzed
+Buzzell
+buzzer
+buzzerphone
+buzzers
+buzzes
+buzzgloak
+buzzier
+buzzies
+buzziest
+buzzing
+buzzingly
+buzzle
+buzzsaw
+buzzwig
+buzzwigs
+buzzword
+buzzwords
+buzzy
+B.V.
+BV
+bv
+BVA
+BVC
+BVD
+BVDs
+BVE
+B.V.M.
+BVM
+bvt
+BVY
+B/W
+BW
+bwana
+bwanas
+BWC
+BWG
+BWI
+BWM
+BWR
+BWT
+BWTS
+BWV
+BX
+bx
+bx.
+bxs
+-by
+by
+by-
+by-alley
+by-altar
+Byam
+by-and-by
+by-and-large
+byard
+Byars
+Bybee
+by-bid
+by-bidder
+by-bidding
+Byblidaceae
+Byblis
+Byblos
+by-blow
+by-boat
+by-channel
+by-child
+by-chop
+by-cock
+bycoket
+by-common
+by-corner
+by-day
+by-dependency
+by-design
+Bydgoszcz
+by-doing
+by-doingby-drinking
+by-drinking
+by-dweller
+bye
+bye-blow
+bye-bye
+bye-byes
+byee
+bye-election
+by-effect
+byegaein
+byelaw
+byelaws
+by-election
+Byelgorod-Dnestrovski
+Byelorussia
+byelorussia
+Byelorussian
+byelorussian
+byelorussians
+Byelostok
+Byelovo
+bye-low
+byeman
+by-end
+byepath
+byerite
+byerlite
+Byers
+byes
+bye-stake
+byestreet
+Byesville
+bye-turn
+bye-water
+bye-wood
+byeworker
+byeworkman
+by-fellow
+by-fellowship
+Byfield
+by-form
+bygane
+byganging
+bygo
+bygoing
+by-gold
+bygone
+bygones
+Byhalia
+byhand
+by-hour
+by-interest
+by-issue
+by-job
+by-land
+byland
+bylander
+by-lane
+Bylas
+by-law
+bylaw
+bylawman
+bylaws
+by-lead
+Byler
+bylina
+by-line
+byline
+bylined
+byliner
+byliners
+bylines
+bylining
+byliny
+by-live
+by-matter
+by-motive
+by-name
+byname
+bynames
+bynedestin
+Byng
+Bynin
+bynin
+Bynum
+BYO
+by-office
+byon
+byordinar
+byordinary
+byous
+byously
+byp
+by-pass
+bypass
+by-passage
+by-passed
+bypassed
+by-passer
+bypasser
+bypasses
+by-passing
+bypassing
+by-past
+bypast
+by-path
+bypath
+by-paths
+bypaths
+by-place
+byplace
+by-play
+byplay
+byplays
+by-plot
+Bypro
+by-product
+byproduct
+byproducts
+by-purpose
+Byram
+Byran
+Byrann
+Byrd
+Byrdie
+Byrdstown
+byre
+by-reaction
+byre-man
+byreman
+byre-men
+byres
+by-respect
+by-result
+byrewards
+byrewoman
+Byrgius
+Byrl
+byrl
+byrlady
+byrlakin
+byrlaw
+byrlawman
+byrlawmen
+Byrle
+byrled
+byrling
+byrls
+Byrn
+Byrne
+Byrnedale
+Byrnes
+byrnie
+byrnies
+by-road
+byroad
+byroads
+Byrom
+Byromville
+Byron
+byron
+Byronesque
+Byronian
+Byroniana
+Byronic
+byronic
+Byronically
+Byronics
+Byronish
+Byronism
+Byronist
+Byronite
+Byronize
+by-room
+by-route
+Byrrh
+byrri
+byrrus
+Byrsonima
+byrthynsak
+bys
+Bysacki
+bysen
+by-sitter
+bysmalith
+by-speech
+by-spel
+byspell
+byss
+byssaceous
+byssal
+Bysshe
+byssi
+byssiferous
+byssin
+byssine
+Byssinosis
+byssinosis
+byssogenous
+byssoid
+byssolite
+byssus
+byssuses
+by-stake
+bystander
+bystanders
+by-street
+bystreet
+bystreets
+by-stroke
+by-talk
+bytalk
+bytalks
+byte
+by-term
+bytes
+byth
+by-the-bye
+by-the-way
+by-thing
+by-throw
+by-thrust
+by-time
+bytime
+Bytom
+by-tone
+bytownite
+bytownitite
+by-track
+by-trail
+by-turning
+BYU
+by-view
+by-walk
+bywalk
+bywalker
+by-walking
+bywalking
+byward
+by-wash
+by-water
+Bywaters
+by-way
+byway
+byways
+by-west
+by-wipe
+bywoner
+by-wood
+Bywoods
+by-word
+byword
+bywords
+by-work
+bywork
+byworks
+by-your-leave
+Byz
+Byz.
+byzant
+Byzantian
+byzantian
+Byzantine
+byzantine
+Byzantinesque
+Byzantinism
+Byzantinize
+Byzantium
+byzantium
+byzants
+Byzas
+Bz
+bz
+Bziers
+&c
+C
+C.
+c
+c.
+c/-
+C3
+C.A.
+C/A
+CA
+Ca
+ca
+ca'
+ca.
+CAA
+Caaba
+caaba
+caam
+caama
+caaming
+Caanthus
+caapeba
+caatinga
+CAB
+cab
+caba
+cabaa
+cabaan
+caback
+Cabaeus
+cabaho
+Cabal
+cabal
+cabala
+cabalas
+cabalassou
+cabaletta
+cabalic
+cabalism
+cabalisms
+cabalist
+cabalistic
+cabalistical
+cabalistically
+cabalists
+Caball
+caball
+caballed
+caballer
+caballeria
+caballero
+caballeros
+caballine
+caballing
+Caballo
+caballo
+caballos
+cabals
+caban
+cabana
+cabanas
+Cabanatuan
+cabane
+Cabanis
+cabaret
+cabaretier
+cabarets
+cabas
+cabasa
+cabasset
+cabassou
+Cabazon
+cabbage
+cabbaged
+cabbagehead
+cabbageheaded
+cabbageheadedness
+cabbagelike
+cabbages
+cabbagetown
+cabbage-tree
+cabbagewood
+cabbageworm
+cabbaging
+cabbagy
+cabbala
+cabbalah
+cabbalahs
+cabbalas
+cabbalism
+cabbalist
+cabbalistic
+cabbalistical
+cabbalistically
+cabbalize
+cabbed
+cabber
+cabbie
+cabbies
+cabbing
+cabble
+cabbled
+cabbler
+cabbling
+cabby
+cabda
+cabdriver
+cabdriving
+Cabe
+cabecera
+cabecudo
+Cabeiri
+cabeliau
+Cabell
+cabellerote
+caber
+Cabernet
+cabernet
+cabernets
+cabers
+Cabery
+cabestro
+cabestros
+Cabet
+cabezon
+cabezone
+cabezones
+cabezons
+cabful
+cabiai
+cabildo
+cabildos
+cabilliau
+Cabimas
+cabin
+cabin-class
+Cabinda
+cabined
+cabinet
+cabineted
+cabineting
+cabinetmake
+cabinet-maker
+cabinetmaker
+cabinetmakers
+cabinetmaking
+cabinetmakings
+cabinetry
+cabinets
+cabinetted
+cabinetwork
+cabinetworker
+cabinetworking
+cabinetworks
+cabining
+cabinlike
+Cabins
+cabins
+cabio
+Cabirean
+Cabiri
+Cabiria
+Cabirian
+Cabiric
+Cabiritic
+Cable
+cable
+cable-car
+cablecast
+cabled
+cablegram
+cablegrams
+cable-laid
+cablelaid
+cableless
+cablelike
+cableman
+cablemen
+cabler
+cables
+cablese
+cable-stitch
+cablet
+cablets
+cableway
+cableways
+cabling
+cablish
+cabman
+cabmen
+cabob
+cabobs
+caboceer
+caboche
+caboched
+cabochon
+cabochons
+cabocle
+caboclo
+caboclos
+Cabomba
+cabomba
+Cabombaceae
+cabombas
+caboodle
+caboodles
+cabook
+Cabool
+caboose
+cabooses
+Caborojo
+caboshed
+cabossed
+Cabot
+cabot
+cabotage
+cabotages
+cabotin
+cabotinage
+cabots
+cabouca
+Cabral
+cabre
+cabree
+Cabrera
+cabrerite
+cabresta
+cabrestas
+cabresto
+cabrestos
+cabret
+cabretta
+cabrettas
+cabreuva
+cabrie
+cabrilla
+cabrillas
+Cabrini
+cabriole
+cabrioles
+cabriolet
+cabriolets
+cabrit
+cabrito
+CABS
+cabs
+cabstand
+cabstands
+cabuja
+cabulla
+cabureiba
+caburn
+cabuya
+cabuyas
+CAC
+cac-
+Caca
+ca-ca
+caca
+cacaesthesia
+cacafuego
+cacafugo
+Cacajao
+Cacak
+Cacalia
+cacam
+Cacan
+Cacana
+cacanapa
+ca'canny
+cacanthrax
+cacao
+cacaos
+Cacara
+cacas
+Cacatua
+Cacatuidae
+Cacatuinae
+cacaxte
+Caccabis
+caccagogue
+caccia
+caccias
+cacciatora
+cacciatore
+Caccini
+Cacciocavallo
+cace
+cacei
+cacemphaton
+cacesthesia
+cacesthesis
+cachaca
+cachaemia
+cachaemic
+cachalot
+cachalote
+cachalots
+cachaza
+cache
+cache-cache
+cachectic
+cachectical
+cached
+cachemia
+cachemic
+cachepot
+cachepots
+caches
+cachespell
+cachet
+cacheted
+cachetic
+cacheting
+cachets
+cachexia
+cachexias
+cachexic
+cachexies
+cachexy
+cachibou
+cachila
+cachimailla
+cachina
+cachinate
+caching
+cachinnate
+cachinnated
+cachinnating
+cachinnation
+cachinnator
+cachinnatory
+cachoeira
+cacholong
+cachot
+cachou
+cachous
+cachrys
+cachua
+cachucha
+cachuchas
+cachucho
+cachunde
+caci
+Cacia
+Cacicus
+cacidrosis
+Cacie
+Cacilia
+Cacilie
+cacimbo
+cacimbos
+caciocavallo
+cacique
+caciques
+caciqueship
+caciquism
+cack
+Cacka
+cacked
+cackerel
+cack-handed
+cacking
+cackle
+cackled
+cackler
+cacklers
+cackles
+cackling
+cacks
+CACM
+caco-
+cacocholia
+cacochroia
+cacochylia
+cacochymia
+cacochymic
+cacochymical
+cacochymy
+cacocnemia
+cacodaemon
+cacodaemoniac
+cacodaemonial
+cacodaemonic
+cacodemon
+cacodemonia
+cacodemoniac
+cacodemonial
+cacodemonic
+cacodemonize
+cacodemonomania
+cacodontia
+cacodorous
+cacodoxian
+cacodoxical
+cacodoxy
+cacodyl
+cacodylate
+cacodylic
+cacodyls
+cacoeconomy
+cacoenthes
+cacoepist
+cacoepistic
+cacoepy
+cacoethes
+cacoethic
+cacogalactia
+cacogastric
+cacogenesis
+cacogenic
+cacogenics
+cacogeusia
+cacoglossia
+cacographer
+cacographic
+cacographical
+cacography
+cacolet
+cacolike
+cacological
+cacology
+cacomagician
+cacomelia
+cacomistle
+cacomixl
+cacomixle
+cacomixls
+cacomorphia
+cacomorphosis
+caconychia
+caconym
+caconymic
+cacoon
+cacopathy
+cacopharyngia
+cacophonia
+cacophonic
+cacophonical
+cacophonically
+cacophonies
+cacophonist
+cacophonists
+cacophonize
+cacophonous
+cacophonously
+cacophony
+cacophthalmia
+cacoplasia
+cacoplastic
+cacoproctia
+cacorhythmic
+cacorrhachis
+cacorrhinia
+cacosmia
+cacospermia
+cacosplanchnia
+cacostomia
+cacothansia
+cacothelin
+cacotheline
+cacothes
+cacothesis
+cacothymia
+cacotopia
+cacotrichia
+cacotrophia
+cacotrophic
+cacotrophy
+cacotype
+cacoxene
+cacoxenite
+caco-zeal
+cacozeal
+cacozealous
+cacozyme
+cacqueteuse
+cacqueteuses
+Cactaceae
+cactaceous
+cactal
+Cactales
+cacti
+cactiform
+cactoid
+Cactus
+cactus
+cactuses
+cactuslike
+cacumen
+cacuminal
+cacuminate
+cacumination
+cacuminous
+cacur
+Cacus
+CAD
+Cad
+cad
+Cadal
+cadalene
+cadamba
+cadaster
+cadasters
+cadastral
+cadastrally
+cadastration
+cadastre
+cadastres
+cadaver
+cadaveric
+cadaverin
+cadaverine
+cadaverize
+cadaverous
+cadaverously
+cadaverousness
+cadavers
+cadbait
+cadbit
+cadbote
+CADD
+Caddaric
+cadded
+caddesse
+caddice
+caddiced
+caddicefly
+caddices
+Caddie
+caddie
+caddied
+caddies
+caddiing
+cadding
+caddis
+caddised
+caddises
+caddisflies
+caddisfly
+caddish
+caddishly
+caddishness
+caddishnesses
+caddisworm
+caddle
+Caddo
+Caddoan
+caddow
+Caddric
+caddy
+caddying
+-cade
+Cade
+cade
+cadeau
+cadee
+Cadel
+Cadell
+cadelle
+cadelles
+Cadena
+Cadence
+cadence
+cadenced
+cadences
+cadencies
+cadencing
+cadency
+cadenette
+cadent
+cadential
+Cadenza
+cadenza
+cadenzas
+cader
+caderas
+cadere
+Cades
+cades
+cadesse
+Cadet
+cadet
+cadetcy
+cadets
+cadetship
+cadette
+cadettes
+cadew
+cadge
+cadged
+cadger
+cadgers
+cadges
+cadgily
+cadginess
+cadging
+cadgy
+cadi
+cadie
+cadilesker
+Cadillac
+cadillac
+cadillacs
+cadillo
+cadinene
+cadis
+cadish
+cadism
+cadiueio
+Cadiz
+cadjan
+cadlock
+Cadman
+Cadmann
+Cadmar
+Cadmarr
+Cadmean
+cadmean
+cadmia
+cadmic
+cadmide
+cadmiferous
+cadmium
+cadmiumize
+cadmiums
+Cadmopone
+Cadmus
+cadmus
+Cadogan
+Cadorna
+cados
+Cadott
+cadouk
+cadrans
+cadre
+cadres
+cads
+cadua
+caduac
+caduca
+caducary
+caducean
+caducecaducean
+caducecei
+caducei
+caduceus
+caduciaries
+caduciary
+caducibranch
+Caducibranchiata
+caducibranchiate
+caducicorn
+caducities
+caducity
+caducous
+caduke
+cadus
+CADV
+Cadwal
+Cadwallader
+cadweed
+Cadwell
+cadwell
+Cady
+cady
+cadying
+Cadyville
+Cadzand
+CAE
+cae-
+caeca
+caecal
+caecally
+caecectomy
+caecias
+caeciform
+Caecilia
+Caeciliae
+caecilian
+Caeciliidae
+caecitis
+caecity
+caecocolic
+caecostomy
+caecotomy
+caecum
+Caedmon
+Caedmonian
+Caedmonic
+Caeli
+Caelian
+caelometer
+Caelum
+caelum
+Caelus
+Caen
+caen-
+Caeneus
+Caenis
+Caenogaea
+Caenogaean
+caenogenesis
+caenogenetic
+caenogenetically
+Caenolestes
+caenostylic
+caenostyly
+Caenozoic
+caenozoic
+caen-stone
+caeoma
+caeomas
+caeremoniarius
+Caerleon
+Caernarfon
+Caernarvon
+Caernarvonshire
+Caerphilly
+Caesalpinia
+Caesalpiniaceae
+caesalpiniaceous
+Caesar
+caesar
+Caesaraugusta
+Caesardom
+Caesarea
+Caesarean
+caesarean
+Caesareanize
+caesareans
+Caesaria
+Caesarian
+caesarian
+Caesarism
+caesarism
+Caesarist
+caesarists
+Caesarize
+caesaropapacy
+caesaropapism
+caesaropapist
+caesaropopism
+Caesarotomy
+caesars
+Caesarship
+caesious
+caesium
+caesiums
+caespitose
+caespitosely
+caestus
+caestuses
+caesura
+caesurae
+caesural
+caesuras
+caesuric
+Caetano
+C.A.F.
+CAF
+caf
+cafard
+cafardise
+CAFE
+cafe
+cafeneh
+cafenet
+cafes
+cafe-society
+cafetal
+cafeteria
+cafeterias
+cafetiere
+cafetorium
+caff
+caffa
+caffeate
+caffeic
+caffein
+caffeina
+caffeine
+caffeines
+caffeinic
+caffeinism
+caffeins
+caffeism
+caffeol
+caffeone
+caffetannic
+caffetannin
+caffiaceous
+caffiso
+caffle
+caffled
+caffling
+caffoline
+caffoy
+caffre
+Caffrey
+cafh
+Cafiero
+cafila
+cafiz
+cafoy
+caftan
+caftaned
+caftans
+cafuso
+cag
+Cagayan
+cagayan
+cagayans
+Cage
+cage
+caged
+cageful
+cagefuls
+cageless
+cagelike
+cageling
+cagelings
+cageman
+cageot
+cager
+cager-on
+cagers
+cages
+cagester
+cagework
+cagey
+cageyness
+caggy
+cag-handed
+cagier
+cagiest
+cagily
+caginess
+caginesses
+caging
+cagit
+Cagle
+Cagliari
+Cagliostro
+cagmag
+Cagn
+Cagney
+cagot
+Cagoulard
+Cagoulards
+cagoule
+CAGR
+Caguas
+cagui
+cagy
+Cahan
+Cahenslyism
+cahier
+cahiers
+Cahill
+cahill
+Cahilly
+cahincic
+Cahita
+cahiz
+Cahn
+Cahnite
+Cahokia
+Cahone
+cahoot
+cahoots
+Cahors
+cahot
+cahow
+cahows
+Cahra
+Cahuapana
+Cahuilla
+cahuita
+cahuy
+CAI
+Cai
+cai
+Caia
+Caiaphas
+caiarara
+caic
+caickle
+Caicos
+caid
+caids
+cailcedra
+Cailean
+caille
+Cailleac
+cailleach
+cailliach
+Cailly
+caimacam
+caimakam
+caiman
+caimans
+caimitillo
+caimito
+Cain
+cain
+Cain-colored
+-caine
+Caine
+Caines
+Caingang
+Caingangs
+caingin
+Caingua
+ca'ing-whale
+Cainian
+Cainish
+Cainism
+Cainite
+Cainitic
+cainogenesis
+Cainozoic
+cainozoic
+cains
+Cainsville
+caiper-callie
+caique
+caiquejee
+caiques
+cair
+Cairba
+Caird
+caird
+cairds
+Cairene
+cairene
+Cairistiona
+cairn
+Cairnbrook
+cairned
+cairngorm
+cairngorum
+cairn-headed
+Cairns
+cairns
+cairny
+Cairo
+cairo
+CAIS
+caisse
+caisson
+caissoned
+caissons
+Caitanyas
+Caite
+Caithness
+caitif
+caitiff
+caitiffs
+caitifty
+Caitlin
+Caitrin
+Caius
+caixinha
+Cajan
+cajan
+cajang
+Cajanus
+cajaput
+cajaputs
+cajava
+cajeput
+cajeputol
+cajeputole
+cajeputs
+cajeta
+cajole
+cajoled
+cajolement
+cajolements
+cajoler
+cajoleries
+cajolers
+cajolery
+cajoles
+cajoling
+cajolingly
+cajon
+cajones
+cajou
+cajuela
+Cajun
+cajun
+cajuns
+cajuput
+cajuputene
+cajuputol
+cajuputs
+Cakavci
+Cakchikel
+cake
+cakebox
+cakebread
+caked
+cake-eater
+cakehouse
+cakemaker
+cakemaking
+cake-mixing
+caker
+cakes
+cakette
+cakewalk
+cakewalked
+cakewalker
+cakewalking
+cakewalks
+cakey
+cakier
+cakiest
+Cakile
+caking
+cakra
+cakravartin
+caky
+Cal
+Cal.
+cal
+cal.
+calaba
+Calabar
+calabar
+calabar-bean
+Calabari
+Calabasas
+calabash
+calabashes
+calabaza
+calabazilla
+calaber
+calaboose
+calabooses
+calabozo
+calabrasella
+Calabrese
+calabrese
+Calabresi
+Calabria
+Calabrian
+calabrian
+calabrians
+calabur
+calade
+Caladium
+caladium
+caladiums
+Calah
+calahan
+Calais
+calais
+calaite
+Calakmul
+calalu
+Calama
+Calamagrostis
+calamanco
+calamancoes
+calamancos
+calamander
+calamansi
+calamar
+calamari
+Calamariaceae
+calamariaceous
+Calamariales
+calamarian
+calamaries
+calamarioid
+calamarmar
+calamaroid
+calamars
+calamary
+calambac
+calambour
+calami
+calamiferious
+calamiferous
+calamiform
+calaminaris
+calaminary
+calamine
+calamined
+calamines
+calamining
+calamint
+Calamintha
+calamints
+calamistral
+calamistrate
+calamistrum
+calamite
+calamitean
+Calamites
+calamites
+calamities
+calamitoid
+calamitous
+calamitously
+calamitousness
+calamitousnesses
+calamity
+Calamodendron
+calamondin
+Calamopitys
+Calamospermae
+Calamostachys
+calamumi
+calamus
+Calan
+calander
+calando
+Calandra
+calandre
+Calandria
+calandria
+Calandridae
+Calandrinae
+Calandrinia
+calangay
+calanid
+calanque
+calantas
+Calantha
+Calanthe
+calanthe
+Calapan
+calapite
+calapitte
+Calappa
+Calappidae
+Calas
+calascione
+calash
+calashes
+calastic
+Calathea
+calathea
+calathi
+calathian
+calathidia
+calathidium
+calathiform
+calathisci
+calathiscus
+calathos
+calaththi
+calathus
+Calatrava
+calavance
+calaverite
+Calbert
+calbroben
+calc
+calc-
+calcaemia
+calcaire
+calcanea
+calcaneal
+calcanean
+calcanei
+calcaneoastragalar
+calcaneoastragaloid
+calcaneocuboid
+calcaneofibular
+calcaneonavicular
+calcaneoplantar
+calcaneoscaphoid
+calcaneotibial
+calcaneum
+calcaneus
+calcannea
+calcannei
+calc-aphanite
+calcar
+calcarate
+calcarated
+Calcarea
+calcareo-
+calcareoargillaceous
+calcareobituminous
+calcareocorneous
+calcareosiliceous
+calcareosulphurous
+calcareous
+calcareously
+calcareousness
+calcaria
+calcariferous
+calcariform
+calcarine
+calcarium
+calcars
+calcate
+calcavella
+calceate
+calced
+calcedon
+calcedony
+calceiform
+calcemia
+Calceolaria
+calceolaria
+calceolate
+calceolately
+calces
+calce-scence
+calceus
+Calchaqui
+Calchaquian
+Calchas
+calchas
+calche
+calci
+calci-
+calcic
+calciclase
+calcicole
+calcicolous
+calcicosis
+calciferol
+Calciferous
+calciferous
+calcific
+calcification
+calcifications
+calcified
+calcifies
+calciform
+calcifugal
+calcifuge
+calcifugous
+calcify
+calcifying
+calcigenous
+calcigerous
+calcimeter
+calcimine
+calcimined
+calciminer
+calcimines
+calcimining
+calcinable
+calcinate
+calcination
+calcinator
+calcinatory
+calcine
+calcined
+calciner
+calcines
+calcining
+calcinize
+calcino
+calcinosis
+calcio-
+calciobiotite
+calciocarnotite
+calcioferrite
+calcioscheelite
+calciovolborthite
+calcipexy
+calciphile
+calciphilia
+calciphilic
+calciphilous
+calciphobe
+calciphobic
+calciphobous
+calciphylactic
+calciphylactically
+calciphylaxis
+calciphyre
+calciprivic
+calcisponge
+Calcispongiae
+calcite
+calcites
+calcitestaceous
+calcitic
+calcitonin
+calcitrant
+calcitrate
+calcitration
+calcitreation
+calcium
+calciums
+calcivorous
+calco-
+calcographer
+calcographic
+calcography
+calcomp
+calcrete
+calc-sinter
+calcsinter
+calc-spar
+calcspar
+calcspars
+calc-tufa
+calctufa
+calctufas
+calc-tuff
+calctuff
+calctuffs
+calculabilities
+calculability
+calculable
+calculableness
+calculably
+Calculagraph
+calcular
+calculary
+calculate
+calculated
+calculatedly
+calculatedness
+calculates
+calculating
+calculatingly
+calculation
+calculational
+calculations
+calculative
+calculator
+calculators
+calculatory
+calculer
+calculi
+calculiform
+calculifrage
+calculist
+calculous
+calculus
+calculuses
+Calcutta
+calcutta
+Calcydon
+caldadaria
+caldaria
+caldarium
+Caldeira
+calden
+Calder
+Caldera
+caldera
+calderas
+Calderca
+calderium
+Calderon
+calderon
+CaldoraCaldwell
+caldron
+caldrons
+Caldwell
+Cale
+calean
+Caleb
+Calebite
+calebite
+calebites
+caleche
+caleches
+Caledonia
+Caledonian
+caledonian
+caledonite
+calef
+calefacient
+calefaction
+calefactive
+calefactor
+calefactories
+calefactory
+calefy
+calelectric
+calelectrical
+calelectricity
+calembour
+Calemes
+Calen
+calenda
+calendal
+calendar
+calendared
+calendarer
+calendarial
+calendarian
+calendaric
+calendaring
+calendarist
+calendar-making
+calendars
+calendas
+Calender
+calender
+calendered
+calenderer
+calendering
+calenders
+Calendra
+Calendre
+calendric
+calendrical
+calendry
+calends
+Calendula
+calendula
+calendulas
+calendulin
+calentural
+calenture
+calentured
+calenturing
+calenturish
+calenturist
+calepin
+Calera
+calesa
+calesas
+calescence
+calescent
+calesero
+calesin
+Calesta
+Caletor
+Calexico
+calf
+calfbound
+calfdozer
+calfhood
+calfish
+calfkill
+calfless
+calflike
+calfling
+calfret
+calfs
+calf's-foot
+calf-skin
+calfskin
+calfskins
+Calgary
+calgary
+calgon
+Calhan
+Calhoun
+Cali
+cali-
+Calia
+Caliban
+caliban
+Calibanism
+caliber
+calibered
+calibers
+calibogus
+calibrate
+calibrated
+calibrater
+calibrates
+calibrating
+calibration
+calibrations
+calibrator
+calibrators
+calibre
+calibred
+calibres
+Caliburn
+caliburn
+Caliburno
+calic
+Calica
+calicate
+calices
+caliche
+caliches
+caliciform
+calicle
+calicles
+calico
+calicoback
+calicoed
+calicoes
+calicos
+calicular
+caliculate
+caliculi
+caliculus
+Calicut
+calid
+Calida
+calidity
+caliduct
+Calie
+Caliente
+Calif
+Calif.
+calif
+califate
+califates
+Califon
+California
+california
+Californian
+californian
+californiana
+californians
+californicus
+californite
+Californium
+californium
+califs
+caliga
+caligate
+caligated
+caligation
+caliginosity
+caliginous
+caliginously
+caliginousness
+caligo
+caligrapher
+caligraphy
+Caligula
+caligulism
+calili
+calimanco
+calimancos
+Calimere
+Calimeris
+calin
+calina
+Calinago
+calinda
+calindas
+caline
+Calinog
+calinut
+Calio
+caliological
+caliologist
+caliology
+Calion
+calipash
+calipashes
+Calipatria
+calipee
+calipees
+caliper
+calipered
+caliperer
+calipering
+calipers
+calipeva
+caliph
+caliphal
+caliphate
+caliphates
+caliphs
+caliphship
+calippic
+Calippus
+Calisa
+calisaya
+calisayas
+Calise
+Calista
+calistheneum
+calisthenic
+calisthenical
+calisthenics
+Calistoga
+Calite
+caliver
+calix
+Calixtin
+calixtin
+Calixtine
+Calixto
+Calixtus
+calk
+calkage
+calked
+calker
+calkers
+calkin
+calking
+Calkins
+calkins
+calks
+Call
+call
+Calla
+calla
+calla-
+callable
+callaesthetic
+Callaghan
+Callahan
+callainite
+callais
+callaloo
+callaloos
+Callan
+callan
+Callands
+callans
+callant
+callants
+Callao
+Callas
+callas
+callat
+callate
+Callaway
+callback
+callbacks
+call-board
+callboy
+callboys
+call-down
+Calle
+Callean
+called
+Callender
+Callensburg
+caller
+callers
+Callery
+Calles
+calles
+callet
+callets
+Calley
+call-fire
+Calli
+calli
+calli-
+Callianassa
+Callianassidae
+Calliandra
+Callicarpa
+Callicebus
+Callicoon
+Callicrates
+callid
+Callida
+Callidice
+callidity
+callidness
+Callie
+calligram
+calligraph
+calligrapha
+calligrapher
+calligraphers
+calligraphic
+calligraphical
+calligraphically
+calligraphist
+calligraphy
+Calliham
+Callimachus
+calling
+calling-down
+calling-over
+callings
+Callionymidae
+Callionymus
+Calliope
+calliope
+calliopean
+calliopes
+calliophone
+Calliopsis
+calliopsis
+callipash
+callipee
+callipees
+calliper
+callipered
+calliperer
+callipering
+callipers
+Calliphora
+calliphorid
+Calliphoridae
+calliphorine
+Callipolis
+callippic
+Callippus
+Callipus
+callipygian
+callipygous
+Callirrhoe
+Callisaurus
+callisection
+callis-sand
+Callista
+Calliste
+callisteia
+Callistemon
+Callistephus
+callisthenic
+callisthenics
+Callisto
+callisto
+Callithrix
+callithrix
+callithump
+callithumpian
+Callitrichaceae
+callitrichaceous
+Callitriche
+callitriche
+Callitrichidae
+Callitris
+callitype
+callityped
+callityping
+callo
+call-off
+calloo
+callop
+Callorhynchidae
+Callorhynchus
+callosal
+callose
+calloses
+callosities
+callosity
+callosomarginal
+callosum
+Callot
+callot
+callous
+calloused
+callouses
+callousing
+callously
+callousness
+callousnesses
+call-out
+callout
+call-over
+Callovian
+callow
+Calloway
+callower
+callowest
+callowman
+callowness
+callownesses
+calls
+Callum
+callum
+Calluna
+Calluori
+call-up
+callus
+callused
+calluses
+callusing
+Cally
+Callynteria
+calm
+calmant
+Calmar
+Calmas
+calmative
+calmato
+calmecac
+calmed
+calmer
+calmest
+calm-eyed
+calmier
+calmierer
+calmiest
+calming
+calmingly
+calmly
+calm-minded
+calmness
+calmnesses
+calms
+calm-throated
+calmy
+calo-
+Calocarpum
+Calochortaceae
+Calochortus
+calodaemon
+calodemon
+calodemonial
+calogram
+calography
+calomba
+calombigas
+calombo
+calomel
+calomels
+calomorphic
+Calondra
+Calonectria
+Calon-segur
+Calonyction
+calool
+Calophyllum
+Calopogon
+calor
+Calore
+caloreceptor
+calorescence
+calorescent
+caloric
+calorically
+caloricity
+calorics
+caloriduct
+Calorie
+calorie
+calorie-counting
+calories
+calorifacient
+calorific
+calorifical
+calorifically
+calorification
+calorifics
+calorifier
+calorify
+calorigenic
+calorimeter
+calorimeters
+calorimetric
+calorimetrical
+calorimetrically
+calorimetry
+calorimotor
+caloris
+calorisator
+calorist
+Calorite
+calorize
+calorized
+calorizer
+calorizes
+calorizing
+calory
+Calosoma
+calosoma
+Calotermes
+calotermitid
+Calotermitidae
+Calothrix
+calotin
+calotte
+calottes
+calotype
+calotypic
+calotypist
+caloyer
+caloyers
+calp
+calpac
+calpack
+calpacked
+calpacks
+calpacs
+Calpe
+calpolli
+calpul
+calpulli
+Calpurnia
+calque
+calqued
+calques
+calquing
+CALRS
+CALS
+cals
+calsouns
+Caltanissetta
+Caltech
+Caltha
+caltha
+calthrop
+calthrops
+caltrap
+caltraps
+caltrop
+caltrops
+calumba
+Calumet
+calumet
+calumets
+calumnia
+calumniate
+calumniated
+calumniates
+calumniating
+calumniation
+calumniations
+calumniative
+calumniator
+calumniators
+calumniatory
+calumnies
+calumnious
+calumniously
+calumniousness
+calumny
+caluptra
+Calusa
+calusar
+calutron
+calutrons
+Calv
+Calva
+Calvados
+calvados
+calvadoses
+calvaire
+Calvano
+calvaria
+calvarial
+calvarias
+Calvaries
+calvaries
+calvarium
+Calvary
+calvary
+Calvatia
+Calve
+calve
+calved
+calver
+Calvert
+Calverton
+calves
+Calvin
+calvin
+Calvina
+calving
+Calvinian
+calvinian
+Calvinism
+calvinism
+Calvinist
+calvinist
+Calvinistic
+calvinistic
+Calvinistical
+Calvinistically
+calvinists
+Calvinize
+calvinize
+Calvinna
+calvish
+calvities
+calvity
+Calvo
+calvous
+calvus
+calx
+calxes
+calybite
+calycanth
+Calycanthaceae
+calycanthaceous
+calycanthemous
+calycanthemy
+calycanthin
+calycanthine
+Calycanthus
+calycanthus
+calycate
+Calyce
+calyceal
+Calyceraceae
+calyceraceous
+calyces
+calyciferous
+calycifloral
+calyciflorate
+calyciflorous
+calyciform
+calycinal
+calycine
+calycle
+calycled
+calycles
+calycli
+Calycocarpum
+calycoid
+calycoideous
+Calycophora
+Calycophorae
+calycophoran
+Calycozoa
+calycozoan
+calycozoic
+calycozoon
+calycular
+calyculate
+calyculated
+calycule
+calyculi
+calyculus
+Calydon
+Calydonian
+Calymene
+calymma
+calyon
+calyphyomy
+calypsist
+Calypso
+calypso
+calypsoes
+calypsonian
+Calypsos
+calypsos
+calypter
+Calypterae
+calypters
+Calyptoblastea
+calyptoblastic
+Calyptorhynchus
+calyptra
+Calyptraea
+Calyptranthes
+calyptras
+Calyptrata
+Calyptratae
+calyptrate
+calyptriform
+calyptrimorphous
+calyptro
+calyptrogen
+Calyptrogyne
+Calysta
+Calystegia
+calyx
+calyxes
+calzada
+calzone
+calzoneras
+calzones
+calzoons
+CAM
+Cam
+cam
+CAMA
+CAMAC
+camaca
+Camacan
+camacey
+camachile
+Camacho
+Camag
+camagon
+Camaguey
+camaieu
+camail
+camaile
+camailed
+camails
+Camak
+camaka
+Camala
+Camaldolensian
+Camaldolese
+Camaldolesian
+Camaldolite
+camaldolite
+Camaldule
+Camaldulian
+camalig
+camalote
+caman
+camanay
+camanchaca
+Camanche
+camansi
+camara
+camarada
+camarade
+camaraderie
+camaraderies
+Camarasaurus
+camarasaurus
+Camarata
+camarera
+Camargo
+camarilla
+camarillas
+Camarillo
+camarin
+camarine
+camaron
+Camas
+camas
+camases
+camass
+camasses
+Camassia
+camata
+camatina
+camauro
+camauros
+Camaxtli
+camay
+Camb
+Camb.
+camb
+Camball
+Cambalo
+Cambarus
+Cambay
+cambaye
+camber
+cambered
+cambering
+camber-keeled
+cambers
+Camberwell
+Cambeva
+cambia
+cambial
+cambiata
+cambibia
+cambiform
+cambio
+cambiogenetic
+cambion
+cambism
+cambisms
+cambist
+cambistry
+cambists
+cambium
+cambiums
+camblet
+Cambodia
+cambodia
+Cambodian
+cambodian
+cambodians
+camboge
+cambogia
+cambogias
+Cambon
+camboose
+Camborne-Redruth
+cambouis
+Cambra
+Cambrai
+cambrel
+cambresine
+Cambria
+Cambrian
+cambrian
+Cambric
+cambric
+cambricleaf
+cambrics
+Cambridge
+cambridge
+Cambridgeport
+Cambridgeshire
+Cambro-briton
+Cambs
+cambuca
+Cambuscan
+Camby
+Cambyses
+Cambyuskan
+Camden
+camden
+Camdenton
+Came
+came
+cameist
+Camel
+camel
+camelback
+camel-backed
+cameleer
+cameleers
+cameleon
+camel-faced
+camel-grazing
+camel-hair
+camelhair
+camel-haired
+camelia
+camelias
+Camelid
+Camelidae
+Camelina
+cameline
+camelion
+camelish
+camelishness
+camelkeeper
+camel-kneed
+Camella
+Camellia
+camellia
+Camelliaceae
+camellias
+camellike
+camellin
+Camellus
+camelman
+cameloid
+Cameloidea
+camelopard
+Camelopardalis
+camelopardel
+Camelopardid
+Camelopardidae
+camelopards
+Camelopardus
+Camelot
+camelot
+camelry
+camels
+camel's-hair
+camel-shaped
+Camelus
+camel-yarn
+Camembert
+camembert
+Camena
+Camenae
+Camenes
+camenes
+Cameo
+cameo
+cameoed
+cameograph
+cameography
+cameoing
+cameos
+camera
+camerae
+camera-eye
+cameral
+cameralism
+cameralist
+cameralistic
+cameralistics
+cameraman
+cameramen
+cameras
+camera-shy
+Camerata
+camerate
+camerated
+cameration
+camerawork
+camerier
+cameriera
+camerieri
+Camerina
+camerine
+Camerinidae
+camerist
+camerlengo
+camerlengos
+camerlingo
+camerlingos
+Cameron
+Cameronian
+cameronian
+cameronians
+Cameroon
+cameroon
+cameroonian
+cameroonians
+Cameroons
+Cameroun
+camery
+cames
+Camestres
+camestres
+Camey
+Camfort
+Cami
+camias
+Camiguin
+camiknickers
+Camila
+Camile
+Camilia
+Camilla
+camilla
+Camille
+Camillo
+Camillus
+camillus
+Camilo
+Camino
+camino
+camion
+camions
+Camirus
+camis
+camisa
+camisade
+camisades
+camisado
+camisadoes
+camisados
+Camisard
+camisard
+camisas
+camiscia
+camise
+camises
+camisia
+camisias
+camisole
+camisoles
+camister
+camize
+camla
+camlet
+camleted
+camleteen
+camletine
+camleting
+camlets
+camletted
+camletting
+CAMM
+Camm
+Cammaerts
+Cammal
+Cammarum
+cammas
+cammed
+Cammi
+Cammie
+cammock
+cammocky
+Cammy
+camoca
+Camoens
+camogie
+camois
+camomile
+camomiles
+camooch
+camoodi
+camoodie
+Camorist
+Camorra
+camorra
+camorras
+Camorrism
+camorrism
+Camorrist
+Camorrista
+camorrista
+camorristi
+camote
+camoudie
+camouflage
+camouflageable
+camouflaged
+camouflager
+camouflagers
+camouflages
+camouflagic
+camouflaging
+camouflet
+camoufleur
+camoufleurs
+CAMP
+Camp
+camp
+Campa
+campagi
+Campagna
+campagna
+Campagne
+campagne
+campagnol
+campagnols
+campagus
+campaign
+campaigned
+campaigner
+campaigners
+campaigning
+campaigns
+campal
+campana
+campane
+campanella
+campanero
+Campania
+campania
+Campanian
+campaniform
+campanile
+campaniles
+campanili
+campaniliform
+campanilla
+campanini
+campanist
+campanistic
+campanologer
+campanological
+campanologically
+campanologist
+campanologists
+campanology
+Campanula
+campanula
+Campanulaceae
+campanulaceous
+Campanulales
+campanular
+Campanularia
+Campanulariae
+campanularian
+Campanularidae
+Campanulatae
+campanulate
+campanulated
+campanulous
+Campanus
+Campari
+Campaspe
+Campball
+Campbell
+campbell
+Campbell-Bannerman
+Campbellism
+campbellism
+campbellisms
+Campbellite
+campbellite
+campbellites
+Campbellsburg
+Campbellsville
+Campbellton
+Campbelltown
+Campbeltown
+campcraft
+Campe
+Campeche
+campeche
+camped
+campement
+Campephagidae
+campephagine
+Campephilus
+camper
+campers
+campership
+campesino
+campesinos
+campestral
+campestrian
+camp-fight
+campfight
+campfire
+campfires
+campground
+campgrounds
+camph-
+camphane
+camphanic
+camphanone
+camphanyl
+camphene
+camphenes
+camphine
+camphines
+camphire
+camphires
+campho
+camphocarboxylic
+camphoid
+camphol
+campholic
+campholide
+camphols
+campholytic
+camphor
+camphoraceous
+camphorate
+camphorated
+camphorates
+camphorating
+camphoric
+camphorize
+camphorone
+camphoronic
+camphoroyl
+camphorphorone
+camphors
+camphorweed
+camphorwood
+camphory
+camphoryl
+camphylene
+campi
+campier
+campiest
+Campignian
+campilan
+campily
+campimeter
+campimetrical
+campimetry
+Campinas
+Campine
+campiness
+camping
+campings
+Campion
+campion
+campions
+campit
+cample
+Campman
+campman
+campmaster
+camp-meeting
+Campney
+Campo
+campo
+Campobello
+Campodea
+campodean
+campodeid
+Campodeidae
+campodeiform
+campodeoid
+campody
+Campoformido
+campong
+campongs
+Camponotus
+campoo
+campoody
+Camporeale
+camporee
+camporees
+Campos
+campos
+camp-out
+campout
+camps
+campshed
+camp-shedding
+campshedding
+campsheeting
+camp-shot
+campshot
+camp-site
+campsite
+campsites
+campstool
+campstools
+Campti
+camptodrome
+Campton
+camptonite
+Camptonville
+Camptosorus
+Camptown
+campulitropal
+campulitropous
+campus
+campused
+campuses
+campusses
+campward
+Campwood
+Campy
+campy
+campylite
+campylodrome
+campylometer
+Campyloneuron
+campylospermous
+campylotropal
+campylotropous
+CAMRA
+cams
+camshach
+camshachle
+camshaft
+camshafts
+camstane
+camsteary
+camsteery
+camstone
+camstrary
+camuning
+Camus
+camus
+camuse
+camused
+camuses
+Camuy
+cam-wood
+camwood
+CAN
+Can
+Can.
+can
+can.
+Cana
+Canaan
+canaan
+Canaanite
+canaanite
+canaanites
+Canaanitess
+Canaanitic
+Canaanitish
+canaba
+canabae
+Canace
+Canacee
+canacuas
+Canad
+Canad.
+Canada
+canada
+Canadensis
+Canadian
+canadian
+Canadianism
+canadianisms
+Canadianization
+Canadianize
+Canadianized
+Canadianizing
+canadians
+canadine
+canadite
+canadol
+Canadys
+canafistola
+canafistolo
+canafistula
+canafistulo
+canaglia
+canaigre
+canaille
+canailles
+Canajoharie
+canajong
+canakin
+canakins
+Canakkale
+canal
+canalage
+canalatura
+canalboat
+canal-bone
+canal-built
+Canale
+canale
+canaled
+canaler
+canales
+canalete
+Canaletto
+canali
+canalicular
+canaliculate
+canaliculated
+canaliculation
+canaliculi
+canaliculization
+canaliculus
+canaliferous
+canaliform
+canaling
+canalis
+canalisation
+canalise
+canalised
+canalises
+canalising
+canalization
+canalizations
+canalize
+canalized
+canalizes
+canalizing
+canalla
+canalled
+canaller
+canallers
+canalling
+canalman
+Canalou
+canals
+canalside
+Canamary
+canamo
+Cananaean
+Canandaigua
+Canandelabrum
+Cananea
+Cananean
+Cananga
+Canangium
+canap
+canape
+canapes
+canapina
+Canara
+canard
+canards
+Canarese
+Canari
+canari
+Canarian
+Canaries
+canaries
+canarin
+canarine
+Canariote
+Canarium
+Canarsee
+Canary
+canary
+canary-bird
+canary-yellow
+Canaseraga
+canasta
+canastas
+canaster
+Canastota
+canaut
+Canavali
+Canavalia
+canavalin
+Canaveral
+can-beading
+Canberra
+canberra
+can-boxing
+can-buoy
+can-burnishing
+Canby
+canc
+canc.
+can-can
+cancan
+cancans
+can-capping
+canccelli
+cancel
+cancelability
+cancelable
+cancelation
+canceled
+canceleer
+canceler
+cancelers
+cancelier
+canceling
+cancellability
+cancellable
+cancellarian
+cancellarius
+cancellate
+cancellated
+cancellation
+cancellations
+cancelled
+canceller
+cancelli
+cancelling
+cancellous
+cancellus
+cancelment
+cancels
+Cancer
+cancer
+cancerate
+cancerated
+cancerating
+canceration
+cancerdrops
+cancered
+cancerigenic
+cancerin
+cancerism
+cancerite
+cancerization
+cancerlog
+cancerogenic
+cancerophobe
+cancerophobia
+cancerous
+cancerously
+cancerousness
+cancerphobia
+cancerroot
+cancers
+cancerweed
+cancerwort
+canch
+cancha
+canchalagua
+canchas
+Canchi
+canchito
+cancion
+cancionero
+canciones
+can-cleaning
+can-closing
+Cancri
+Cancrid
+cancrid
+cancriform
+can-crimping
+cancrine
+cancrinite
+cancrinite-syenite
+cancrisocial
+cancrivorous
+cancrizans
+cancroid
+cancroids
+cancrophagous
+cancrum
+cancrums
+Cancun
+Cand
+cand
+Candace
+candareen
+Candee
+candela
+candelabra
+candelabras
+candelabrum
+candelabrums
+candelas
+candelilla
+candency
+candent
+candescence
+candescent
+candescently
+Candi
+Candia
+Candice
+candid
+Candida
+candida
+candidacies
+candidacy
+candidas
+candidate
+candidated
+candidates
+candidateship
+candidating
+candidature
+candidatures
+Candide
+candide
+candider
+candidest
+candidiasis
+candidly
+candidness
+candidnesses
+candids
+Candie
+candied
+candiel
+candier
+candies
+candify
+candil
+Candiot
+Candiote
+candiru
+Candis
+candite
+candle
+candleball
+candle-beam
+candlebeam
+candle-bearing
+candleberries
+candleberry
+candlebomb
+candlebox
+candle-branch
+candled
+candle-dipper
+candle-end
+candlefish
+candlefishes
+candle-foot
+candle-holder
+candleholder
+candle-hour
+candlelight
+candlelighted
+candle-lighter
+candlelighter
+candlelighting
+candlelights
+candlelit
+candlemaker
+candlemaking
+Candlemas
+candlemas
+candle-meter
+candlenut
+candlepin
+candlepins
+candlepower
+Candler
+candler
+candle-rent
+candlerent
+candlers
+candles
+candle-shaped
+candleshine
+candleshrift
+candle-snuff
+candlesnuffer
+Candless
+candlestand
+candlestick
+candlesticked
+candlesticks
+candlestickward
+candle-tapering
+candle-tree
+candle-waster
+candlewaster
+candlewasting
+candlewick
+candlewicking
+candlewicks
+candle-wood
+candlewood
+candlewright
+candling
+Cando
+can-dock
+candock
+Candolle
+Candollea
+Candolleaceae
+candolleaceous
+Candor
+candor
+candors
+candour
+candours
+Candra
+candroy
+candroys
+canduc
+Candy
+candy
+Candyce
+candyfloss
+candyh
+candying
+candylike
+candymaker
+candymaking
+candys
+candystick
+candy-striped
+candytuft
+candyweed
+cane
+Canea
+Caneadea
+cane-backed
+cane-bottomed
+Canebrake
+canebrake
+canebrakes
+caned
+Caneghem
+canel
+canela
+canelas
+canelike
+canell
+canella
+Canellaceae
+canellaceous
+canellas
+canelle
+Canelo
+canelo
+canelos
+Canens
+caneology
+canephor
+canephora
+canephorae
+canephore
+canephori
+canephoroe
+canephoroi
+canephoros
+canephors
+cane-phorus
+canephorus
+canephroi
+canepin
+caner
+caners
+canes
+canescence
+canescene
+canescent
+cane-seated
+Canestrato
+caneton
+canette
+caneva
+Canevari
+caneware
+canewares
+canewise
+canework
+Caney
+Caneyville
+canezou
+CanF
+Canfield
+canfield
+canfieldite
+canfields
+can-filling
+can-flanging
+canful
+canfuls
+cangan
+cangenet
+cangia
+cangica-wood
+cangle
+cangler
+cangue
+cangues
+cangy
+canham
+can-heading
+can-hook
+canhoop
+Canica
+Canice
+Canichana
+Canichanan
+canicide
+canicola
+Canicula
+canicula
+canicular
+canicule
+canid
+Canidae
+Canidia
+canids
+Caniff
+canikin
+canikins
+canille
+caninal
+canine
+canines
+caning
+caniniform
+caninities
+caninity
+caninus
+canion
+canioned
+canions
+Canis
+Canisiana
+canistel
+Canisteo
+canister
+canisters
+Canistota
+canities
+canjac
+Canjilon
+cank
+canker
+cankerberry
+cankerbird
+canker-bit
+canker-bitten
+cankereat
+canker-eaten
+cankered
+cankeredly
+cankeredness
+cankerflower
+cankerfret
+canker-hearted
+cankering
+canker-mouthed
+cankerous
+cankerroot
+cankers
+canker-toothed
+cankerweed
+cankerworm
+cankerworms
+cankerwort
+cankery
+can-labeling
+can-lacquering
+canli
+can-lining
+canmaker
+canmaking
+canman
+can-marking
+Canmer
+Cann
+cann
+Canna
+canna
+cannabic
+cannabidiol
+cannabin
+Cannabinaceae
+cannabinaceous
+cannabine
+cannabinol
+cannabins
+Cannabis
+cannabis
+cannabises
+cannabism
+Cannaceae
+cannaceous
+cannach
+canna-down
+Cannae
+cannaled
+cannalling
+Cannanore
+cannas
+cannat
+canned
+cannel
+cannelated
+cannel-bone
+Cannelburg
+cannele
+Cannell
+cannellate
+cannellated
+cannelle
+cannelloni
+cannelon
+cannelons
+cannels
+Cannelton
+cannelure
+cannelured
+cannequin
+canner
+canneries
+canners
+cannery
+Cannes
+cannet
+cannetille
+cannibal
+cannibalean
+cannibalic
+cannibalish
+cannibalism
+cannibalisms
+cannibalistic
+cannibalistically
+cannibality
+cannibalization
+cannibalize
+cannibalized
+cannibalizes
+cannibalizing
+cannibally
+cannibals
+Cannice
+cannie
+cannier
+canniest
+cannikin
+cannikins
+cannily
+canniness
+canninesses
+Canning
+canning
+cannings
+cannister
+cannisters
+Cannizzaro
+Cannock
+cannoli
+Cannon
+cannon
+cannonade
+cannonaded
+cannonades
+cannonading
+cannonarchy
+cannon-ball
+cannonball
+cannonballed
+cannonballing
+cannonballs
+cannoned
+cannoneer
+cannoneering
+cannoneers
+cannonier
+cannoning
+Cannonism
+cannonism
+cannon-proof
+cannonproof
+cannonries
+cannon-royal
+cannonry
+cannons
+Cannonsburg
+cannon-shot
+Cannonville
+cannophori
+cannot
+Cannstatt
+cannula
+cannulae
+cannular
+cannulas
+Cannulate
+cannulate
+cannulated
+cannulating
+cannulation
+canny
+canoe
+canoed
+canoeing
+Canoeiro
+canoeist
+canoeists
+canoeload
+canoeman
+canoes
+canoewood
+Canoga
+canoing
+Canon
+canon
+canoncito
+Canones
+canones
+canoness
+canonesses
+canonic
+canonical
+canonicalization
+canonicalize
+canonicalized
+canonicalizes
+canonicalizing
+canonically
+canonicalness
+canonicals
+canonicate
+canonici
+canonicity
+canonics
+canonisation
+canonise
+canonised
+canoniser
+canonises
+canonising
+canonist
+canonistic
+canonistical
+canonists
+canonizant
+canonization
+canonizations
+canonize
+canonized
+canonizer
+canonizes
+canonizing
+canonlike
+canonries
+canonry
+canons
+Canonsburg
+canonship
+canoodle
+canoodled
+canoodler
+canoodles
+canoodling
+can-opener
+can-opening
+Canopic
+canopic
+canopid
+canopied
+canopies
+Canopus
+canopus
+canopy
+canopying
+canorous
+canorously
+canorousness
+canos
+Canossa
+Canotas
+canotier
+Canova
+Canovanas
+can-polishing
+can-quaffing
+canreply
+Canrobert
+canroy
+canroyer
+cans
+can-salting
+can-scoring
+can-sealing
+can-seaming
+cansful
+can-slitting
+Canso
+canso
+can-soldering
+cansos
+can-squeezing
+canst
+can-stamping
+can-sterilizing
+canstick
+Cant
+Cant.
+can't
+cant
+Cantab
+cantab
+cantabank
+cantabile
+Cantabri
+Cantabrian
+Cantabrigian
+cantabrigian
+Cantabrize
+Cantacuzene
+cantador
+Cantal
+cantala
+cantalas
+cantalever
+cantalite
+cantaliver
+cantaloup
+cantaloupe
+cantaloupes
+cantando
+cantankerous
+cantankerously
+cantankerousness
+cantankerousnesses
+cantar
+cantara
+cantare
+cantaro
+cantata
+cantatas
+Cantate
+cantate
+cantation
+cantative
+cantator
+cantatory
+cantatrice
+cantatrices
+cantatrici
+cantboard
+cantdog
+cantdogs
+canted
+canteen
+canteens
+cantefable
+cantel
+Canter
+canter
+Canterburian
+canterburian
+Canterburianism
+canterburies
+Canterbury
+canterbury
+cantered
+canterelle
+canterer
+cantering
+canters
+can-testing
+canthal
+Cantharellus
+canthari
+cantharic
+Cantharidae
+cantharidal
+cantharidate
+cantharidated
+cantharidating
+cantharidean
+cantharides
+cantharidian
+cantharidin
+cantharidism
+cantharidize
+cantharidized
+cantharidizing
+cantharis
+cantharophilous
+cantharus
+canthathari
+canthectomy
+canthi
+canthitis
+cantholysis
+canthoplasty
+canthorrhaphy
+canthotomy
+Canthus
+canthus
+canthuthi
+cantic
+canticle
+Canticles
+canticles
+cantico
+cantiga
+Cantigny
+Cantil
+cantil
+cantilated
+cantilating
+cantilena
+cantilene
+cantilenes
+cantilever
+cantilevered
+cantilevering
+cantilevers
+cantillate
+cantillated
+cantillating
+cantillation
+Cantillon
+cantily
+cantina
+cantinas
+cantiness
+canting
+cantingly
+cantingness
+cantinier
+cantino
+cantion
+cantish
+cantle
+cantles
+cantlet
+cantline
+cantling
+Cantlon
+canto
+Canton
+canton
+cantonal
+cantonalism
+Cantone
+cantoned
+cantoner
+Cantonese
+cantonese
+cantoning
+cantonize
+Cantonment
+cantonment
+cantonments
+cantons
+cantoon
+Cantor
+cantor
+cantoral
+cantoria
+cantorial
+Cantorian
+cantoris
+cantorous
+cantors
+cantorship
+Cantos
+cantos
+cantraip
+cantraips
+Cantrall
+cantrap
+cantraps
+cantred
+cantref
+Cantril
+cantrip
+cantrips
+cants
+Cantu
+Cantuar
+cantus
+cantut
+cantuta
+cantwise
+Canty
+canty
+Canuck
+canuck
+canula
+canulae
+canular
+canulas
+canulate
+canulated
+canulates
+canulating
+canun
+Canute
+Canutillo
+canvas
+canvasado
+canvas-back
+canvasback
+canvasbacks
+canvas-covered
+canvased
+canvaser
+canvasers
+canvases
+canvasing
+canvaslike
+canvasman
+canvass
+canvassed
+canvasser
+canvassers
+canvasses
+canvassing
+canvassy
+can-washing
+can-weighing
+can-wiping
+can-wrapping
+cany
+Canyon
+canyon
+canyons
+canyonside
+Canyonville
+canzo
+canzon
+canzona
+canzonas
+canzone
+canzones
+canzonet
+canzonets
+canzonetta
+canzoni
+canzos
+caoba
+Caodaism
+Caodaist
+caoine
+caon
+caoutchin
+caoutchouc
+caoutchoucin
+CAP
+cap
+cap.
+capa
+capabilities
+capability
+Capablanca
+capable
+capableness
+capabler
+capablest
+capably
+Capac
+capacify
+capacious
+capaciously
+capaciousness
+capacitance
+capacitances
+capacitate
+capacitated
+capacitates
+capacitating
+capacitation
+capacitations
+capacitative
+capacitativly
+capacitator
+capacities
+capacitive
+capacitively
+capacitor
+capacitors
+capacity
+Capaneus
+capanna
+capanne
+cap-a-pie
+caparison
+caparisoned
+caparisoning
+caparisons
+capataces
+capataz
+capax
+cap-case
+capcase
+Cape
+cape
+capeador
+capeadores
+capeadors
+caped
+Capefair
+Capek
+capel
+capelan
+capelans
+capelet
+capelets
+capelin
+capeline
+capelins
+Capella
+capella
+capellane
+capellet
+capelline
+Capello
+capelocracy
+Capels
+Capemay
+cape-merchant
+Capeneddick
+caper
+caperbush
+capercaillie
+capercailye
+capercailzie
+capercally
+caper-cut
+capercut
+caperdewsie
+capered
+caperer
+caperers
+capering
+caperingly
+Capernaism
+Capernaite
+capernaite
+Capernaitic
+Capernaitical
+Capernaitically
+Capernaitish
+Capernaum
+capernoited
+capernoitie
+capernoity
+capernutie
+capers
+capersome
+capersomeness
+caperwort
+capes
+capeskin
+capeskins
+Capet
+Capetian
+capetian
+Capetonian
+Capetown
+capetown
+capette
+Capeville
+capeweed
+capewise
+capework
+capeworks
+cap-flash
+capful
+capfuls
+Caph
+caph
+Cap-Haitien
+caphar
+capharnaism
+Caphaurus
+caphite
+caphs
+Caphtor
+Caphtorim
+capias
+capiases
+capiatur
+capibara
+capicha
+capilaceous
+capillaceous
+capillaire
+capillament
+capillarectasia
+capillaries
+capillarily
+capillarimeter
+capillariness
+capillariomotor
+capillarities
+capillaritis
+capillarity
+capillary
+capillation
+capillatus
+capilli
+capilliculture
+capilliform
+capillitia
+capillitial
+capillitium
+capillose
+capillus
+capilotade
+caping
+cap-in-hand
+Capistrano
+capistrate
+capita
+capital
+capitaldom
+capitaled
+capitaling
+capitalisable
+capitalise
+capitalised
+capitaliser
+capitalising
+capitalism
+capitalist
+capitalistic
+capitalistically
+capitalists
+capitalizable
+capitalization
+capitalizations
+capitalize
+capitalized
+capitalizer
+capitalizers
+capitalizes
+capitalizing
+capitally
+capitalness
+capitals
+Capitan
+capitan
+capitana
+capitano
+capitare
+capitasti
+capitate
+capitated
+capitatim
+capitation
+capitations
+capitative
+capitatum
+capite
+capiteaux
+capitella
+capitellar
+capitellate
+capitelliform
+capitellum
+capitle
+Capito
+Capitol
+capitol
+Capitola
+Capitolian
+Capitoline
+capitoline
+Capitolium
+capitols
+Capitonidae
+Capitoninae
+capitoul
+capitoulate
+capitula
+capitulant
+capitular
+capitularies
+capitularly
+capitulars
+capitulary
+capitulate
+capitulated
+capitulates
+capitulating
+capitulation
+capitulations
+capitulator
+capitulatory
+capituliform
+capitulum
+capiturlary
+capivi
+Capiz
+capkin
+Caplan
+caplan
+capless
+caplet
+caplets
+caplin
+capling
+caplins
+caplock
+capmaker
+capmakers
+capmaking
+capman
+capmint
+Cap'n
+Capnodium
+Capnoides
+capnomancy
+capnomor
+capo
+capoc
+capocchia
+capoche
+Capodacqua
+capomo
+Capon
+capon
+caponata
+caponatas
+Capone
+capone
+caponette
+caponier
+caponiere
+caponiers
+caponisation
+caponise
+caponised
+caponiser
+caponising
+caponization
+caponize
+caponized
+caponizer
+caponizes
+caponizing
+caponniere
+capons
+caporal
+caporals
+Caporetto
+capos
+capot
+capotasto
+capotastos
+Capote
+capote
+capotes
+capouch
+capouches
+CAPP
+Capp
+cappadine
+cappadochio
+Cappadocia
+Cappadocian
+cappae
+cappagh
+cap-paper
+capparid
+Capparidaceae
+capparidaceous
+Capparis
+capped
+cappelenite
+Cappella
+cappella
+cappelletti
+Cappello
+capper
+cappers
+cappie
+cappier
+cappiest
+capping
+cappings
+capple
+capple-faced
+Cappotas
+Capps
+cappuccino
+cappy
+Capra
+caprate
+Caprella
+Caprellidae
+caprelline
+capreol
+capreolar
+capreolary
+capreolate
+capreoline
+Capreolus
+capreomycin
+capretto
+Capri
+capric
+capriccetto
+capriccettos
+capricci
+capriccio
+capriccios
+capriccioso
+Caprice
+caprice
+caprices
+capricious
+capriciously
+capriciousness
+Capricorn
+capricorn
+Capricorni
+Capricornid
+capricorns
+Capricornus
+caprid
+caprificate
+caprification
+caprificator
+caprifig
+caprifigs
+caprifoil
+caprifole
+Caprifoliaceae
+caprifoliaceous
+Caprifolium
+caprifolium
+capriform
+caprigenous
+Caprimulgi
+Caprimulgidae
+Caprimulgiformes
+caprimulgine
+Caprimulgus
+caprin
+caprine
+caprinic
+Capriola
+capriole
+caprioled
+caprioles
+caprioling
+Capriote
+capriped
+capripede
+Capris
+capris
+caprizant
+caproate
+caprock
+caprocks
+caproic
+caproin
+Capromys
+Capron
+capron
+caprone
+capronic
+capronyl
+caproyl
+capryl
+caprylate
+caprylene
+caprylic
+caprylin
+caprylone
+caprylyl
+caps
+caps.
+capsa
+capsaicin
+Capsella
+Capshaw
+capsheaf
+capshore
+Capsian
+capsian
+capsicin
+capsicins
+Capsicum
+capsicum
+capsicums
+capsid
+Capsidae
+capsidal
+capsids
+capsizable
+capsizal
+capsize
+capsized
+capsizes
+capsizing
+capsomer
+capsomere
+capsomers
+capstan
+capstan-headed
+capstans
+cap-stone
+capstone
+capstones
+capsula
+capsulae
+capsular
+capsulate
+capsulated
+capsulation
+capsule
+capsulectomy
+capsuled
+capsuler
+capsules
+capsuli-
+capsuliferous
+capsuliform
+capsuligerous
+capsuling
+capsulitis
+capsulize
+capsulized
+capsulizing
+capsulociliary
+capsulogenous
+capsulolenticular
+capsulopupillary
+capsulorrhaphy
+capsulotome
+capsulotomy
+capsumin
+Capt
+Capt.
+captacula
+captaculum
+CAPTAIN
+captain
+captaincies
+Captaincook
+captaincy
+captained
+captainess
+captain-generalcy
+captaining
+captain-lieutenant
+captainly
+captainries
+captainry
+captains
+captainship
+captainships
+captan
+captance
+captandum
+captans
+captate
+captation
+caption
+captioned
+captioning
+captionless
+captions
+captious
+captiously
+captiousness
+Captiva
+captivance
+captivate
+captivated
+captivately
+captivates
+captivating
+captivatingly
+captivation
+captivations
+captivative
+captivator
+captivators
+captivatrix
+captive
+captived
+captives
+captiving
+captivities
+captivity
+captor
+captors
+captress
+capturable
+capture
+captured
+capturer
+capturers
+captures
+capturing
+Capua
+Capuan
+Capuanus
+capuche
+capuched
+capuches
+Capuchin
+capuchin
+capuchins
+capucine
+Capulet
+capulet
+capuli
+Capulin
+capulin
+caput
+Caputa
+caputium
+Caputo
+Caputto
+Capuzzo
+Capwell
+capybara
+capybaras
+Capys
+caque
+Caquet
+caquet
+caqueterie
+caqueteuse
+caqueteuses
+Caquetio
+caquetoire
+caquetoires
+CAR
+Car
+car
+Cara
+Carabancel
+carabao
+carabaos
+carabeen
+carabid
+Carabidae
+carabidan
+carabideous
+carabidoid
+carabids
+carabin
+carabine
+carabineer
+carabiner
+carabinero
+carabineros
+carabines
+Carabini
+carabinier
+carabiniere
+carabinieri
+carabins
+caraboa
+caraboid
+Carabus
+carabus
+caracal
+Caracalla
+caracals
+caracara
+caracaras
+Caracas
+caracas
+carack
+caracks
+caraco
+caracoa
+caracol
+caracole
+caracoled
+caracoler
+caracoles
+caracoli
+caracoling
+caracolite
+caracolled
+caracoller
+caracolling
+caracols
+caracora
+caracore
+caract
+Caractacus
+caracter
+caracul
+caraculs
+Caradoc
+Caradon
+carafe
+carafes
+carafon
+Caragana
+caragana
+caraganas
+carageen
+carageens
+caragheen
+Caraguata
+caraguata
+Caraho
+caraibe
+Caraipa
+caraipe
+caraipi
+Caraja
+Carajas
+carajo
+carajura
+Caralie
+caramba
+carambola
+carambole
+caramboled
+caramboling
+caramel
+caramelan
+caramelen
+caramelin
+caramelisation
+caramelise
+caramelised
+caramelising
+caramelization
+caramelize
+caramelized
+caramelizes
+caramelizing
+caramels
+caramoussal
+Caramuel
+carancha
+carancho
+caranda
+Carandas
+caranday
+carane
+Caranga
+carangid
+Carangidae
+carangids
+carangin
+carangoid
+Carangus
+caranna
+Caranx
+caranx
+carap
+Carapa
+carapa
+carapace
+carapaced
+carapaces
+Carapache
+Carapacho
+carapacial
+carapacic
+carapato
+carapax
+carapaxes
+Carapidae
+carapine
+carapo
+Carapus
+Carara
+Caras
+carassow
+carassows
+carat
+caratacus
+caratch
+carate
+carates
+Caratinga
+carats
+Caratunk
+carauna
+caraunda
+Caravaggio
+caravan
+caravaned
+caravaneer
+caravaner
+caravaning
+caravanist
+caravanned
+caravanner
+caravanning
+caravans
+caravansaries
+caravansary
+caravanserai
+caravanserial
+caravel
+caravelle
+caravels
+Caravette
+Caraviello
+caraway
+caraways
+Carayan
+Caraz
+carb
+carb-
+carbachol
+carbacidometer
+carbamate
+carbamic
+carbamide
+carbamidine
+carbamido
+carbamine
+carbamino
+carbamoyl
+carbamyl
+carbamyls
+carbanil
+carbanilic
+carbanilid
+carbanilide
+carbanion
+carbarn
+carbarns
+carbaryl
+carbaryls
+carbasus
+carbazic
+carbazide
+carbazin
+carbazine
+carbazole
+carbazylic
+carbeen
+carbene
+Carberry
+carberry
+carbethoxy
+carbethoxyl
+carbide
+carbides
+carbimide
+carbin
+carbine
+carbineer
+carbineers
+carbines
+carbinol
+carbinols
+carbinyl
+Carbo
+carbo
+carbo-
+carboazotine
+carbocer
+carbocinchomeronic
+carbocyclic
+carbodiimide
+carbodynamite
+carbogelatin
+carbohemoglobin
+carbohydrase
+carbo-hydrate
+carbohydrate
+carbohydrates
+carbohydraturia
+carbohydrazide
+carbohydride
+carbohydrogen
+carbolate
+carbolated
+carbolating
+carbolfuchsin
+carbolic
+carbolics
+carboline
+carbolineate
+Carbolineum
+carbolise
+carbolised
+carbolising
+carbolize
+carbolized
+carbolizes
+carbolizing
+Carboloy
+carboluria
+carbolxylol
+carbomethene
+carbomethoxy
+carbomethoxyl
+carbomycin
+carbon
+Carbona
+carbona
+carbonaceous
+carbonade
+Carbonado
+carbonado
+carbonadoed
+carbonadoes
+carbonadoing
+carbonados
+Carbonari
+carbonari
+Carbonarism
+Carbonarist
+Carbonaro
+carbonatation
+carbonate
+carbonated
+carbonates
+carbonating
+carbonation
+carbonations
+carbonatization
+carbonator
+carbonators
+Carboncliff
+Carbondale
+carbondale
+Carbone
+carbone
+carboned
+carbonemia
+carbonero
+carbones
+Carboni
+carbonic
+carbonide
+Carboniferous
+carboniferous
+carbonification
+carbonify
+carbonigenous
+carbonimeter
+carbonimide
+carbonisable
+carbonisation
+carbonise
+carbonised
+carboniser
+carbonising
+carbonite
+carbonitride
+carbonium
+carbonizable
+carbonization
+carbonize
+carbonized
+carbonizer
+carbonizers
+carbonizes
+carbonizing
+carbonless
+Carbonnieux
+carbonometer
+carbonometry
+carbonous
+carbons
+carbonuria
+carbonyl
+carbonylate
+carbonylated
+carbonylating
+carbonylation
+carbonylene
+carbonylic
+carbonyls
+carbophilous
+carbora
+carboras
+car-borne
+Carborundum
+carborundum
+carbosilicate
+carbostyril
+carboxide
+carboxy
+Carboxydomonas
+carboxyhemoglobin
+carboxyl
+carboxylase
+carboxylate
+carboxylated
+carboxylating
+carboxylation
+carboxylic
+carboxyls
+carboxypeptidase
+carboy
+carboyed
+carboys
+Carbrey
+carbro
+carbromal
+carbs
+carbuilder
+carbuncle
+carbuncled
+carbuncles
+carbuncular
+carbunculation
+carbungi
+carburan
+carburant
+carburate
+carburated
+carburating
+carburation
+carburator
+carbure
+carburet
+carburetant
+carbureted
+carbureter
+carburetest
+carbureting
+carburetion
+carburetor
+carburetors
+carburets
+carburetted
+carburetter
+carburetting
+carburettor
+carburisation
+carburise
+carburised
+carburiser
+carburising
+carburization
+carburize
+carburized
+carburizer
+carburizes
+carburizing
+carburometer
+carby
+carbyl
+carbylamine
+carcajou
+carcajous
+carcake
+carcan
+carcanet
+carcaneted
+carcanets
+carcanetted
+Carcas
+carcase
+carcased
+carcases
+carcasing
+carcass
+carcassed
+carcasses
+carcassing
+carcassless
+Carcassonne
+Carcavelhos
+Carce
+carceag
+carcel
+carcels
+carcer
+carceral
+carcerate
+carcerated
+carcerating
+carceration
+carcerist
+Carcharhinus
+Carcharias
+carchariid
+Carchariidae
+carcharioid
+Carcharodon
+carcharodont
+Carchemish
+carcin-
+carcinemia
+carcinogen
+carcinogeneses
+carcinogenesis
+carcinogenic
+carcinogenicity
+carcinogenics
+carcinogens
+carcinoid
+carcinological
+carcinologist
+carcinology
+carcinolysin
+carcinolytic
+carcinoma
+carcinomas
+carcinomata
+carcinomatoid
+carcinomatosis
+carcinomatous
+carcinomorphic
+carcinophagous
+carcinophobia
+carcinopolypus
+carcinosarcoma
+carcinosarcomas
+carcinosarcomata
+Carcinoscorpius
+carcinosis
+carcinus
+carcoon
+Card
+Card.
+card
+cardaissin
+Cardale
+Cardamine
+cardamine
+cardamom
+cardamoms
+cardamon
+cardamons
+cardamum
+cardamums
+Cardanic
+cardanol
+Cardanus
+cardboard
+cardboards
+card-carrier
+card-carrying
+cardcase
+cardcases
+cardcastle
+card-counting
+card-cut
+card-cutting
+card-devoted
+Cardea
+cardecu
+carded
+cardel
+Cardenas
+Carder
+carder
+carders
+Cardew
+cardholder
+cardholders
+cardhouse
+cardi-
+-cardia
+cardia
+cardiac
+cardiacal
+Cardiacea
+cardiacean
+cardiacle
+cardiacs
+cardiae
+cardiagra
+cardiagram
+cardiagraph
+cardiagraphy
+cardial
+cardialgia
+cardialgic
+cardialgy
+cardiameter
+cardiamorphia
+cardianesthesia
+cardianeuria
+cardiant
+cardiaplegia
+cardiarctia
+cardias
+cardiasthenia
+cardiasthma
+cardiataxia
+cardiatomy
+cardiatrophia
+cardiauxe
+Cardiazol
+cardicentesis
+Cardie
+cardiectasis
+cardiectomize
+cardiectomy
+cardielcosis
+cardiemphraxia
+Cardiff
+cardiform
+Cardiga
+Cardigan
+cardigan
+cardigans
+Cardiganshire
+Cardiidae
+Cardijn
+Cardin
+cardin
+Cardinal
+cardinal
+cardinalate
+cardinalated
+cardinalates
+cardinal-bishop
+cardinal-deacon
+cardinalfish
+cardinalfishes
+cardinal-flower
+cardinalic
+Cardinalis
+cardinalism
+cardinalist
+cardinalitial
+cardinalitian
+cardinalities
+cardinality
+cardinally
+cardinal-priest
+cardinal-red
+cardinals
+cardinalship
+Cardinas
+card-index
+cardines
+carding
+cardings
+Cardington
+cardio-
+cardioaccelerator
+cardio-aortic
+cardioarterial
+cardioblast
+cardiocarpum
+cardiocele
+cardiocentesis
+cardiocirrhosis
+cardioclasia
+cardioclasis
+cardiod
+cardiodilator
+cardiodynamics
+cardiodynia
+cardiodysesthesia
+cardiodysneuria
+cardiogenesis
+cardiogenic
+cardiogram
+cardiograms
+cardiograph
+cardiographer
+cardiographic
+cardiographies
+cardiographs
+cardiography
+cardiohepatic
+cardioid
+cardioids
+cardio-inhibitory
+cardiokinetic
+cardiolith
+cardiologic
+cardiological
+cardiologies
+cardiologist
+cardiologists
+cardiology
+cardiolysis
+cardiomalacia
+cardiomegalia
+cardiomegaly
+cardiomelanosis
+cardiometer
+cardiometric
+cardiometry
+cardiomotility
+cardiomyoliposis
+cardiomyomalacia
+cardiomyopathy
+cardioncus
+cardionecrosis
+cardionephric
+cardioneural
+cardioneurosis
+cardionosus
+cardioparplasis
+cardiopath
+cardiopathic
+cardiopathy
+cardiopericarditis
+cardiophobe
+cardiophobia
+cardiophrenia
+cardioplasty
+cardioplegia
+cardiopneumatic
+cardiopneumograph
+cardioptosis
+cardiopulmonary
+cardiopuncture
+cardiopyloric
+cardiorenal
+cardiorespiratory
+cardiorrhaphy
+cardiorrheuma
+cardiorrhexis
+cardioschisis
+cardiosclerosis
+cardioscope
+cardiospasm
+Cardiospermum
+cardiosphygmogram
+cardiosphygmograph
+cardiosymphysis
+cardiotherapies
+cardiotherapy
+cardiotomy
+cardiotonic
+cardiotoxic
+cardiotoxicities
+cardiotoxicity
+cardiotrophia
+cardiotrophotherapy
+cardiovascular
+cardiovisceral
+cardipaludism
+cardipericarditis
+cardisophistical
+cardita
+carditic
+carditis
+carditises
+Cardito
+Cardium
+cardlike
+cardmaker
+cardmaking
+cardo
+cardol
+Cardon
+cardon
+cardona
+cardoncillo
+cardooer
+cardoon
+cardoons
+cardophagus
+cardosanto
+Cardozo
+card-perforating
+cardplayer
+cardplaying
+card-printing
+cardroom
+cards
+cardshark
+cardsharp
+cardsharper
+cardsharping
+cardsharps
+card-sorting
+cardstock
+Carduaceae
+carduaceous
+Carducci
+cardueline
+Carduelis
+car-dumping
+Carduus
+carduus
+Cardville
+Cardwell
+CARE
+Care
+care
+Careaga
+care-bewitching
+care-bringing
+care-charming
+care-cloth
+carecloth
+care-crazed
+care-crossed
+cared
+care-defying
+care-dispelling
+care-eluding
+careen
+careenage
+care-encumbered
+careened
+careener
+careeners
+careening
+careens
+career
+careered
+careerer
+careerers
+careering
+careeringly
+careerism
+careerist
+careeristic
+careers
+carefox
+care-fraught
+carefree
+carefreeness
+careful
+carefull
+carefuller
+carefullest
+carefully
+carefulness
+carefulnesses
+care-killing
+Carel
+care-laden
+careless
+carelessly
+carelessness
+carelessnesses
+care-lined
+careme
+Caren
+Carena
+Carencro
+carene
+Carenton
+carer
+carers
+cares
+Caresa
+care-scorched
+caress
+Caressa
+caressable
+caressant
+Caresse
+caressed
+caresser
+caressers
+caresses
+caressing
+caressingly
+caressive
+caressively
+carest
+caret
+caretake
+caretaken
+care-taker
+caretaker
+caretakers
+caretakes
+caretaking
+care-tired
+caretook
+carets
+Caretta
+Carettochelydidae
+care-tuned
+Carew
+careworn
+care-wounded
+Carex
+carex
+Carey
+carey
+careys
+Careywood
+carf
+carfare
+carfares
+carfax
+carfloat
+carfour
+carfuffle
+carfuffled
+carfuffling
+carful
+carfuls
+carga
+cargador
+cargadores
+cargason
+Cargian
+Cargill
+cargo
+cargoes
+cargoose
+cargos
+cargued
+Carhart
+carhop
+carhops
+carhouse
+Cari
+Caria
+cariacine
+Cariacus
+cariama
+Cariamae
+Carian
+Carib
+carib
+Caribal
+Cariban
+cariban
+Caribbean
+caribbean
+caribbeans
+Caribbee
+Caribbees
+caribe
+caribed
+Caribees
+caribes
+Caribi
+caribing
+Caribisi
+Caribou
+caribou
+Caribou-eater
+caribous
+Caribs
+Carica
+Caricaceae
+caricaceous
+caricatura
+caricaturable
+caricatural
+caricature
+caricatured
+caricatures
+caricaturing
+caricaturist
+caricaturists
+carices
+caricetum
+caricographer
+caricography
+caricologist
+caricology
+caricous
+carid
+Carida
+Caridea
+caridean
+carideer
+caridoid
+Caridomorpha
+Carie
+caried
+carien
+caries
+cariform
+CARIFTA
+Carignan
+Carijona
+Caril
+Carilla
+carillon
+carilloneur
+carillonned
+carillonneur
+carillonneurs
+carillonning
+carillons
+Carilyn
+Carin
+Carina
+carina
+carinae
+carinal
+Carinaria
+carinaria
+carinas
+Carinatae
+carinate
+carinated
+carination
+Carine
+caring
+Cariniana
+cariniform
+Carinthia
+Carinthian
+carinula
+carinulate
+carinule
+Carioca
+carioca
+Cariocan
+cariocas
+cariogenic
+cariole
+carioles
+carioling
+cariosity
+Cariotta
+carious
+cariousness
+caripeta
+Caripuna
+Cariri
+Caririan
+Carisa
+carisoprodol
+Carissa
+Carissimi
+Carita
+caritas
+caritative
+carites
+caritive
+Caritta
+carity
+Carius
+Cariyo
+cark
+carked
+carking
+carkingly
+carkled
+carks
+Carl
+carl
+Carla
+carlage
+Carland
+carle
+Carlee
+Carleen
+Carlen
+Carlene
+carles
+carless
+carlet
+Carleta
+Carleton
+Carley
+Carli
+carli
+Carlick
+Carlie
+carlie
+Carlile
+Carlin
+carlin
+Carlina
+carlina
+Carline
+carline
+carlines
+Carling
+carling
+carlings
+Carlini
+carlino
+carlins
+Carlinville
+carlish
+carlishness
+Carlisle
+Carlism
+carlism
+Carlist
+carlist
+Carlita
+Carlo
+carlo
+carload
+carloading
+carloadings
+carloads
+Carlock
+carlock
+Carlos
+carlot
+Carlota
+Carlotta
+Carlovingian
+carlovingian
+Carlow
+carls
+Carlsbad
+Carlsborg
+Carlson
+Carlstadt
+Carlstrom
+Carlton
+Carludovica
+Carly
+Carlye
+Carlyle
+Carlylean
+Carlyleian
+Carlylese
+Carlylesque
+Carlylian
+Carlylism
+carlylism
+Carlyn
+Carlyne
+Carlynn
+Carlynne
+Carma
+carmagnole
+carmagnoles
+carmaker
+carmakers
+carmalum
+Carman
+carman
+Carmania
+Carmanians
+Carmanor
+Carmarthen
+Carmarthenshire
+Carme
+Carmel
+carmel
+Carmela
+carmele
+Carmelia
+Carmelina
+Carmelita
+Carmelite
+carmelite
+Carmelitess
+Carmella
+Carmelle
+Carmelo
+carmeloite
+Carmen
+carmen
+Carmena
+Carmencita
+Carmenta
+Carmentis
+carmetta
+Carmi
+Carmichael
+Carmichaels
+car-mile
+Carmina
+carminate
+carminative
+carminatives
+Carmine
+carmine
+carmines
+carminette
+carminic
+carminite
+carminophilous
+Carmita
+carmoisin
+Carmon
+carmot
+Carn
+carn
+Carnac
+carnac
+Carnacian
+carnage
+carnaged
+carnages
+Carnahan
+carnal
+carnalism
+carnalite
+carnalities
+carnality
+carnalize
+carnalized
+carnalizing
+carnallite
+carnally
+carnal-minded
+carnal-mindedness
+carnalness
+Carnap
+carnaptious
+Carnaria
+Carnarvon
+Carnarvonshire
+carnary
+carnassial
+carnate
+Carnatic
+Carnation
+carnation
+carnationed
+carnationist
+carnation-red
+carnations
+carnauba
+carnaubas
+carnaubic
+carnaubyl
+Carnay
+carne
+Carneades
+carneau
+Carnegie
+carnegie
+Carnegiea
+carnel
+carnelian
+carnelians
+carneol
+carneole
+carneous
+Carnes
+Carnesville
+carnet
+carnets
+Carneus
+Carney
+carney
+carneyed
+carneys
+carnic
+carnie
+carnied
+carnies
+carniferous
+carniferrin
+carnifex
+carnifexes
+carnification
+carnifices
+carnificial
+carnified
+carnifies
+carniform
+carnify
+carnifying
+Carniola
+Carniolan
+carnitine
+Carnival
+carnival
+carnivaler
+carnivalesque
+carnivaller
+carnivallike
+carnivals
+Carnivora
+carnivora
+carnivoracity
+carnivoral
+carnivore
+carnivores
+carnivorism
+carnivority
+carnivorous
+carnivorously
+carnivorousness
+carnivorousnesses
+carnose
+carnosin
+carnosine
+carnosities
+carnosity
+carnoso-
+Carnot
+carnotite
+carnous
+Carnoustie
+Carnovsky
+carns
+Carnus
+Carny
+carny
+Caro
+caroa
+caroach
+caroaches
+carob
+caroba
+carobs
+caroch
+caroche
+caroches
+Caroid
+caroigne
+Carol
+carol
+Carola
+Carolan
+Carolann
+Carole
+carole
+Carolean
+carolean
+caroled
+Carolee
+Caroleen
+caroler
+carolers
+caroli
+Carolin
+carolin
+Carolina
+carolina
+carolinas
+Caroline
+caroline
+carolines
+Caroling
+caroling
+Carolingian
+carolingian
+Carolinian
+carolinian
+carolinians
+carolitic
+Carol-Jean
+Caroljean
+Carolle
+carolled
+caroller
+carollers
+carolling
+carols
+Carolus
+carolus
+caroluses
+Carolyn
+carolyn
+Carolyne
+Carolynn
+Carolynne
+carom
+carombolette
+caromed
+caromel
+caroming
+caroms
+Caron
+Carona
+carone
+caronic
+caroome
+caroon
+carosella
+carosse
+CAROT
+carot
+caroteel
+carotene
+carotenes
+carotenoid
+Carothers
+carotic
+carotid
+carotidal
+carotidean
+carotids
+carotin
+carotinaemia
+carotinemia
+carotinoid
+carotins
+carotol
+carotte
+carouba
+caroubier
+carousal
+carousals
+carouse
+caroused
+carousel
+carousels
+carouser
+carousers
+carouses
+carousing
+carousingly
+-carp
+carp
+carp-
+Carpaccio
+carpaine
+carpal
+carpale
+carpalia
+carpals
+Carpathia
+Carpathian
+Carpathians
+Carpatho-russian
+Carpatho-ruthenian
+Carpatho-Ukraine
+carpe
+Carpeaux
+carped
+carpel
+carpellary
+carpellate
+carpellum
+carpels
+carpent
+Carpentaria
+Carpenter
+carpenter
+carpentered
+Carpenteria
+carpentering
+carpenters
+carpentership
+Carpentersville
+carpenterworm
+Carpentier
+carpentries
+carpentry
+Carper
+carper
+carpers
+Carpet
+carpet
+carpet-bag
+carpetbag
+carpetbagged
+carpet-bagger
+carpetbagger
+carpetbaggers
+carpetbaggery
+carpetbagging
+carpetbaggism
+carpetbagism
+carpetbags
+carpetbeater
+carpet-covered
+carpet-cut
+carpeted
+carpeting
+carpet-knight
+carpetlayer
+carpetless
+carpetmaker
+carpetmaking
+carpetmonger
+carpets
+carpet-smooth
+carpet-sweeper
+carpetweb
+carpetweed
+carpetwork
+carpetwoven
+Carphiophiops
+carpholite
+carphology
+Carphophis
+carphosiderite
+carpi
+-carpic
+carpid
+carpidium
+carpincho
+carping
+carpingly
+carpings
+Carpinteria
+carpintero
+Carpinus
+Carpio
+Carpiodes
+carpitis
+carpium
+Carpo
+carpo-
+carpocace
+Carpocapsa
+carpocarpal
+carpocephala
+carpocephalum
+carpocerite
+carpocervical
+Carpocratian
+carpocratian
+Carpodacus
+Carpodetus
+carpogam
+carpogamy
+carpogenic
+carpogenous
+carpognia
+carpogone
+carpogonia
+carpogonial
+carpogonium
+Carpoidea
+carpolite
+carpolith
+carpological
+carpologically
+carpologist
+carpology
+carpomania
+carpometacarpal
+carpometacarpi
+carpometacarpus
+carpompi
+carpool
+carpo-olecranal
+carpools
+carpopedal
+Carpophaga
+carpophagous
+carpophalangeal
+carpophore
+Carpophorus
+carpophyl
+carpophyll
+carpophyte
+carpopodite
+carpopoditic
+carpoptosia
+carpoptosis
+carport
+carports
+carpos
+carposperm
+carposporangia
+carposporangial
+carposporangium
+carpospore
+carposporic
+carposporous
+carpostome
+-carpous
+carps
+carpsucker
+carpus
+carpuspi
+carquaise
+Carr
+carr
+Carrabelle
+Carracci
+carrack
+carracks
+carrageen
+carrageenan
+carrageenin
+carragheen
+carragheenin
+Carranza
+Carrara
+Carraran
+carrat
+carraway
+carraways
+Carrboro
+carreau
+Carree
+carree
+carrefour
+Carrel
+carrel
+carrell
+Carrelli
+carrells
+carrels
+car-replacing
+Carrere
+carreta
+carretela
+carretera
+carreton
+carretta
+Carrew
+Carri
+carri
+carriable
+carriage
+carriageable
+carriage-free
+carriageful
+carriageless
+carriages
+carriagesmith
+carriageway
+Carrick
+carrick
+Carrie
+carried
+Carrier
+carrier
+Carriere
+carrier-free
+carrier-pigeon
+carriers
+carries
+carrigeen
+Carrillo
+Carrington
+carriole
+carrioles
+carrion
+carrions
+Carrissa
+carritch
+carritches
+carriwitchet
+Carrizo
+carrizo
+Carrizozo
+Carrnan
+Carrobili
+carrocci
+carroccio
+carroch
+carroches
+Carrol
+Carroll
+carroll
+carrollite
+Carrolls
+Carrollton
+Carrolltown
+carrom
+carromata
+carromatas
+carromed
+carroming
+carroms
+carronade
+carroon
+carrosserie
+carrot
+carrotage
+carrot-colored
+carroter
+carrot-head
+carrot-headed
+Carrothers
+carrotier
+carrotiest
+carrotin
+carrotiness
+carroting
+carrotins
+carrot-pated
+carrots
+carrot-shaped
+carrot-top
+carrottop
+carrotweed
+carrotwood
+carroty
+carrousel
+carrousels
+carrow
+carrozza
+carrs
+Carrsville
+carrus
+Carruthers
+Carry
+carry
+carryable
+carry-all
+carryall
+carryalls
+carry-back
+carrycot
+carryed
+carry-forward
+carry-in
+carrying
+carrying-on
+carrying-out
+carryings
+carryings-on
+carryke
+carry-log
+carry-on
+carryon
+carryons
+carryout
+carryouts
+carry-over
+carryover
+carryovers
+carrys
+carry-tale
+carrytale
+cars
+carse
+carses
+carshop
+carshops
+carsick
+carsickness
+carsmith
+Carson
+carson
+Carsonville
+Carstensz
+carstone
+CART
+Cart
+cart
+cartable
+cartaceous
+cartage
+Cartagena
+cartages
+Cartago
+Cartan
+cartboot
+cartbote
+Carte
+carte
+carted
+carte-de-visite
+cartel
+cartelism
+cartelist
+cartelistic
+cartelization
+cartelize
+cartelized
+cartelizing
+cartellist
+cartels
+Carter
+carter
+Carteret
+carterly
+carters
+Cartersburg
+Cartersville
+Carterville
+cartes
+Cartesian
+cartesian
+Cartesianism
+cartful
+Carthage
+Carthaginian
+Carthal
+carthame
+carthamic
+carthamin
+Carthamus
+carthamus
+carthorse
+Carthusian
+carthusian
+Carthy
+Cartie
+Cartier
+cartier
+Cartier-Bresson
+cartiest
+cartilage
+cartilages
+cartilaginean
+Cartilaginei
+cartilagineous
+Cartilagines
+cartilaginification
+cartilaginoid
+cartilaginous
+carting
+cartisane
+Cartist
+cartload
+cartloads
+cartmaker
+cartmaking
+cartman
+cartobibliography
+cartogram
+cartograph
+cartographer
+cartographers
+cartographic
+cartographical
+cartographically
+cartographies
+cartography
+cartomancies
+cartomancy
+carton
+cartoned
+cartoner
+cartonful
+cartoning
+cartonnage
+cartonnier
+cartonniers
+carton-pierre
+cartons
+cartoon
+cartooned
+cartooning
+cartoonist
+cartoonists
+cartoons
+cartop
+cartopper
+cartouch
+cartouche
+cartouches
+cartridge
+cartridges
+cart-rutted
+carts
+cartsale
+cartularies
+cartulary
+cartware
+cartway
+Cartwell
+cart-wheel
+cartwheel
+cartwheeler
+cartwheels
+cartwhip
+Cartwright
+cartwright
+cartwrighting
+carty
+carua
+caruage
+carucage
+carucal
+carucarius
+carucate
+carucated
+Carum
+caruncle
+caruncles
+caruncula
+carunculae
+caruncular
+carunculate
+carunculated
+carunculous
+Carupano
+carus
+Caruso
+Caruthers
+Caruthersville
+carvacrol
+carvacryl
+carvage
+carval
+carve
+carved
+carvel
+carvel-built
+carvel-planked
+carvels
+carven
+carvene
+Carver
+carver
+carvers
+carvership
+Carversville
+carves
+carvestrene
+Carvey
+Carville
+carving
+carvings
+carvist
+carvoeira
+carvoepra
+carvol
+carvomenthene
+carvone
+carvy
+carvyl
+carwash
+carwashes
+carwitchet
+Cary
+cary-
+Carya
+caryatic
+caryatid
+caryatidal
+caryatidean
+caryatides
+caryatidic
+caryatids
+Caryatis
+Caryl
+caryl
+Caryll
+Caryn
+caryo-
+Caryocar
+Caryocaraceae
+caryocaraceous
+Caryophyllaceae
+caryophyllaceous
+caryophyllene
+caryophylleous
+caryophyllin
+caryophyllous
+Caryophyllus
+caryopilite
+caryopses
+caryopsides
+caryopsis
+Caryopteris
+Caryota
+caryotin
+caryotins
+Caryville
+carzey
+CAS
+Cas
+Casa
+casa
+casaba
+casabas
+casabe
+Casabianca
+Casablanca
+casablanca
+Casabonne
+Casadesus
+Casady
+casal
+Casaleggio
+Casals
+casalty
+Casamarca
+Casandra
+Casanova
+casanova
+Casanovanic
+casanovas
+casaque
+casaques
+casaquin
+Casar
+casas
+Casasia
+casate
+Casatus
+Casaubon
+casaun
+casava
+Casavant
+casavas
+casave
+casavi
+Casbah
+casbah
+casbahs
+cascabel
+cascabels
+cascable
+cascables
+cascadable
+cascade
+cascade-connect
+cascaded
+cascades
+Cascadia
+Cascadian
+cascading
+cascadite
+cascado
+Cascais
+cascalho
+cascalote
+cascan
+cascara
+cascaras
+cascarilla
+cascaron
+cascavel
+caschielawis
+caschrom
+Cascilla
+Casco
+casco
+cascol
+cascrom
+cascrome
+CASE
+Case
+case
+Casearia
+casease
+caseases
+caseate
+caseated
+caseates
+caseating
+caseation
+case-bearer
+casebearer
+casebook
+casebooks
+case-bound
+casebound
+casebox
+caseconv
+cased
+casefied
+casefies
+caseful
+casefy
+casefying
+case-harden
+caseharden
+case-hardened
+casehardened
+casehardening
+casehardens
+caseic
+casein
+caseinate
+caseine
+caseinogen
+caseins
+casekeeper
+case-knife
+Casel
+caseless
+caselessly
+caseload
+caseloads
+caselty
+casemaker
+casemaking
+casemate
+casemated
+casemates
+Casement
+casement
+casemented
+casements
+caseolysis
+caseose
+caseoses
+caseous
+caser
+caser-in
+caserio
+caserios
+casern
+caserne
+casernes
+caserns
+Caserta
+cases
+case-shot
+casette
+casettes
+caseum
+Caseville
+case-weed
+caseweed
+casewood
+casework
+case-worker
+caseworker
+caseworkers
+caseworks
+case-worm
+caseworm
+caseworms
+Casey
+Caseyville
+Cash
+cash
+casha
+cashable
+cashableness
+cash-and-carry
+cashaw
+cashaws
+cash-book
+cashbook
+cashbooks
+cashbox
+cashboxes
+cashboy
+cashcuttee
+cashdrawer
+cashed
+casheen
+cashel
+casher
+cashers
+cashes
+cashew
+cashews
+cashgirl
+Cashibo
+cashier
+cashiered
+cashierer
+cashiering
+cashierment
+Cashiers
+cashiers
+cashing
+Cashion
+cashkeeper
+cashless
+cashment
+Cashmere
+cashmere
+cashmeres
+cashmerette
+Cashmerian
+Cashmirian
+cashoo
+cashoos
+cashou
+Cashton
+Cashtown
+Casi
+Casia
+Casie
+Casilda
+Casilde
+casimere
+casimeres
+Casimir
+Casimire
+casimire
+casimires
+Casimiroa
+casina
+casinet
+casing
+casing-in
+casings
+casini
+casino
+casinos
+casiri
+casita
+casitas
+cask
+caskanet
+casked
+casket
+casketed
+casketing
+casketlike
+caskets
+casking
+casklike
+casks
+cask-shaped
+casky
+Caslon
+Casmalia
+Casmey
+Casnovia
+Cason
+Caspar
+Casparian
+Casper
+casper
+Caspian
+caspian
+casque
+casqued
+casques
+casquet
+casquetel
+casquette
+Cass
+cass
+cassaba
+cassabanana
+cassabas
+cassabully
+cassada
+Cassadaga
+Cassady
+cassady
+cassalty
+cassan
+Cassander
+Cassandra
+cassandra
+Cassandra-like
+Cassandran
+cassandras
+Cassandre
+Cassandrian
+Cassandry
+cassapanca
+cassare
+cassareep
+cassata
+cassatas
+cassate
+cassation
+Cassatt
+Cassaundra
+cassava
+cassavas
+Casscoe
+casse
+Cassegrain
+Cassegrainian
+Cassel
+Casselberry
+Cassell
+Cassella
+Casselton
+casselty
+cassena
+casserole
+casseroled
+casseroles
+casseroling
+casse-tete
+cassette
+cassettes
+Cassey
+casshe
+Cassi
+Cassia
+cassia
+Cassiaceae
+Cassian
+Cassiani
+cassias
+cassican
+Cassicus
+Cassida
+cassideous
+cassidid
+Cassididae
+Cassidinae
+cassidoine
+cassidony
+Cassidulina
+cassiduloid
+Cassiduloidea
+Cassidy
+Cassie
+cassie
+Cassiepea
+Cassiepean
+Cassiepeia
+Cassil
+Cassilda
+cassimere
+cassina
+cassine
+Cassinese
+cassinette
+Cassini
+Cassinian
+cassinian
+Cassino
+cassino
+cassinoid
+cassinos
+cassioberry
+Cassiodorus
+Cassiope
+Cassiopea
+Cassiopean
+Cassiopeia
+cassiopeia
+Cassiopeiae
+Cassiopeian
+cassiopeian
+Cassiopeid
+cassiopeium
+cassique
+Cassirer
+cassiri
+CASSIS
+Cassis
+cassis
+cassises
+Cassite
+cassiterite
+cassites
+Cassius
+cassius
+cassock
+cassocked
+cassocks
+Cassoday
+cassolette
+casson
+cassonade
+Cassondra
+cassone
+cassoni
+cassons
+cassoon
+Cassopolis
+cassoulet
+cassowaries
+cassowary
+Casstown
+cassumunar
+cassumuniar
+Cassville
+Cassy
+cassy
+Cassytha
+Cassythaceae
+cast
+Casta
+castable
+castagnole
+Castalia
+castalia
+Castalian
+Castalides
+Castalio
+Castana
+castana
+castane
+Castanea
+castanean
+castaneous
+castanet
+castanets
+castanian
+castano
+Castanopsis
+Castanospermum
+Castara
+castaway
+castaways
+cast-back
+cast-by
+caste
+Casteau
+casted
+Casteel
+casteism
+casteisms
+casteless
+castelet
+Castell
+Castella
+castellan
+castellanies
+castellano
+Castellanos
+castellans
+castellanship
+castellanus
+castellany
+castellar
+castellate
+castellated
+castellation
+castellatus
+castellet
+castelli
+Castellna
+castellum
+Castelnuovo-Tedesco
+Castelvetro
+casten
+Caster
+caster
+Castera
+caste-ridden
+casterless
+caster-off
+casters
+castes
+casteth
+casthouse
+castice
+castigable
+castigate
+castigated
+castigates
+castigating
+castigation
+castigations
+castigative
+castigator
+castigatories
+castigators
+castigatory
+Castiglione
+Castile
+castile
+Castilian
+castilian
+Castilla
+Castilleja
+Castillo
+castillo
+Castilloa
+Castine
+casting
+castings
+cast-iron
+cast-iron-plant
+Castle
+castle
+Castleberry
+castle-builder
+castle-building
+castle-built
+castle-buttressed
+castle-crowned
+castled
+Castledale
+Castleford
+castle-guard
+castle-guarded
+castlelike
+Castlereagh
+castlery
+castles
+castlet
+Castleton
+castleward
+castlewards
+castlewise
+Castlewood
+castling
+cast-me-down
+castock
+cast-off
+castoff
+castoffs
+Castor
+castor
+Castora
+castor-bean
+Castores
+castoreum
+castorial
+Castoridae
+castorin
+Castorina
+castorite
+castorized
+Castorland
+Castoroides
+castors
+castory
+Castra
+castra
+castral
+castrametation
+castrate
+castrated
+castrater
+castrates
+castrati
+castrating
+castration
+castrations
+castrato
+castrator
+castrators
+castratory
+castrensial
+castrensian
+Castries
+Castro
+castro
+Castroism
+Castroist
+Castroite
+Castrop-Rauxel
+Castroville
+castrum
+casts
+cast-steel
+castuli
+cast-weld
+CASU
+casual
+casualism
+casualist
+casuality
+casually
+casualness
+casualnesses
+casuals
+casualties
+casualty
+Casuariidae
+Casuariiformes
+Casuarina
+casuarina
+Casuarinaceae
+casuarinaceous
+Casuarinales
+Casuarius
+casuary
+casuist
+casuistess
+casuistic
+casuistical
+casuistically
+casuistries
+casuistry
+casuists
+casula
+casule
+casus
+casusistry
+Caswell
+caswellite
+Casziel
+CAT
+Cat
+cat
+cat.
+cata-
+catabaptist
+catabases
+catabasion
+catabasis
+catabatic
+catabibazon
+catabiotic
+catabolic
+catabolically
+catabolin
+catabolism
+catabolite
+catabolize
+catabolized
+catabolizing
+catacaustic
+catachreses
+catachresis
+catachresti
+catachrestic
+catachrestical
+catachrestically
+catachthonian
+catachthonic
+cataclasis
+cataclasm
+cataclasmic
+cataclastic
+cataclinal
+cataclysm
+cataclysmal
+cataclysmatic
+cataclysmatist
+cataclysmic
+cataclysmically
+cataclysmist
+cataclysms
+catacomb
+catacombic
+catacombs
+catacorner
+catacorolla
+catacoustics
+catacromyodian
+catacrotic
+catacrotism
+catacumba
+catacumbal
+catacylsmic
+catadicrotic
+catadicrotism
+catadioptric
+catadioptrical
+catadioptrics
+catadrome
+catadromous
+catadupe
+Cataebates
+catafalco
+catafalque
+catafalques
+catagenesis
+catagenetic
+catagmatic
+catagories
+Cataian
+cataian
+catakinesis
+catakinetic
+catakinetomer
+catakinomeric
+Catalan
+catalan
+Catalanganes
+Catalanist
+catalase
+catalases
+catalatic
+Catalaunian
+Cataldo
+catalecta
+catalectic
+catalecticant
+catalects
+catalepsies
+catalepsis
+catalepsy
+cataleptic
+cataleptically
+cataleptics
+cataleptiform
+cataleptize
+cataleptoid
+catalexes
+catalexis
+Catalin
+catalin
+Catalina
+catalina
+catalineta
+catalinite
+catallactic
+catallactically
+catallactics
+catallum
+catalo
+cataloes
+catalog
+cataloged
+cataloger
+catalogers
+catalogia
+catalogic
+catalogical
+cataloging
+catalogist
+catalogistic
+catalogize
+catalogs
+catalogue
+catalogued
+cataloguer
+cataloguers
+catalogues
+cataloguing
+cataloguish
+cataloguist
+cataloguize
+Catalonia
+Catalonian
+cataloon
+catalos
+catalowne
+Catalpa
+catalpa
+catalpas
+catalufa
+catalufas
+catalyse
+catalyses
+catalysis
+catalyst
+catalysts
+catalyte
+catalytic
+catalytical
+catalytically
+catalyzator
+catalyze
+catalyzed
+catalyzer
+catalyzers
+catalyzes
+catalyzing
+catamaran
+catamarans
+Catamarca
+Catamarcan
+Catamarenan
+catamenia
+catamenial
+catamite
+catamited
+catamites
+catamiting
+Catamitus
+catamneses
+catamnesis
+catamnestic
+catamount
+cat-a-mountain
+catamountain
+catamounts
+catan
+catanadromous
+Catananche
+cat-and-dog
+cat-and-doggish
+Catania
+Catano
+Catanzaro
+catapan
+catapasm
+catapetalous
+cataphasia
+cataphatic
+cataphonic
+cataphonics
+cataphora
+cataphoresis
+cataphoretic
+cataphoretically
+cataphoria
+cataphoric
+cataphract
+Cataphracta
+cataphracted
+Cataphracti
+cataphractic
+cataphrenia
+cataphrenic
+Cataphrygian
+cataphrygian
+cataphrygianism
+cataphyll
+cataphylla
+cataphyllary
+cataphyllum
+cataphysic
+cataphysical
+cataplane
+cataplasia
+cataplasis
+cataplasm
+cataplastic
+catapleiite
+cataplexy
+catapuce
+catapult
+catapulted
+catapultic
+catapultier
+catapulting
+catapults
+cataract
+cataractal
+cataracted
+cataracteg
+cataractine
+cataractous
+cataracts
+cataractwise
+cataria
+Catarina
+catarinite
+catarrh
+catarrhal
+catarrhally
+catarrhed
+Catarrhina
+catarrhine
+catarrhinian
+catarrhous
+catarrhs
+catasarka
+Catasauqua
+Catasetum
+cataspilite
+catasta
+catastaltic
+catastases
+catastasis
+catastate
+catastatic
+catasterism
+catastrophal
+catastrophe
+catastrophes
+catastrophic
+catastrophical
+catastrophically
+catastrophism
+catastrophist
+catathymic
+catatonia
+catatoniac
+catatonias
+catatonic
+catatonics
+catatony
+Cataula
+Cataumet
+Catavi
+catawampous
+catawampously
+catawamptious
+catawamptiously
+catawampus
+Catawba
+catawba
+catawbas
+Catawissa
+cat-bed
+catberry
+catbird
+catbirds
+catboat
+catboats
+catbrier
+catbriers
+cat-built
+catcall
+catcalled
+catcaller
+catcalling
+catcalls
+catch
+catch-
+catch-22
+catchable
+catch-all
+catchall
+catchalls
+catch-as-catch-can
+catch-cord
+catchcry
+catched
+catcher
+catchers
+catches
+catchflies
+catchfly
+catchie
+catchier
+catchiest
+catchiness
+catching
+catchingly
+catchingness
+catchland
+catchlight
+catchline
+catchment
+catchments
+cat-chop
+catchpennies
+catchpenny
+catchphrase
+catchplate
+catchpole
+catchpoled
+catchpolery
+catchpoleship
+catchpoling
+catchpoll
+catchpolled
+catchpollery
+catchpolling
+catch-up
+catchup
+catchups
+catchwater
+catchweed
+catchweight
+catchword
+catchwords
+catchwork
+catchy
+catclaw
+cat-clover
+catdom
+Cate
+cate
+catecheses
+catechesis
+catechetic
+catechetical
+catechetically
+catechin
+catechins
+catechisable
+catechisation
+catechise
+catechised
+catechiser
+catechising
+Catechism
+catechism
+catechismal
+catechisms
+catechist
+catechistic
+catechistical
+catechistically
+catechists
+catechizable
+catechization
+catechize
+catechized
+catechizer
+catechizes
+catechizing
+catechol
+catecholamine
+catecholamines
+catechols
+catechu
+catechumen
+catechumenal
+catechumenate
+catechumenical
+catechumenically
+catechumenism
+catechumens
+catechumenship
+catechus
+catechutannic
+categorem
+categorematic
+categorematical
+categorematically
+categorial
+categoric
+categorical
+categorically
+categoricalness
+categories
+categorisation
+categorise
+categorised
+categorising
+categorist
+categorization
+categorizations
+categorize
+categorized
+categorizer
+categorizers
+categorizes
+categorizing
+category
+catel
+catelectrode
+catelectrotonic
+catelectrotonus
+catella
+catena
+catenae
+catenane
+catenarian
+catenaries
+catenary
+catenas
+catenate
+catenated
+catenates
+catenating
+catenation
+catenative
+catenoid
+catenoids
+catenulate
+catepuce
+cater
+cateran
+caterans
+caterbrawl
+catercap
+cater-corner
+catercorner
+cater-cornered
+catercornered
+catercornerways
+cater-cousin
+catercousin
+cater-cousinship
+catered
+caterer
+caterers
+caterership
+cateress
+cateresses
+Caterina
+catering
+cateringly
+Caterpillar
+caterpillar
+caterpillared
+caterpillarlike
+caterpillars
+caters
+caterva
+caterwaul
+caterwauled
+caterwauler
+caterwauling
+caterwauls
+catery
+Cates
+cates
+Catesbaea
+catesbeiana
+Catesby
+cateye
+cat-eyed
+catface
+catfaced
+catfaces
+catfacing
+catfall
+catfalls
+catfight
+cat-fish
+catfish
+catfishes
+cat-foot
+catfoot
+catfooted
+catgut
+catguts
+Cath
+Cath.
+cath
+cath-
+Catha
+cat-hammed
+Cathar
+cathar
+catharan
+Cathari
+Catharina
+Catharine
+catharine
+Catharism
+Catharist
+catharist
+Catharistic
+catharization
+catharize
+catharized
+catharizing
+Catharpin
+cat-harpin
+cat-harpings
+Cathars
+catharses
+catharsis
+Catharsius
+Cathartae
+Cathartes
+cathartic
+cathartical
+cathartically
+catharticalness
+cathartics
+Cathartidae
+Cathartides
+cathartin
+Cathartolinum
+Cathay
+Cathayan
+Cathe
+cat-head
+cathead
+catheads
+cathect
+cathected
+cathectic
+cathecting
+cathection
+cathects
+cathedra
+cathedrae
+cathedral
+cathedraled
+cathedralesque
+cathedralic
+cathedral-like
+cathedrallike
+cathedrals
+cathedralwise
+cathedras
+cathedrated
+cathedratic
+cathedratica
+cathedratical
+cathedratically
+cathedraticum
+Cathee
+cathepsin
+catheptic
+Cather
+catheretic
+Catherin
+Catherina
+Catherine
+catherine
+cathern
+Catherwood
+Catheryn
+catheter
+catheterisation
+catheterise
+catheterised
+catheterising
+catheterism
+catheterization
+catheterize
+catheterized
+catheterizes
+catheterizing
+catheters
+catheti
+cathetometer
+cathetometric
+cathetus
+cathetusti
+cathexes
+cathexion
+cathexis
+Cathey
+Cathi
+cathidine
+Cathie
+cathin
+cathine
+cathinine
+cathion
+cathisma
+cathismata
+Cathlamet
+Cathleen
+Cathlene
+cathodal
+cathode
+cathodegraph
+cathodes
+cathodic
+cathodical
+cathodically
+cathodofluorescence
+cathodograph
+cathodography
+cathodoluminescence
+cathodo-luminescent
+cathodoluminescent
+cathograph
+cathography
+cat-hole
+cathole
+Catholic
+catholic
+catholical
+catholically
+catholicalness
+catholicate
+catholici
+catholicisation
+catholicise
+catholicised
+catholiciser
+catholicising
+Catholicism
+catholicism
+catholicist
+Catholicity
+catholicity
+catholicization
+catholicize
+catholicized
+catholicizer
+catholicizing
+catholicly
+catholicness
+catholico-
+catholicoi
+catholicon
+catholicos
+catholicoses
+catholics
+catholicus
+catholyte
+Cathomycin
+cathood
+cathop
+cathouse
+cathouses
+Cathrin
+Cathrine
+ca'-thro'
+cathro
+Cathryn
+cathud
+Cathy
+cathy
+Cathyleen
+Cati
+Catie
+Catilinarian
+Catiline
+catiline
+Catima
+Catina
+cating
+cation
+cation-active
+cationic
+cationically
+cations
+CATIS
+cativo
+catjang
+catkin
+catkinate
+catkins
+Catlaina
+cat-lap
+catlap
+CATLAS
+Catlee
+Catlett
+Catlettsburg
+cat-like
+catlike
+Catlin
+catlin
+catline
+catling
+catlings
+catlinite
+catlins
+cat-locks
+catmalison
+catmint
+catmints
+catnache
+catnap
+catnaper
+catnapers
+catnapped
+catnapper
+catnapping
+catnaps
+catnep
+catnip
+catnips
+Cato
+catoblepas
+Catocala
+catocalid
+catocarthartic
+catocathartic
+catochus
+Catoctin
+catoctin
+Catodon
+catodont
+catogene
+catogenic
+Catoism
+cat-o'-mountain
+Caton
+Catonian
+catonian
+Catonic
+Catonically
+cat-o'-nine-tails
+cat-o-nine-tails
+Catonism
+Catonsville
+Catoosa
+catoptric
+catoptrical
+catoptrically
+catoptrics
+catoptrite
+catoptromancy
+catoptromantic
+Catoquina
+catostomid
+Catostomidae
+catostomoid
+Catostomus
+catouse
+catpiece
+catpipe
+catproof
+Catreus
+cat-rigged
+catrigged
+Catrina
+Catriona
+Catron
+cats
+cat's-claw
+cat's-cradle
+cat's-ear
+cat's-eye
+cat's-eyes
+cat's-feet
+cat's-foot
+cat's-head
+Catskill
+catskill
+Catskills
+catskin
+catskinner
+catslide
+catso
+catsos
+cat's-paw
+catspaw
+catspaws
+cat's-tail
+catstane
+catstep
+cat-stick
+catstick
+catstitch
+catstitcher
+catstone
+catsup
+catsups
+Catt
+cattabu
+cattail
+cattails
+cattalo
+cattaloes
+cattalos
+Cattan
+cattan
+Cattaraugus
+catted
+Cattegat
+Cattell
+catter
+catteries
+cattery
+Catti
+cattie
+Cattier
+cattier
+catties
+cattiest
+cattily
+Cattima
+cattimandoo
+cattiness
+cattinesses
+catting
+cattish
+cattishly
+cattishness
+cattle
+cattlebush
+cattlefold
+cattlegate
+cattle-grid
+cattle-guard
+cattlehide
+cattleless
+cattleman
+cattlemen
+cattle-plague
+cattle-ranching
+cattleship
+cattle-specked
+Cattleya
+cattleya
+cattleyak
+cattleyas
+Catto
+Catton
+cat-train
+Catty
+catty
+catty-co
+catty-corner
+cattycorner
+catty-cornered
+cattycornered
+cattyman
+cattyphoid
+Catullian
+Catullus
+catur
+CATV
+catvine
+catwalk
+catwalks
+cat-whistles
+catwise
+cat-witted
+catwood
+catwort
+Caty
+catydid
+catzerie
+CAU
+caubeen
+cauboge
+Cauca
+Caucasia
+Caucasian
+caucasian
+caucasians
+Caucasic
+Caucasoid
+caucasoid
+caucasoids
+Caucasus
+caucasus
+Caucete
+cauch
+cauchemar
+cauchillo
+caucho
+Cauchy
+Caucon
+caucus
+caucused
+caucuses
+caucusing
+caucussed
+caucusses
+caucussing
+cauda
+caudad
+caudae
+caudaite
+caudal
+caudally
+caudalward
+Caudata
+caudata
+caudate
+caudated
+caudates
+caudation
+caudatolenticular
+caudatory
+caudatum
+Caudebec
+caudebeck
+caudex
+caudexes
+caudices
+caudicle
+caudiform
+caudillism
+Caudillo
+caudillo
+caudillos
+caudle
+caudles
+caudocephalad
+caudodorsal
+caudofemoral
+caudolateral
+caudotibial
+caudotibialis
+cauf
+caufle
+Caughey
+Caughnawaga
+caught
+cauk
+cauked
+cauking
+caul
+cauld
+cauldrife
+cauldrifeness
+cauldron
+cauldrons
+caulds
+Caulerpa
+Caulerpaceae
+caulerpaceous
+caules
+caulescent
+Caulfield
+cauli
+caulicle
+caulicles
+caulicole
+caulicolous
+caulicule
+cauliculi
+cauliculus
+cauliferous
+cauliflorous
+cauliflory
+cauliflower
+cauliflower-eared
+cauliflowers
+cauliform
+cauligenous
+caulinar
+caulinary
+cauline
+caulis
+Caulite
+caulivorous
+caulk
+caulked
+caulker
+caulkers
+caulking
+caulkings
+caulks
+caulo-
+caulocarpic
+caulocarpous
+caulome
+caulomer
+caulomic
+Caulonia
+caulophylline
+Caulophyllum
+Caulopteris
+caulopteris
+caulosarc
+caulotaxis
+caulotaxy
+caulote
+cauls
+caum
+cauma
+caumatic
+caunch
+Caundra
+Caunos
+caunter
+Caunus
+caup
+caupo
+cauponate
+cauponation
+caupones
+cauponize
+Cauquenes
+Cauqui
+caurale
+Caurus
+caus
+caus.
+causa
+causability
+causable
+causae
+causal
+causaless
+causalgia
+causalities
+causality
+causally
+causals
+causans
+causata
+causate
+causation
+causational
+causationism
+causationist
+causations
+causative
+causatively
+causativeness
+causativity
+causator
+causatum
+cause
+cause-and-effect
+caused
+causeful
+causeless
+causelessly
+causelessness
+causer
+causerie
+causeries
+causers
+causes
+causeur
+causeuse
+causeuses
+causeway
+causewayed
+causewaying
+causewayman
+causeways
+Causey
+causey
+causeys
+causidical
+causing
+causingness
+causon
+causse
+causson
+caustic
+caustical
+caustically
+causticiser
+causticism
+causticity
+causticization
+causticize
+causticized
+causticizer
+causticizing
+causticly
+causticness
+caustics
+caustification
+caustified
+caustify
+caustifying
+Causus
+cautel
+cautela
+cautelous
+cautelously
+cautelousness
+cauter
+cauterant
+cauteries
+cauterisation
+cauterise
+cauterised
+cauterising
+cauterism
+cauterization
+cauterizations
+cauterize
+cauterized
+cauterizer
+cauterizes
+cauterizing
+cautery
+Cauthornville
+cautio
+caution
+cautionaries
+cautionary
+cautioned
+cautioner
+cautioners
+cautiones
+cautioning
+cautionings
+cautionry
+cautions
+cautious
+cautiously
+cautiousness
+cautiousnesses
+cautivo
+Cauvery
+CAV
+Cav
+Cav.
+cav
+cava
+cavae
+cavaedia
+cavaedium
+Cavafy
+caval
+cavalcade
+cavalcaded
+cavalcades
+cavalcading
+Cavalerius
+cavalero
+cavaleros
+Cavalier
+cavalier
+cavaliere
+cavaliered
+cavalieres
+Cavalieri
+cavalieri
+cavaliering
+cavalierish
+cavalierishness
+cavalierism
+cavalierly
+cavalierness
+cavaliernesses
+cavaliero
+cavaliers
+cavaliership
+cavalla
+Cavallaro
+cavallas
+cavallies
+cavally
+cavalries
+cavalry
+cavalryman
+cavalrymen
+Cavan
+Cavanagh
+Cavanaugh
+cavascope
+cavate
+cavated
+cavatina
+cavatinas
+cavatine
+cavayard
+cavdia
+Cave
+cave
+cavea
+caveae
+caveat
+caveated
+caveatee
+caveating
+caveator
+caveators
+caveats
+caved
+cavefish
+cavefishes
+cave-guarded
+cave-in
+cavekeeper
+cave-keeping
+cavel
+cavelet
+cavelike
+Cavell
+cave-lodged
+cave-loving
+caveman
+cavemen
+Cavendish
+cavendish
+caver
+cavern
+cavernal
+caverned
+cavernicolous
+caverning
+cavernitis
+cavernlike
+cavernoma
+cavernous
+cavernously
+caverns
+cavernulous
+cavers
+Caves
+caves
+cavesson
+Cavetown
+cavetti
+cavetto
+cavettos
+cavey
+Cavia
+caviar
+caviare
+caviares
+caviars
+cavicorn
+Cavicornia
+Cavidae
+cavie
+cavies
+Cavil
+cavil
+caviled
+caviler
+cavilers
+caviling
+cavilingly
+cavilingness
+Cavill
+cavillation
+cavillatory
+cavilled
+caviller
+cavillers
+cavilling
+cavillingly
+cavillingness
+cavillous
+cavils
+cavin
+Cavina
+Caviness
+caving
+cavings
+cavi-relievi
+cavi-rilievi
+cavish
+Cavit
+cavitary
+cavitate
+cavitated
+cavitates
+cavitating
+cavitation
+cavitations
+Cavite
+caviteno
+cavitied
+cavities
+cavity
+caviya
+cavo-relievo
+cavo-relievos
+cavo-rilievo
+cavort
+cavorted
+cavorter
+cavorters
+cavorting
+cavorts
+Cavour
+CAVU
+cavu
+cavum
+Cavuoto
+cavus
+cavy
+cavyyard
+caw
+Cawdrey
+cawed
+cawing
+cawk
+cawker
+cawky
+cawl
+Cawley
+cawney
+cawnie
+Cawnpore
+cawny
+Cawood
+cawquaw
+caws
+c-axes
+Caxias
+caxiri
+c-axis
+caxon
+Caxton
+caxton
+Caxtonian
+cay
+Cayapa
+Cayapo
+Cayce
+Caye
+Cayenne
+cayenne
+cayenned
+cayennes
+Cayes
+Cayey
+Cayla
+Cayley
+Cayleyan
+cayleyan
+Caylor
+cayman
+caymans
+caynard
+cayos
+cays
+Cayser
+Cayubaba
+Cayubaban
+cayuca
+cayuco
+Cayucos
+Cayuga
+cayuga
+Cayugan
+Cayugas
+cayugas
+Cayuse
+cayuse
+cayuses
+Cayuta
+Cayuvava
+Caz
+caza
+Cazadero
+Cazenovia
+cazibi
+cazimi
+cazique
+caziques
+Cazzie
+C.B.
+CB
+Cb
+cb
+CBC
+C.B.D.
+CBD
+CBDS
+C.B.E.
+CBE
+CBEL
+CBEMA
+CBI
+C-bias
+CBR
+CBS
+CBW
+CBX
+C.C.
+CC
+Cc
+cc
+cc.
+CCA
+CCAFS
+CCC
+CCCCM
+CCCI
+CCD
+CCDS
+Cceres
+ccesser
+CCF
+CCH
+Cchaddie
+cchaddoorck
+Cchakri
+CCI
+ccid
+CCIM
+CCIP
+CCIR
+CCIS
+CCITT
+ccitt
+cckw
+CCL
+CCls
+ccm
+CCNC
+CCNY
+Ccoya
+CCP
+CCR
+CCRP
+CCS
+CCSA
+CCT
+CCTA
+CCTAC
+CCTV
+CCU
+Ccuta
+CCV
+CCW
+ccw
+ccws
+C.D.
+C/D
+CD
+Cd
+c.d.
+c/d
+cd
+cd.
+CDA
+CDAR
+CDB
+CDC
+CDCF
+Cdenas
+CDEV
+CDF
+cdf
+cdg
+CDI
+CDIAC
+Cdiz
+CDN
+Cdn
+CDO
+Cdoba
+CDP
+CDPR
+CDR
+Cdr
+Cdr.
+cdr
+Cdre
+CDROM
+CDS
+CDSF
+CDT
+CDU
+C.E.
+CE
+Ce
+ce
+CEA
+Ceanothus
+ceanothus
+Cear
+Ceara
+cearin
+cease
+ceased
+cease-fire
+ceaseless
+ceaselessly
+ceaselessness
+ceases
+ceasing
+ceasmic
+Ceausescu
+Ceb
+Cebalrai
+Cebatha
+cebell
+cebian
+cebid
+Cebidae
+cebids
+cebil
+cebine
+ceboid
+ceboids
+Cebolla
+cebollite
+Cebriones
+Cebu
+cebur
+Cebus
+cebus
+CEC
+ceca
+cecal
+cecally
+cecca
+cecchine
+Cece
+Cecelia
+Cechy
+cecidiologist
+cecidiology
+cecidium
+cecidogenous
+cecidologist
+cecidology
+cecidomyian
+cecidomyiid
+Cecidomyiidae
+cecidomyiidous
+Cecil
+cecil
+Cecile
+Ceciley
+Cecilia
+Cecilio
+cecilite
+Cecilius
+Cecilla
+Cecillia
+cecils
+Cecilton
+Cecily
+cecitis
+cecity
+cecograph
+Cecomorphae
+cecomorphic
+cecopexy
+cecostomy
+cecotomy
+Cecropia
+cecropia
+Cecrops
+cecum
+cecums
+cecutiency
+Cecyle
+CED
+Ced
+Cedalion
+Cedar
+cedar
+cedarbird
+Cedarbrook
+cedar-brown
+Cedarburg
+cedar-colored
+Cedarcrest
+cedared
+Cedaredge
+Cedarhurst
+Cedarkey
+Cedarlane
+cedarn
+Cedars
+cedars
+Cedartown
+Cedarvale
+Cedarville
+cedarware
+cedarwood
+cedary
+cede
+ceded
+Cedell
+cedens
+cedent
+ceder
+ceders
+cedes
+cedi
+cedilla
+cedillas
+ceding
+cedis
+cedr-
+cedrat
+cedrate
+cedre
+Cedreatis
+Cedrela
+cedrela
+cedrene
+Cedric
+cedrin
+cedrine
+cedriret
+cedrium
+cedrol
+cedron
+Cedrus
+cedry
+cedula
+cedulas
+cedule
+ceduous
+cee
+ceennacuelum
+CEERT
+cees
+Ceevah
+Ceevee
+CEF
+Cefis
+CEGB
+CEI
+Ceiba
+ceiba
+ceibas
+ceibo
+ceibos
+Ceil
+ceil
+ceile
+ceiled
+ceiler
+ceilers
+ceilidh
+ceilidhe
+ceiling
+ceilinged
+ceilings
+ceilingward
+ceilingwards
+ceilometer
+ceils
+ceint
+ceinte
+ceinture
+ceintures
+ceja
+Cela
+Celadon
+celadon
+celadonite
+celadons
+Celaeno
+celandine
+celandines
+Celanese
+Celarent
+celarent
+Celastraceae
+celastraceous
+Celastrus
+celation
+celative
+celature
+Celaya
+-cele
+Cele
+cele
+celeb
+celebe
+Celebes
+celebes
+Celebesian
+celebrant
+celebrants
+celebrate
+celebrated
+celebratedly
+celebratedness
+celebrater
+celebrates
+celebrating
+celebration
+celebrationis
+celebrations
+celebrative
+celebrator
+celebrators
+celebratory
+celebre
+celebres
+celebret
+Celebrezze
+celebrious
+celebrities
+celebrity
+celebs
+celemin
+celemines
+Celene
+celeomorph
+Celeomorphae
+celeomorphic
+celeriac
+celeriacs
+celeries
+celerities
+celerity
+celery
+celery-leaved
+celery-topped
+Celeski
+Celesta
+celesta
+celestas
+Celeste
+celeste
+celestes
+Celestia
+celestial
+celestiality
+celestialize
+celestialized
+celestially
+celestialness
+celestify
+Celestina
+celestina
+Celestine
+celestine
+Celestinian
+celestite
+celestitude
+Celestyn
+Celestyna
+celeusma
+Celeuthea
+Celia
+celiac
+celiacs
+celiadelphus
+celiagra
+celialgia
+celibacies
+celibacy
+celibataire
+celibatarian
+celibate
+celibates
+celibatic
+celibatist
+celibatory
+celidographer
+celidography
+Celie
+celiectasia
+celiectomy
+celiemia
+celiitis
+Celik
+Celin
+Celina
+Celinda
+Celine
+Celinka
+Celio
+celiocele
+celiocentesis
+celiocolpotomy
+celiocyesis
+celiodynia
+celioelytrotomy
+celioenterotomy
+celiogastrotomy
+celiohysterotomy
+celiolymph
+celiomyalgia
+celiomyodynia
+celiomyomectomy
+celiomyomotomy
+celiomyositis
+celioncus
+celioparacentesis
+celiopyosis
+celiorrhaphy
+celiorrhea
+celiosalpingectomy
+celiosalpingotomy
+celioschisis
+celioscope
+celioscopy
+celiotomies
+celiotomy
+Celisse
+celite
+Celka
+cell
+cella
+cellae
+cellager
+cellar
+cellarage
+cellared
+cellarer
+cellarers
+cellaress
+cellaret
+cellarets
+cellarette
+cellaring
+cellarless
+cellarman
+cellarmen
+cellarous
+cellars
+cellarway
+cellarwoman
+cellated
+cellblock
+cell-blockade
+cellblocks
+Celle
+celled
+Cellepora
+cellepore
+Cellfalcicula
+celli
+celliferous
+celliform
+cellifugal
+celling
+Cellini
+cellipetal
+cellist
+cellists
+Cellite
+cell-like
+cellmate
+cellmates
+Cello
+cello
+cellobiose
+cellocut
+celloid
+celloidin
+celloist
+cellophane
+cellophanes
+cellos
+cellose
+cells
+cell-shaped
+Cellucotton
+cellular
+cellularity
+cellularly
+cellulase
+cellulate
+cellulated
+cellulating
+cellulation
+cellule
+cellules
+cellulicidal
+celluliferous
+cellulifugal
+cellulifugally
+cellulin
+cellulipetal
+cellulipetally
+cellulitis
+cellulo-
+cellulocutaneous
+cellulofibrous
+Celluloid
+celluloid
+celluloided
+cellulolytic
+Cellulomonadeae
+Cellulomonas
+cellulose
+cellulosed
+celluloses
+cellulosic
+cellulosing
+cellulosities
+cellulosity
+cellulotoxic
+cellulous
+Cellvibrio
+Cel-o-Glass
+celom
+celomata
+celoms
+celo-navigation
+Celoron
+celoscope
+Celosia
+celosia
+celosias
+Celotex
+celotomies
+celotomy
+Cels
+Celsia
+celsian
+celsitude
+Celsius
+celsius
+CELSS
+Celt
+Celt.
+celt
+Celtdom
+Celtiberi
+Celtiberian
+Celtic
+celtic
+Celtically
+Celtic-Germanic
+Celticism
+Celticist
+celticist
+Celticize
+Celtidaceae
+celtiform
+Celtillyrians
+Celtis
+Celtish
+Celtism
+Celtist
+celtium
+Celtization
+celto-
+Celto-Germanic
+Celto-ligyes
+Celtologist
+Celtologue
+Celtomaniac
+Celtophil
+Celtophobe
+Celtophobia
+Celto-roman
+Celto-slavic
+Celto-thracians
+celts
+celtuce
+celure
+Cemal
+cembali
+cembalist
+cembalo
+cembalon
+cembalos
+cement
+cementa
+cemental
+cementation
+cementations
+cementatory
+cement-coated
+cement-covered
+cement-drying
+cemented
+cementer
+cementers
+cement-faced
+cement-forming
+cementification
+cementing
+cementite
+cementitious
+cementless
+cementlike
+cement-lined
+cement-lining
+cementmaker
+cementmaking
+cementoblast
+cementoma
+Cementon
+cements
+cement-temper
+cementum
+cementwork
+cemetaries
+cemetary
+cemeterial
+cemeteries
+cemetery
+CEN
+cen
+cen-
+cen.
+Cenac
+cenacle
+cenacles
+cenaculum
+Cenaean
+Cenaeum
+cenanthous
+cenanthy
+cenation
+cenatory
+Cence
+cencerro
+cencerros
+Cenchrias
+Cenchrus
+Cenci
+cendre
+-cene
+cene
+cenesthesia
+cenesthesis
+cenesthetic
+Cenis
+cenizo
+cenobe
+cenobian
+cenobies
+cenobite
+cenobites
+cenobitic
+cenobitical
+cenobitically
+cenobitism
+cenobium
+cenoby
+cenogamy
+cenogenesis
+cenogenetic
+cenogenetically
+cenogonous
+Cenomanian
+cenosite
+cenosity
+cenospecies
+cenospecific
+cenospecifically
+cenotaph
+cenotaphic
+cenotaphies
+cenotaphs
+cenotaphy
+cenote
+cenotes
+Cenozoic
+cenozoic
+cenozoology
+CENS
+cense
+censed
+censer
+censerless
+censers
+censes
+censing
+censitaire
+censive
+censor
+censorable
+censorate
+censored
+censorial
+censorian
+censoring
+Censorinus
+censorious
+censoriously
+censoriousness
+censoriousnesses
+censors
+censorship
+censorships
+censual
+censurability
+censurable
+censurableness
+censurably
+censure
+censured
+censureless
+censurer
+censurers
+censures
+censureship
+censuring
+census
+censused
+censuses
+censusing
+cent
+cent.
+centage
+centai
+cental
+centals
+centare
+centares
+centas
+centaur
+centaurdom
+Centaurea
+centaurea
+centauress
+Centauri
+centauri
+centaurial
+centaurian
+centauric
+Centaurid
+Centauridium
+centauries
+Centaurium
+centauromachia
+centauromachy
+centauro-triton
+centaurs
+Centaurus
+centaurus
+centaury
+centavo
+centavos
+centena
+centenar
+centenarian
+centenarianism
+centenarians
+centenaries
+Centenary
+centenary
+centenier
+centenionales
+centenionalis
+centennia
+centennial
+centennially
+centennials
+centennium
+Centeno
+Center
+center
+centerable
+centerboard
+centerboards
+centered
+centeredly
+centeredness
+centerer
+center-fire
+centerfold
+centerfolds
+centering
+centerless
+centerline
+centermost
+centerpiece
+centerpieces
+centerpunch
+centers
+center-sawed
+center-second
+centervelic
+Centerville
+centerward
+centerwise
+centeses
+centesimal
+centesimally
+centesimate
+centesimation
+centesimi
+centesimo
+centesimos
+centesis
+centesm
+Centetes
+centetid
+Centetidae
+centgener
+centgrave
+centi
+centi-
+centiar
+centiare
+centiares
+centibar
+centiday
+centifolious
+centigrade
+centigrado
+centigram
+centigramme
+centigrams
+centile
+centiles
+centiliter
+centiliters
+centilitre
+centillion
+centillions
+centillionth
+Centiloquy
+centiloquy
+Centimani
+centime
+centimes
+centimeter
+centimeter-gram
+centimeter-gram-second
+centimeters
+centimetre
+centimetre-gramme-second
+centimetre-gram-second
+centimetres
+centimo
+centimolar
+centimos
+centinel
+centinody
+centinormal
+centipedal
+centipede
+centipedes
+centiplume
+centipoise
+centistere
+centistoke
+centner
+centners
+CENTO
+cento
+centon
+centones
+centonical
+centonism
+centonization
+Centonze
+centos
+centr-
+centra
+centrad
+Centrahoma
+central
+centrale
+centraler
+Centrales
+centrales
+centralest
+central-fire
+Centralia
+centralia
+centralisation
+centralise
+centralised
+centraliser
+centralising
+centralism
+centralist
+centralistic
+centralists
+centralities
+centrality
+centralization
+centralizations
+centralize
+centralized
+centralizer
+centralizers
+centralizes
+centralizing
+centrally
+centralness
+centrals
+centranth
+Centranthus
+centrarchid
+Centrarchidae
+centrarchoid
+centration
+Centraxonia
+centraxonial
+Centre
+centre
+centreboard
+Centrechinoida
+centred
+centref
+centre-fire
+centrefold
+Centrehall
+centreless
+centremost
+centrepiece
+centrer
+centres
+centrev
+Centreville
+centrex
+centri-
+-centric
+centric
+Centricae
+centrical
+centricality
+centrically
+centricalness
+centricipital
+centriciput
+centricity
+centriffed
+centrifugal
+centrifugalisation
+centrifugalise
+centrifugalization
+centrifugalize
+centrifugalized
+centrifugalizing
+centrifugaller
+centrifugally
+centrifugate
+centrifugation
+centrifuge
+centrifuged
+centrifugence
+centrifuges
+centrifuging
+centring
+centrings
+centriole
+centripetal
+centripetalism
+centripetally
+centripetence
+centripetency
+centriscid
+Centriscidae
+centrisciform
+centriscoid
+Centriscus
+centrism
+centrisms
+centrist
+centrists
+centro
+centro-
+centroacinar
+centrobaric
+centrobarical
+centroclinal
+centrode
+centrodesmose
+centrodesmus
+centrodorsal
+centrodorsally
+centroid
+centroidal
+centroids
+centrolecithal
+Centrolepidaceae
+centrolepidaceous
+centrolinead
+centrolineal
+centromere
+centromeric
+centronote
+centronucleus
+centroplasm
+Centropomidae
+Centropomus
+Centrosema
+centrosome
+centrosomic
+Centrosoyus
+Centrospermae
+centrosphere
+centrosymmetric
+centrosymmetrical
+centrosymmetry
+Centrotus
+centrum
+centrums
+centrutra
+centry
+cents
+centum
+centums
+centumvir
+centumviral
+centumvirate
+Centunculus
+centuple
+centupled
+centuples
+centuplicate
+centuplicated
+centuplicating
+centuplication
+centupling
+centuply
+centure
+Centuria
+centuria
+centurial
+centuriate
+centuriation
+centuriator
+centuried
+centuries
+centurion
+centurions
+centurist
+Century
+century
+CEO
+ceonocyte
+ceorl
+ceorlish
+ceorls
+cep
+cepa
+cepaceous
+cepe
+cepes
+cephadia
+cephaeline
+Cephaelis
+cephal-
+cephala
+Cephalacanthidae
+Cephalacanthus
+cephalad
+cephalagra
+cephalalgia
+cephalalgic
+cephalalgy
+cephalanthium
+cephalanthous
+Cephalanthus
+Cephalaspis
+cephalaspis
+Cephalata
+cephalate
+cephaldemae
+cephalemia
+cephaletron
+Cephaleuros
+cephalexin
+cephalhematoma
+cephalhydrocele
+-cephalic
+cephalic
+cephalically
+cephalin
+Cephalina
+cephaline
+cephalins
+cephalism
+cephalitis
+cephalization
+cephalo-
+cephaloauricular
+cephalob
+Cephalobranchiata
+cephalobranchiate
+cephalocathartic
+cephalocaudal
+cephalocele
+cephalocentesis
+cephalocercal
+Cephalocereus
+cephalochord
+Cephalochorda
+cephalochordal
+Cephalochordata
+cephalochordate
+cephaloclasia
+cephaloclast
+cephalocone
+cephaloconic
+cephalocyst
+cephalodia
+cephalodiscid
+Cephalodiscida
+Cephalodiscus
+cephalodium
+cephalodymia
+cephalodymus
+cephalodynia
+cephalofacial
+cephalogenesis
+cephalogram
+cephalograph
+cephalohumeral
+cephalohumeralis
+cephaloid
+cephalology
+cephalom
+cephalomancy
+cephalomant
+cephalomelus
+cephalomenia
+cephalomeningitis
+cephalomere
+cephalometer
+cephalometric
+cephalometry
+cephalomotor
+cephalomyitis
+cephalon
+cephalonasal
+Cephalonia
+cephalopagus
+cephalopathy
+cephalopharyngeal
+cephalophine
+cephalophorous
+Cephalophus
+cephalophyma
+cephaloplegia
+cephaloplegic
+cephalopod
+Cephalopoda
+cephalopoda
+cephalopodan
+cephalopodic
+cephalopodous
+Cephalopterus
+cephalorachidian
+cephalorhachidian
+cephaloridine
+cephalosome
+cephalospinal
+cephalosporin
+Cephalosporium
+cephalostyle
+Cephalotaceae
+cephalotaceous
+Cephalotaxus
+cephalotheca
+cephalothecal
+cephalothoraces
+cephalothoracic
+cephalothoracopagus
+cephalothorax
+cephalothoraxes
+cephalotome
+cephalotomy
+cephalotractor
+cephalotribe
+cephalotripsy
+cephalotrocha
+Cephalotus
+cephalous
+-cephalus
+Cephalus
+Cephas
+Cephei
+Cepheid
+cepheid
+cepheids
+cephen
+Cepheus
+cepheus
+cephid
+Cephidae
+Cephus
+Cepolidae
+Ceporah
+cepous
+ceps
+cepter
+ceptor
+CEQ
+cequi
+cera
+ceraceous
+cerago
+ceral
+Cerallua
+Ceram
+ceramal
+ceramals
+Cerambus
+cerambycid
+Cerambycidae
+Ceramiaceae
+ceramiaceous
+ceramic
+ceramicist
+ceramicists
+ceramicite
+ceramics
+ceramidium
+ceramist
+ceramists
+Ceramium
+ceramium
+ceramographic
+ceramography
+cerargyrite
+ceras
+cerasein
+cerasin
+cerastes
+Cerastium
+Cerasus
+cerat
+cerat-
+cerata
+cerate
+ceratectomy
+cerated
+cerates
+ceratiasis
+ceratiid
+Ceratiidae
+ceratin
+ceratinous
+ceratins
+ceratioid
+ceration
+ceratite
+Ceratites
+ceratitic
+Ceratitidae
+Ceratitis
+ceratitoid
+Ceratitoidea
+Ceratium
+ceratium
+cerato-
+Ceratobatrachinae
+ceratoblast
+ceratobranchial
+ceratocricoid
+ceratocystis
+Ceratodidae
+Ceratodontidae
+Ceratodus
+ceratodus
+ceratoduses
+ceratofibrous
+ceratoglossal
+ceratoglossus
+ceratohyal
+ceratohyoid
+ceratoid
+ceratomandibular
+ceratomania
+Ceratonia
+Ceratophrys
+Ceratophyllaceae
+ceratophyllaceous
+Ceratophyllum
+Ceratophyta
+ceratophyte
+Ceratops
+Ceratopsia
+ceratopsian
+ceratopsid
+Ceratopsidae
+Ceratopteridaceae
+ceratopteridaceous
+Ceratopteris
+ceratorhine
+Ceratosa
+Ceratosaurus
+ceratosaurus
+Ceratospongiae
+ceratospongian
+Ceratostomataceae
+Ceratostomella
+ceratotheca
+ceratothecae
+ceratothecal
+Ceratozamia
+ceraunia
+ceraunics
+ceraunite
+ceraunogram
+ceraunograph
+ceraunomancy
+ceraunophone
+ceraunoscope
+ceraunoscopy
+Cerbberi
+Cerberean
+cerberean
+Cerberi
+Cerberic
+Cerberus
+cerberus
+Cerberuses
+-cercal
+cercal
+cercaria
+cercariae
+cercarial
+cercarian
+cercarias
+cercariform
+cercelee
+cerci
+Cercidiphyllaceae
+Cercis
+cercis
+cercises
+cercis-leaf
+cercle
+Cercocebus
+Cercolabes
+Cercolabidae
+cercomonad
+Cercomonadidae
+Cercomonas
+Cercopes
+cercopid
+Cercopidae
+cercopithecid
+Cercopithecidae
+Cercopithecoid
+cercopithecoid
+Cercopithecus
+cercopithecus
+cercopod
+Cercospora
+Cercosporella
+cercus
+Cercyon
+Cerdonian
+CerE
+cere
+cereal
+cerealian
+cerealin
+cerealism
+cerealist
+cerealose
+cereals
+cerebbella
+cerebella
+cerebellar
+cerebellifugal
+cerebellipetal
+cerebellitis
+cerebellocortex
+cerebello-olivary
+cerebellopontile
+cerebellopontine
+cerebellorubral
+cerebellospinal
+cerebellum
+cerebellums
+cerebr-
+cerebra
+cerebral
+cerebralgia
+cerebralism
+cerebralist
+cerebralization
+cerebralize
+cerebrally
+cerebrals
+cerebrasthenia
+cerebrasthenic
+cerebrate
+cerebrated
+cerebrates
+cerebrating
+cerebration
+cerebrational
+cerebrations
+Cerebratulus
+cerebri
+cerebric
+cerebricity
+cerebriform
+cerebriformly
+cerebrifugal
+cerebrin
+cerebripetal
+cerebritis
+cerebrize
+cerebro-
+cerebrocardiac
+cerebrogalactose
+cerebroganglion
+cerebroganglionic
+cerebroid
+cerebrology
+cerebroma
+cerebromalacia
+cerebromedullary
+cerebromeningeal
+cerebromeningitis
+cerebrometer
+cerebron
+cerebronic
+cerebro-ocular
+cerebroparietal
+cerebropathy
+cerebropedal
+cerebrophysiology
+cerebropontile
+cerebropsychosis
+cerebrorachidian
+cerebrosclerosis
+cerebroscope
+cerebroscopy
+cerebrose
+cerebrosensorial
+cerebroside
+cerebrosis
+cerebro-spinal
+cerebrospinal
+cerebrospinant
+cerebrosuria
+cerebrotomy
+cerebrotonia
+cerebrotonic
+cerebrovascular
+cerebrovisceral
+cerebrum
+cerebrums
+cerecloth
+cerecloths
+cered
+Ceredo
+cereless
+Cerelia
+Cerell
+Cerellia
+Cerelly
+cerement
+cerements
+ceremonial
+ceremonialism
+ceremonialist
+ceremonialists
+ceremonialize
+ceremonially
+ceremonialness
+ceremonials
+ceremoniary
+ceremonies
+ceremonious
+ceremoniously
+ceremoniousness
+ceremony
+Cerenkov
+cerenkov
+cereous
+cerer
+cererite
+Ceres
+ceres
+Ceresco
+ceresin
+ceresine
+Cereus
+cereus
+cereuses
+cerevis
+cerevisial
+cereza
+Cerf
+cerfoil
+ceria
+Cerialia
+cerianthid
+Cerianthidae
+cerianthoid
+Cerianthus
+cerias
+ceric
+ceride
+ceriferous
+cerigerous
+Cerigo
+cerilla
+cerillo
+ceriman
+cerimans
+cerin
+cerine
+cering
+Cerinthe
+Cerinthian
+cerinthian
+Ceriomyces
+Cerion
+Cerionidae
+ceriops
+Ceriornis
+ceriph
+ceriphs
+cerise
+cerises
+cerite
+cerites
+Cerithiidae
+cerithioid
+Cerithium
+cerium
+ceriums
+CERMET
+cermet
+cermets
+CERN
+Cern
+cern
+Cernauti
+cerned
+cerning
+cerniture
+Cernuda
+cernuous
+cero
+cero-
+cerograph
+cerographer
+cerographic
+cerographical
+cerographies
+cerographist
+cerography
+ceroid
+ceroline
+cerolite
+ceroma
+ceromancy
+ceromez
+ceroon
+cerophilous
+ceroplast
+ceroplastic
+ceroplastics
+ceroplasty
+ceros
+cerosin
+ceroso-
+cerotate
+cerote
+cerotene
+cerotic
+cerotin
+cerotype
+cerotypes
+cerous
+ceroxyle
+Ceroxylon
+Cerracchio
+cerrero
+cerre-tree
+cerrial
+Cerrillos
+cerris
+Cerritos
+Cerro
+Cerrogordo
+CERT
+cert
+cert.
+certain
+certainer
+certainest
+certainly
+certainness
+certainties
+certainty
+certes
+Certhia
+Certhiidae
+Certie
+certie
+certif
+certifiability
+certifiable
+certifiableness
+certifiably
+certificate
+certificated
+certificates
+certificating
+certification
+certifications
+certificative
+certificator
+certificatory
+certified
+certifier
+certifiers
+certifies
+certify
+certifying
+certiorari
+certiorate
+certiorating
+certioration
+certis
+certitude
+certitudes
+certosa
+certose
+certosina
+certosino
+certy
+cerule
+cerulean
+ceruleans
+cerulein
+ceruleite
+ceruleo-
+ceruleolactite
+ceruleous
+cerulescent
+ceruleum
+cerulific
+cerulignol
+cerulignone
+ceruloplasmin
+cerumen
+cerumens
+ceruminal
+ceruminiferous
+ceruminous
+cerumniparous
+ceruse
+ceruses
+cerusite
+cerusites
+cerussite
+cervalet
+Cervantes
+cervantes
+cervantic
+Cervantist
+cervantite
+cervelas
+cervelases
+cervelat
+cervelats
+cerveliere
+cervelliere
+Cerveny
+cervical
+Cervicapra
+cervicaprine
+cervicectomy
+cervices
+cervicicardiac
+cervicide
+cerviciplex
+cervicispinal
+cervicitis
+cervico-
+cervicoauricular
+cervicoaxillary
+cervicobasilar
+cervicobrachial
+cervicobregmatic
+cervicobuccal
+cervicodorsal
+cervicodynia
+cervicofacial
+cervicohumeral
+cervicolabial
+cervicolingual
+cervicolumbar
+cervicomuscular
+cerviconasal
+cervico-occipital
+cervico-orbicular
+cervicorn
+cervicoscapular
+cervicothoracic
+cervicovaginal
+cervicovesical
+cervid
+Cervidae
+Cervin
+Cervinae
+cervine
+cervisia
+cervisial
+cervix
+cervixes
+cervoid
+cervuline
+Cervulus
+Cervus
+Cery
+ceryl
+Cerynean
+Cerys
+Ceryx
+Cesar
+cesar
+Cesare
+cesare
+Cesarean
+cesarean
+cesareans
+cesarevitch
+Cesaria
+Cesarian
+cesarian
+cesarians
+Cesaro
+cesarolite
+Cesena
+cesious
+cesium
+cesiums
+cespititious
+cespititous
+cespitose
+cespitosely
+cespitulose
+cess
+cessant
+cessantly
+cessation
+cessations
+cessative
+cessavit
+cessed
+cesser
+cesses
+cessible
+cessing
+cessio
+cession
+cessionaire
+cessionaries
+cessionary
+cessionee
+cessions
+cessment
+Cessna
+cessor
+cesspipe
+cesspit
+cesspits
+cesspool
+cesspools
+cest
+cesta
+Cestar
+cestas
+ceste
+Cesti
+cesti
+Cestida
+Cestidae
+Cestoda
+Cestodaria
+cestode
+cestodes
+cestoi
+cestoid
+Cestoidea
+cestoidean
+cestoids
+ceston
+cestos
+Cestracion
+cestraciont
+Cestraciontes
+Cestraciontidae
+cestraction
+Cestrian
+cestrian
+Cestrinus
+Cestrum
+cestrum
+cestui
+cestus
+cestuses
+cestuy
+cesura
+cesurae
+cesural
+cesuras
+cesure
+Cesya
+CET
+cet-
+Ceta
+Cetacea
+cetacea
+cetacean
+cetaceans
+cetaceous
+cetaceum
+cetane
+cetanes
+Cete
+cete
+cetene
+ceteosaur
+cetera
+ceterach
+cetes
+Ceti
+ceti
+cetic
+ceticide
+Cetid
+cetin
+Cetinje
+Cetiosauria
+cetiosaurian
+Cetiosaurus
+cetiosaurus
+Ceto
+cetological
+cetologies
+cetologist
+cetology
+Cetomorpha
+cetomorphic
+Cetonia
+cetonian
+Cetoniides
+Cetoniinae
+cetorhinid
+Cetorhinidae
+cetorhinoid
+Cetorhinus
+cetotolite
+Cetraria
+cetraric
+cetrarin
+Cetura
+Cetus
+cetus
+cetyl
+cetylene
+cetylic
+Ceuta
+CEV
+cevadilla
+cevadilline
+cevadine
+Cevdet
+Cevennes
+Cevennian
+Cevenol
+Cevenole
+CEVI
+cevian
+ceviche
+ceviches
+cevine
+cevitamic
+ceylanite
+Ceylon
+ceylon
+Ceylonese
+ceylonese
+ceylonite
+ceyssatite
+Ceyx
+Cezanne
+Cezannesque
+C.F.
+CF
+Cf
+c/f
+cf
+cf.
+CFA
+CFB
+CFC
+CFCA
+CFD
+cfd
+CFE
+CFF
+cfh
+CFHT
+CFI
+cfi
+CFL
+cfm
+CFO
+CFP
+CFR
+cfs
+C.G.
+CG
+c.g.
+cg
+cg.
+CGA
+CGCT
+CGE
+CGI
+CGIAR
+CGM
+cgm
+CGN
+CGS
+cgs
+CGX
+CH
+Ch
+c.h.
+ch
+ch.
+CHA
+Cha
+cha
+chaa
+Cha'ah
+chab
+chabasie
+chabasite
+chabazite
+chaber
+Chabichou
+Chablis
+chablis
+Chabot
+chabot
+chabouk
+chabouks
+Chabrier
+Chabrol
+chabuk
+chabuks
+chabutra
+Chac
+chacate
+chac-chac
+chaccon
+Chace
+chace
+Cha-cha
+cha-cha
+cha-cha-cha
+cha-chaed
+cha-chaing
+chachalaca
+chachalakas
+Chachapuya
+cha-chas
+chack
+chack-bird
+Chackchiuma
+chacker
+chackle
+chackled
+chackler
+chackling
+chacma
+chacmas
+Chac-mool
+Chaco
+chaco
+chacoli
+Chacon
+chacona
+chaconne
+chaconnes
+chacra
+chacte
+chacun
+Chad
+chad
+Chadabe
+chadacryst
+chadar
+chadarim
+chadars
+Chadbourn
+Chadbourne
+Chadburn
+Chadd
+Chadderton
+Chaddie
+Chaddsford
+Chaddy
+chadelle
+Chader
+Chadic
+chadless
+chadlock
+chador
+chadors
+chadri
+Chadron
+chads
+Chadwick
+Chadwicks
+Chae
+Chaenactis
+Chaenolobus
+Chaenomeles
+Chaeronea
+chaeta
+chaetae
+chaetal
+Chaetangiaceae
+Chaetangium
+Chaetetes
+Chaetetidae
+Chaetifera
+chaetiferous
+Chaetites
+Chaetitidae
+Chaetochloa
+Chaetodon
+chaetodon
+chaetodont
+chaetodontid
+Chaetodontidae
+chaetognath
+Chaetognatha
+chaetognathan
+chaetognathous
+chaetophobia
+Chaetophora
+Chaetophoraceae
+chaetophoraceous
+Chaetophorales
+chaetophorous
+chaetopod
+Chaetopoda
+chaetopodan
+chaetopodous
+chaetopterin
+Chaetopterus
+chaetosema
+Chaetosoma
+Chaetosomatidae
+Chaetosomidae
+chaetotactic
+chaetotaxy
+Chaetura
+chafe
+chafed
+Chafee
+chafer
+chaferies
+chafers
+chafery
+chafes
+chafe-wax
+chafewax
+chafeweed
+chaff
+chaffcutter
+chaffed
+Chaffee
+chaffer
+chaffered
+chafferer
+chafferers
+chaffering
+chaffers
+chaffery
+chaffeur-ship
+chaff-flower
+chaffier
+chaffiest
+Chaffin
+Chaffinch
+chaffinch
+chaffinches
+chaffiness
+chaffing
+chaffingly
+chaffless
+chafflike
+chaffman
+chaffron
+chaffs
+chaffseed
+chaffwax
+chaff-weed
+chaffweed
+chaffy
+chafing
+chaft
+chafted
+Chaga
+chagal
+Chagall
+chagan
+Chagatai
+Chagga
+chagigah
+chagoma
+Chagres
+chagrin
+chagrined
+chagrining
+chagrinned
+chagrinning
+chagrins
+chaguar
+chagul
+Chahab
+Chahar
+chahar
+chahars
+chai
+Chaiken
+Chaikovski
+Chaille
+Chailletiaceae
+Chaillot
+Chaim
+Chain
+chain
+chainage
+chain-bag
+chainbearer
+chainbreak
+chain-bridge
+chain-driven
+chain-drooped
+chaine
+chained
+chainer
+chaines
+chainette
+Chainey
+Chaing
+Chaingy
+chaining
+chainless
+chainlet
+chainlike
+chainmaker
+chainmaking
+chainman
+chainmen
+chainomatic
+chainon
+chainplate
+chain-pump
+chain-react
+chain-reacting
+chains
+chain-shaped
+chain-shot
+chainsman
+chainsmen
+chainsmith
+chain-smoke
+chain-smoked
+chain-smoker
+chain-smoking
+chain-spotted
+chain-stitch
+chainstitch
+chain-stitching
+chain-swung
+chain-testing
+chain-wale
+chainwale
+chain-welding
+chain-work
+chainwork
+chair
+chairborne
+chaired
+chairer
+chair-fast
+chairing
+chairladies
+chairlady
+chairless
+chairlift
+chairmaker
+chairmaking
+chairman
+chairmaned
+chairmaning
+chairmanned
+chairmanning
+chairmans
+chairmanship
+chairmanships
+chairmen
+chairmender
+chairmending
+chair-mortising
+chairperson
+chairpersons
+chairs
+chair-shaped
+chair-warmer
+chairwarmer
+chairway
+chairwoman
+chairwomen
+chais
+chaise
+chaiseless
+chaise-longue
+chaise-marine
+chaises
+Chait
+chaitra
+chaitya
+chaityas
+chaja
+Chak
+chaka
+Chakales
+chakar
+chakari
+Chakavski
+chakazi
+chakdar
+Chaker
+chakobu
+chakra
+chakram
+chakras
+chakravartin
+chaksi
+Chal
+chal
+chalaco
+chalah
+chalahs
+chalana
+chalastic
+Chalastogastra
+chalaza
+chalazae
+chalazal
+chalazas
+chalaze
+chalazia
+chalazian
+chalaziferous
+chalazion
+chalazium
+chalazogam
+chalazogamic
+chalazogamy
+chalazoidite
+chalazoin
+chalcanth
+chalcanthite
+Chalcedon
+Chalcedonian
+chalcedonian
+chalcedonic
+chalcedonies
+chalcedonous
+chalcedony
+chalcedonyx
+chalchihuitl
+chalchuite
+chalcid
+Chalcidian
+chalcidian
+Chalcidic
+chalcidica
+Chalcidice
+chalcidicum
+chalcidid
+Chalcididae
+chalcidiform
+chalcidoid
+Chalcidoidea
+chalcids
+Chalcioecus
+Chalciope
+Chalcis
+chalcites
+chalco-
+chalcocite
+chalcogen
+chalcogenide
+chalcograph
+chalcographer
+chalcographic
+chalcographical
+chalcographist
+chalcography
+chalcolite
+Chalcolithic
+chalcolithic
+chalcomancy
+chalcomenite
+chalcon
+chalcone
+chalcophanite
+chalcophile
+chalcophyllite
+chalcopyrite
+chalcosiderite
+chalcosine
+chalcostibite
+chalcotrichite
+chalcotript
+chalcus
+Chald
+Chaldaei
+Chaldae-pahlavi
+Chaldaic
+chaldaic
+Chaldaical
+Chaldaism
+Chaldea
+Chaldean
+chaldean
+Chaldee
+chaldee
+chalder
+chaldese
+chaldron
+chaldrons
+chaleh
+chalehs
+chalet
+chalets
+Chalfont
+Chaliapin
+chalice
+chaliced
+chalices
+chalicosis
+chalicothere
+chalicotheriid
+Chalicotheriidae
+chalicotherioid
+Chalicotherium
+Chalina
+Chalinidae
+chalinine
+Chalinitis
+chalk
+chalkboard
+chalkboards
+chalkcutter
+chalk-eating
+chalked
+chalker
+chalk-eyed
+chalkier
+chalkiest
+chalkiness
+chalking
+chalklike
+chalkline
+chalkography
+chalkone
+chalkos
+chalkosideric
+chalkotheke
+chalkpit
+chalkrail
+chalks
+chalk-stone
+chalkstone
+chalkstony
+chalk-talk
+chalk-white
+chalkworker
+chalky
+challa
+challah
+challahs
+challas
+challengable
+challenge
+challengeable
+challenged
+challengee
+challengeful
+challenger
+challengers
+challenges
+challenging
+challengingly
+challie
+challies
+challiho
+challihos
+Challis
+challis
+challises
+challot
+challote
+challoth
+Chally
+chally
+Chalmer
+chalmer
+Chalmers
+Chalmette
+chalon
+chalone
+chalones
+Chalonnais
+Chalons
+Chalons-sur-Marne
+Chalon-sur-Sa
+chalot
+chaloth
+chaloupe
+chalque
+chalta
+chaluka
+Chalukya
+Chalukyan
+chalumeau
+chalumeaux
+chalutz
+chalutzim
+Chalybean
+chalybean
+chalybeate
+chalybeous
+Chalybes
+chalybite
+Cham
+cham
+Chama
+chama
+Chamacea
+Chamacoco
+chamade
+chamades
+Chamaebatia
+Chamaecistus
+chamaecranial
+Chamaecrista
+Chamaecyparis
+Chamaedaphne
+Chamaeleo
+Chamaeleon
+Chamaeleontidae
+Chamaeleontis
+Chamaelirium
+Chamaenerion
+Chamaepericlymenum
+chamaephyte
+chamaeprosopic
+Chamaerops
+chamaerops
+chamaerrhine
+Chamaesaura
+Chamaesiphon
+Chamaesiphonaceae
+Chamaesiphonaceous
+Chamaesiphonales
+Chamaesyce
+chamal
+Chamar
+chamar
+chambellan
+chamber
+chamber-deacon
+chamberdeacon
+chambered
+chamberer
+chamberfellow
+chambering
+Chamberino
+Chamberlain
+chamberlain
+chamberlainry
+chamberlains
+chamberlainship
+chamberlet
+chamberleted
+chamberletted
+Chamberlin
+chambermaid
+chambermaids
+chamber-master
+Chambers
+chambers
+Chambersburg
+Chambersville
+Chambertin
+chambertin
+chamberwoman
+Chambery
+Chambioa
+Chamblee
+Chambord
+chambranle
+chambray
+chambrays
+chambre
+chambrel
+Chambry
+chambul
+Chamdo
+chamecephalic
+chamecephalous
+chamecephalus
+chamecephaly
+chameleon
+chameleonic
+chameleonize
+chameleonlike
+chameleons
+chametz
+chamfer
+chamfered
+chamferer
+chamfering
+chamfers
+chamfrain
+chamfron
+chamfrons
+Chamian
+Chamicuro
+Chamidae
+Chaminade
+Chamisal
+chamisal
+chamise
+chamises
+chamiso
+chamisos
+Chamite
+chamite
+Chamizal
+Chamkanni
+Chamkis
+chamlet
+chamm
+chamma
+chammied
+chammies
+chammy
+chammying
+chamois
+chamoised
+chamoises
+Chamoisette
+chamoising
+chamoisite
+chamoix
+chamoline
+chamomile
+Chamomilla
+Chamonix
+Chamorro
+Chamorros
+Chamos
+chamosite
+chamotte
+Chamouni
+Champ
+champ
+Champa
+champac
+champaca
+champacol
+champacs
+Champagne
+champagne
+Champagne-Ardenne
+champagned
+champagneless
+champagnes
+champagning
+champagnize
+champagnized
+champagnizing
+Champaign
+champaign
+Champaigne
+champain
+champak
+champaka
+champaks
+champart
+champe
+champed
+Champenois
+champer
+champerator
+champers
+champert
+champerties
+champertor
+champertous
+champerty
+champian
+champignon
+champignons
+Champigny-sur-Marne
+champine
+champing
+champion
+championed
+championess
+championing
+championize
+championless
+championlike
+champions
+championship
+championships
+Champlain
+Champlainic
+champlev
+champleve
+Champlin
+Champollion
+champs
+champy
+chams
+Cham-selung
+chamsin
+Chamuel
+Chamyne
+Ch'an
+Chan
+chan
+Chana
+Chanaan
+Chanabal
+Chanc
+Chanca
+Chancay
+Chance
+chance
+chanceable
+chanceably
+chanced
+chance-dropped
+chanceful
+chancefully
+chancefulness
+chance-hit
+chance-hurt
+chancel
+chanceled
+chanceless
+chancelled
+chancelleries
+chancellery
+Chancellor
+chancellor
+chancellorate
+chancelloress
+chancellories
+chancellorism
+chancellors
+chancellorship
+chancellorships
+Chancellorsville
+chancellory
+Chancelor
+chancelor
+chancelry
+chancels
+chanceman
+chance-medley
+chancemen
+chance-met
+chance-poised
+chancer
+chancered
+chanceries
+chancering
+chancery
+chances
+chance-shot
+chance-sown
+chance-taken
+chancewise
+chance-won
+Chancey
+chancey
+Chan-chan
+chanche
+chanchito
+chancier
+chanciest
+chancily
+chanciness
+chancing
+chancito
+chanco
+chancre
+chancres
+chancriform
+chancroid
+chancroidal
+chancroids
+chancrous
+chancy
+Chanda
+Chandal
+chandala
+chandam
+Chandarnagar
+chandelier
+chandeliers
+chandelle
+chandelled
+chandelles
+chandelling
+Chandernagor
+Chandernagore
+Chandi
+chandi
+Chandigarh
+Chandler
+chandler
+chandleress
+chandleries
+chandlering
+chandlerly
+chandlers
+Chandlersville
+Chandlerville
+chandlery
+Chandless
+chandoo
+Chandos
+Chandra
+Chandragupta
+chandrakanta
+chandrakhi
+chandry
+chandu
+chandui
+chandul
+chanduy
+Chane
+Chanel
+chaneled
+chaneling
+chanelled
+Chaney
+chanfrin
+chanfron
+chanfrons
+Chang
+chang
+changa
+changable
+Changan
+changar
+Changaris
+Changchiakow
+Changchow
+Changchowfu
+Changchun
+change
+changeability
+changeable
+changeableness
+changeably
+changeabout
+changed
+changedale
+changedness
+changeful
+changefully
+changefulness
+change-house
+changeless
+changelessly
+changelessness
+changeling
+changelings
+changemaker
+changement
+change-over
+changeover
+changeovers
+changepocket
+changer
+change-ringing
+changer-off
+changers
+changes
+change-up
+Changewater
+changing
+Changoan
+Changos
+changs
+Changsha
+Changteh
+Changuina
+Changuinan
+Chanhassen
+Chanidae
+chank
+chankings
+Channa
+Channahon
+Channel
+channel
+channelbill
+channeled
+channeler
+channeling
+channelization
+channelize
+channelized
+channelizes
+channelizing
+channelled
+channeller
+channellers
+channelling
+channelly
+channels
+channelure
+channelwards
+channer
+Channing
+chanoyu
+chanson
+chansonette
+chansonnette
+chansonnier
+chansonniers
+chansons
+Chansoo
+chanst
+chant
+chantable
+chantage
+chantages
+Chantal
+Chantalle
+chantant
+chantecler
+chanted
+chante-fable
+chantefable
+chante-fables
+chantepleure
+chanter
+chanterelle
+chanters
+chantership
+chanteur
+chanteuse
+chanteuses
+chantey
+chanteyman
+chanteys
+chanticleer
+chanticleers
+chantier
+chanties
+Chantilly
+chantilly
+chanting
+chantingly
+chantlate
+chantment
+chantor
+chantors
+chantress
+chantries
+chantry
+chants
+chanty
+Chanukah
+chanukah
+Chanute
+Chany
+Chao
+chao
+Chaoan
+Chaochow
+Chaochowfu
+chaogenous
+chaology
+Chaon
+chaori
+chaos
+chaoses
+chaotic
+chaotical
+chaotically
+chaoticness
+chaoua
+Chaouia
+Chaource
+chaoush
+CHAP
+Chap
+chap
+chap.
+Chapa
+Chapacura
+Chapacuran
+chapah
+Chapanec
+chapapote
+chaparajos
+chaparejos
+chaparral
+chaparrals
+chaparraz
+chaparro
+chapati
+chapaties
+chapatis
+chapatti
+chapatties
+chapattis
+chapatty
+chap-book
+chapbook
+chapbooks
+chape
+chapeau
+chapeaus
+chapeaux
+chaped
+Chapei
+Chapel
+chapel
+chapeled
+chapeless
+chapelet
+chapelgoer
+chapelgoing
+chapeling
+chapelize
+Chapell
+chapellage
+chapellany
+chapelled
+chapelling
+chapelman
+chapelmaster
+chapelries
+chapelry
+chapels
+chapelward
+Chapen
+chaperno
+chaperon
+chaperonage
+chaperonages
+chaperone
+chaperoned
+chaperones
+chaperoning
+chaperonless
+chaperons
+chapes
+chap-fallen
+chapfallen
+chapfallenly
+Chapin
+chapin
+chapiter
+chapiters
+chapitle
+chapitral
+chaplain
+chaplaincies
+chaplaincy
+chaplainry
+chaplains
+chaplainship
+Chapland
+chaplanry
+chapless
+chaplet
+chapleted
+chaplets
+Chaplin
+chaplin
+Chapman
+chapman
+Chapmansboro
+chapmanship
+Chapmanville
+chapmen
+chap-money
+Chapnick
+chapon
+chapote
+chapourn
+chapournet
+chapournetted
+chappal
+Chappaqua
+Chappaquiddick
+chappaul
+chappe
+chapped
+Chappelka
+Chappell
+Chappells
+chapper
+Chappie
+chappie
+chappies
+chappin
+chapping
+chappow
+Chappy
+chappy
+chaprasi
+chaprassi
+chaps
+chapstick
+chapt
+chaptalization
+chaptalize
+chaptalized
+chaptalizing
+chapter
+chapteral
+chaptered
+chapterful
+chapterhouse
+chaptering
+chapters
+Chaptico
+chaptrel
+Chapultepec
+chapwoman
+chaqueta
+chaquetas
+Char
+char
+char-
+CHARA
+Chara
+chara
+char-a-banc
+charabanc
+charabancer
+char-a-bancs
+charabancs
+charac
+Characeae
+characeous
+characetum
+characid
+characids
+characin
+characine
+characinid
+Characinidae
+characinoid
+characins
+charact
+character
+charactered
+characterful
+characterial
+characterical
+characteries
+charactering
+characterisable
+characterisation
+characterise
+characterised
+characteriser
+characterising
+characterism
+characterist
+characteristic
+characteristical
+characteristically
+characteristicalness
+characteristicness
+characteristics
+characterizable
+characterization
+characterizations
+characterize
+characterized
+characterizer
+characterizers
+characterizes
+characterizing
+characterless
+characterlessness
+characterological
+characterologically
+characterologist
+characterology
+characters
+characterstring
+charactery
+charactonym
+charade
+charades
+Charadrii
+Charadriidae
+charadriiform
+Charadriiformes
+charadrine
+charadrioid
+Charadriomorphae
+Charadrius
+Charales
+charango
+charangos
+chararas
+charas
+charases
+charbocle
+charbon
+Charbonneau
+Charbonnier
+charbonnier
+charbroil
+charbroiled
+charbroiling
+charbroils
+Charca
+Charcas
+Charchemish
+charcia
+charco
+charcoal
+charcoal-burner
+charcoaled
+charcoal-gray
+charcoaling
+charcoalist
+charcoals
+charcoaly
+Charcot
+charcuterie
+charcuteries
+charcutier
+charcutiers
+Chard
+chard
+Chardin
+chardock
+Chardon
+Chardonnay
+Chardonnet
+chards
+chare
+chared
+charely
+Charente
+Charente-Maritime
+Charenton
+charer
+chares
+charet
+chareter
+charette
+chargable
+charga-plate
+charge
+chargeability
+chargeable
+chargeableness
+chargeably
+chargeant
+charge-a-plate
+charged
+chargedness
+chargee
+chargeful
+charge-house
+chargehouse
+chargeless
+chargeling
+chargeman
+CHARGEN
+charge-off
+charger
+chargers
+charges
+chargeship
+chargfaires
+charging
+Chari
+Charicleia
+Chariclo
+Charie
+charier
+chariest
+Charil
+charily
+Charin
+chariness
+charing
+Chari-Nile
+Chariot
+chariot
+charioted
+chariotee
+charioteer
+charioteers
+charioteership
+charioting
+chariotlike
+chariotman
+chariotry
+chariots
+chariot-shaped
+chariotway
+Charis
+charism
+charisma
+charismas
+charismata
+charismatic
+charisms
+Charissa
+Charisse
+charisticary
+Charita
+charitable
+charitableness
+charitably
+charitative
+Charites
+charities
+Chariton
+Charity
+charity
+charityless
+charivan
+charivari
+charivaried
+charivariing
+charivaris
+chark
+charka
+charkas
+charked
+charkha
+charkhana
+charkhas
+charking
+charks
+Charla
+charladies
+charlady
+charlatan
+charlatanic
+charlatanical
+charlatanically
+charlatanish
+charlatanism
+charlatanistic
+charlatanries
+charlatanry
+charlatans
+charlatanship
+Charlean
+Charlee
+Charleen
+Charlemagne
+charlemagne
+Charlemont
+Charlena
+Charlene
+Charleroi
+Charleroy
+Charles
+charles
+Charleston
+charleston
+charlestons
+Charlestown
+charlesworth
+Charlet
+charlet
+Charleton
+Charleville-Mzi
+Charlevoix
+Charley
+charley
+charleys
+Charlie
+charlie
+charlies
+Charline
+Charlo
+charlock
+charlocks
+Charlot
+Charlotta
+Charlotte
+charlotte
+Charlottenburg
+Charlottesville
+charlottesville
+Charlottetown
+Charlotteville
+Charlton
+Charlye
+Charlyn
+Charlyne
+charm
+Charmain
+Charmaine
+Charmane
+charm-bound
+charm-built
+Charmco
+charmed
+charmedly
+charmel
+charm-engirdled
+charmer
+charmers
+Charmeuse
+charmeuse
+charmful
+charmfully
+charmfulness
+Charmian
+Charminar
+Charmine
+charming
+charminger
+charmingest
+charmingly
+charmingness
+Charmion
+charmless
+charmlessly
+charmonium
+charms
+charm-struck
+charmwise
+charneco
+charnel
+charnels
+charnockite
+charnockites
+charnu
+Charo
+Charolais
+Charollais
+Charon
+charon
+Charonian
+Charonic
+Charontas
+Charophyta
+Charops
+charoses
+charoset
+charoseth
+charpai
+charpais
+Charpentier
+charpie
+charpit
+charpoy
+charpoys
+charque
+charqued
+charqui
+charquid
+charquis
+charr
+charras
+charre
+charred
+charrette
+charrier
+charriest
+charring
+charro
+Charron
+charros
+charrs
+Charruan
+Charruas
+Charry
+charry
+chars
+charshaf
+charsingha
+chart
+Charta
+charta
+chartable
+chartaceous
+chartae
+charted
+charter
+charterable
+charterage
+chartered
+charterer
+charterers
+Charterhouse
+charterhouse
+Charterhouses
+chartering
+Charteris
+charterism
+Charterist
+charterless
+chartermaster
+charter-party
+Charters
+charters
+charthouse
+charting
+chartings
+Chartism
+chartism
+Chartist
+chartist
+chartists
+chartless
+chartlet
+Chartley
+chartographer
+chartographic
+chartographical
+chartographically
+chartographist
+chartography
+chartology
+chartometer
+chartophylacia
+chartophylacium
+chartophylax
+chartophylaxes
+Chartres
+Chartreuse
+chartreuse
+chartreuses
+Chartreux
+chartreux
+chartroom
+charts
+chartula
+chartulae
+chartularies
+chartulary
+chartulas
+charuk
+Charvaka
+charvet
+charwoman
+charwomen
+chary
+Charybdian
+Charybdis
+charybdis
+Charyl
+Chas
+chasable
+Chase
+chase
+chaseable
+Chaseburg
+chased
+chase-hooped
+chase-hooping
+Chaseley
+chase-mortised
+chaser
+chasers
+chases
+chashitsu
+Chasid
+chasid
+Chasidic
+Chasidim
+Chasidism
+chasing
+chasings
+Chaska
+Chasles
+chasm
+chasma
+chasmal
+chasmed
+chasmic
+chasmogamic
+chasmogamous
+chasmogamy
+chasmophyte
+chasms
+chasmy
+chass
+Chasse
+chasse
+chassed
+chasseing
+Chasselas
+chasselas
+Chassell
+chasse-maree
+chassepot
+chassepots
+chasses
+chasseur
+chasseurs
+chassignite
+Chassin
+chassis
+Chastacosta
+Chastain
+chaste
+chastelain
+chastely
+chasten
+chastened
+chastener
+chasteners
+chasteness
+chastenesses
+chastening
+chasteningly
+chastenment
+chastens
+chaster
+chastest
+chasteweed
+chastiment
+chastisable
+chastise
+chastised
+chastisement
+chastisements
+chastiser
+chastisers
+chastises
+chastising
+chastities
+Chastity
+chastity
+chastize
+chastizer
+chasty
+chasuble
+chasubled
+chasubles
+chat
+Chataignier
+chataka
+Chatav
+Chatawa
+chatchka
+chatchkas
+chatchke
+chatchkes
+Chateau
+chateau
+Chateaubriand
+chateaubriand
+Chateaugay
+chateaugray
+Chateauneuf-du-Pape
+Chateauroux
+chateaus
+Chateau-Thierry
+chateaux
+chatelain
+chatelaine
+chatelaines
+chatelainry
+chatelains
+chatelet
+chatellany
+chateus
+Chatfield
+Chatham
+chathamite
+chathamites
+chati
+Chatillon
+Chatino
+Chatom
+chaton
+chatons
+Chatot
+chatoyance
+chatoyancy
+chatoyant
+chats
+chatsome
+Chatsworth
+chatta
+chattable
+chattack
+chattah
+Chattahoochee
+Chattanooga
+chattanooga
+Chattanoogan
+Chattanoogian
+Chattaroy
+chattation
+chatted
+chattel
+chattelhood
+chattelism
+chattelization
+chattelize
+chattelized
+chattelizing
+chattels
+chattelship
+chatter
+chatteration
+chatterbag
+chatterbox
+chatterboxes
+chattered
+chatterer
+chatterers
+chattererz
+chattering
+chatteringly
+Chatterjee
+chattermag
+chattermagging
+chatters
+Chatterton
+Chattertonian
+chattery
+Chatti
+chattier
+chatties
+chattiest
+chattily
+chattiness
+chatting
+chattingly
+chatty
+Chatwin
+chatwood
+Chaucer
+chaucer
+Chaucerian
+chaucerian
+Chauceriana
+Chaucerianism
+Chaucerism
+Chauchat
+chaud-froid
+chaudfroid
+chaud-melle
+Chaudoin
+chaudron
+chaufer
+chaufers
+chauffage
+chauffer
+chauffers
+chauffeur
+chauffeured
+chauffeuring
+chauffeurs
+chauffeurship
+chauffeuse
+chauffeuses
+Chaui
+chauk
+chaukidari
+chauldron
+chaule
+Chauliodes
+chaulmaugra
+chaulmoogra
+chaulmoograte
+chaulmoogric
+chaulmugra
+chaum
+chaumer
+chaumiere
+Chaumont
+chaumontel
+Chaumont-en-Bassigny
+chaun-
+Chauna
+Chaunce
+Chauncey
+chaunoprockt
+chaunt
+chaunted
+chaunter
+chaunters
+chaunting
+chaunts
+chauri
+chaus
+chausse
+chaussee
+chausseemeile
+chaussees
+chausses
+Chausson
+chaussure
+chaussures
+Chautauqua
+chautauqua
+Chautauquan
+chaute
+Chautemps
+chauth
+chauve
+Chauvin
+chauvin
+chauvinism
+chauvinisms
+chauvinist
+chauvinistic
+chauvinistically
+chauvinists
+Chavannes
+Chavante
+Chavantean
+Chavaree
+chave
+chavel
+chavender
+chaver
+Chaves
+Chavey
+Chavez
+chavibetol
+chavicin
+chavicine
+chavicol
+Chavies
+Chavignol
+Chavin
+chavish
+chaw
+chawan
+chaw-bacon
+chawbacon
+chawbone
+chawbuck
+chawdron
+chawed
+chawer
+chawers
+Chawia
+chawing
+chawk
+chawl
+chawle
+chawn
+Chaworth
+chaws
+chaw-stick
+chawstick
+chay
+chaya
+chayaroot
+Chayefsky
+Chayma
+Chayota
+chayote
+chayotes
+chayroot
+chays
+chazan
+chazanim
+chazans
+chazanut
+Chazy
+chazzan
+chazzanim
+chazzans
+chazzanut
+chazzen
+chazzenim
+chazzens
+Ch.B.
+ChB
+Ch.E.
+ChE
+Che
+che
+Cheadle
+Cheam
+cheap
+cheapen
+cheapened
+cheapener
+cheapening
+cheapens
+cheaper
+cheapery
+cheapest
+cheapie
+cheapies
+cheaping
+cheapish
+cheapishly
+Cheap-jack
+cheap-jack
+cheapjack
+cheap-john
+cheaply
+cheapness
+cheapnesses
+cheapo
+cheapos
+cheaps
+Cheapside
+cheapskate
+cheapskates
+cheare
+cheat
+cheatable
+cheatableness
+cheated
+cheatee
+cheater
+cheateries
+cheaters
+cheatery
+Cheatham
+cheating
+cheatingly
+cheatrie
+cheatry
+cheats
+Cheb
+Chebacco
+chebacco
+Chebanse
+chebec
+chebeck
+chebecs
+chebel
+chebog
+Cheboksary
+Cheboygan
+chebule
+chebulic
+chebulinic
+Checani
+chechako
+chechakos
+Chechehet
+chechem
+Chechen
+chechia
+che-choy
+check
+check-
+checkable
+checkage
+checkback
+checkbird
+checkbit
+checkbite
+checkbits
+checkbook
+checkbooks
+check-canceling
+checke
+checked
+checked-out
+check-endorsing
+checker
+checkerbellies
+checkerbelly
+checkerberries
+checker-berry
+checkerberry
+checkerbloom
+checkerboard
+checkerboarded
+checkerboarding
+checkerboards
+checkerbreast
+checker-brick
+checkered
+checkering
+checkerist
+checker-roll
+checkers
+checkerspot
+checker-up
+checkerwise
+checkerwork
+checkery
+check-flood
+checkhook
+check-in
+checking
+checklaton
+checkle
+checkless
+checkline
+checklist
+checklists
+checkman
+checkmark
+checkmate
+checkmated
+checkmates
+checkmating
+checkoff
+checkoffs
+check-out
+checkout
+checkouts
+check-over
+check-perforating
+checkpoint
+checkpointed
+checkpointing
+checkpoints
+checkrack
+checkrail
+checkrein
+check-roll
+checkroll
+checkroom
+checkrooms
+checkrope
+checkrow
+checkrowed
+checkrower
+checkrowing
+checkrows
+checks
+check-stone
+checkstone
+checkstrap
+check-string
+checkstring
+checksum
+checksummed
+checksumming
+checksums
+checkup
+checkups
+checkweigher
+checkweighman
+checkweighmen
+checkwork
+checkwriter
+check-writing
+checky
+Checotah
+chedar
+Cheddar
+cheddar
+cheddaring
+cheddars
+cheddite
+cheddites
+cheder
+cheders
+chedite
+chedites
+chedlock
+chedreux
+CheE
+Chee
+chee
+cheecha
+cheechaco
+cheechako
+cheechakos
+chee-chee
+cheeful
+cheefuller
+cheefullest
+cheek
+cheekbone
+cheekbones
+cheek-by-jowl
+cheeked
+cheeker
+cheekful
+cheekfuls
+cheekier
+cheekiest
+cheekily
+cheekiness
+cheeking
+cheekish
+cheekless
+cheekpiece
+cheeks
+Cheektowaga
+cheeky
+cheeney
+cheep
+cheeped
+cheeper
+cheepers
+cheepier
+cheepiest
+cheepily
+cheepiness
+cheeping
+cheeps
+cheepy
+cheer
+cheered
+cheerer
+cheerers
+cheerful
+cheerfulize
+cheerfuller
+cheerfullest
+cheerfully
+cheerfulness
+cheerfulnesses
+cheerfulsome
+cheerier
+cheeriest
+cheerily
+cheeriness
+cheerinesses
+cheering
+cheeringly
+cheerio
+cheerios
+cheerlead
+cheerleader
+cheerleaders
+cheerleading
+cheerled
+cheerless
+cheerlessly
+cheerlessness
+cheerlessnesses
+cheerly
+cheero
+cheeros
+cheers
+cheer-up
+cheery
+cheese
+cheeseboard
+cheesebox
+cheeseburger
+cheeseburgers
+cheesecake
+cheesecakes
+cheesecloth
+cheesecloths
+cheesecurd
+cheesecutter
+cheesed
+cheeseflower
+cheese-head
+cheese-headed
+cheeselep
+cheeselip
+cheesemaker
+cheesemaking
+cheesemonger
+cheesemongering
+cheesemongerly
+cheesemongery
+cheeseparer
+cheese-paring
+cheeseparing
+cheeser
+cheesery
+cheeses
+cheesewood
+cheesier
+cheesiest
+cheesily
+cheesiness
+cheesing
+cheesy
+cheet
+cheetah
+cheetahs
+cheetal
+cheeter
+cheetie
+cheetul
+cheewink
+cheezit
+chef
+Chefang
+chef-d'
+chef-d'oeuvre
+chefdom
+chefdoms
+cheffed
+Cheffetz
+cheffing
+Chefoo
+Chefornak
+Chefrinia
+chefs
+chefs-d'oeuvre
+chego
+chegoe
+chegoes
+chegre
+Chehalis
+cheiceral
+cheil-
+Cheilanthes
+cheilion
+cheilitis
+Cheilodipteridae
+Cheilodipterus
+cheiloplasties
+cheiloplasty
+Cheilostomata
+cheilostomatous
+cheilotomies
+cheilotomy
+cheimaphobia
+cheimatophobia
+cheir
+cheir-
+cheiragra
+Cheiranthus
+cheiro-
+Cheirogaleus
+Cheiroglossa
+cheirognomy
+cheirography
+cheirolin
+cheiroline
+cheirology
+cheiromancy
+cheiromegaly
+Cheiron
+cheiropatagium
+cheiropod
+cheiropodist
+cheiropody
+cheiropompholyx
+Cheiroptera
+cheiroptera
+cheiropterygium
+cheirosophy
+cheirospasm
+Cheirotherium
+cheirotherium
+Cheju
+Cheka
+cheka
+chekan
+Cheke
+cheke
+cheken
+Chekhov
+chekhov
+Chekhovian
+cheki
+Chekiang
+Chekist
+chekker
+chekmak
+chela
+chelae
+Chelan
+chelas
+chelaship
+chelatable
+chelate
+chelated
+chelates
+chelating
+chelation
+chelator
+chelators
+chelem
+chelerythrin
+chelerythrine
+chelicer
+chelicera
+chelicerae
+cheliceral
+chelicerate
+chelicere
+chelide
+Chelidon
+chelidon
+chelidonate
+chelidonian
+chelidonic
+chelidonin
+chelidonine
+Chelidonium
+Chelidosaurus
+chelifer
+Cheliferidea
+cheliferous
+cheliform
+chelinga
+chelingas
+chelingo
+chelingos
+cheliped
+Chellean
+chellean
+Chellman
+chello
+Chelmno
+Chelmsford
+Chelodina
+chelodine
+cheloid
+cheloids
+chelone
+Chelonia
+chelonian
+chelonid
+Chelonidae
+cheloniid
+Cheloniidae
+chelonin
+chelophore
+chelp
+Chelsae
+Chelsea
+Chelsey
+Chelsie
+Chelsy
+Cheltenham
+Chelton
+Chelura
+Chelyabinsk
+Chelydidae
+Chelydra
+chelydre
+Chelydridae
+chelydroid
+chelys
+Chelyuskin
+Chem
+chem
+chem-
+chem.
+Chema
+Chemakuan
+Chemar
+Chemaram
+Chemarin
+Chemash
+chemasthenia
+chemawinite
+ChemE
+Chemehuevi
+Chemesh
+chemesthesis
+chemiatric
+chemiatrist
+chemiatry
+chemic
+chemical
+chemicalization
+chemicalize
+chemically
+chemicals
+chemick
+chemicked
+chemicker
+chemicking
+chemico-
+chemicoastrological
+chemicobiologic
+chemicobiological
+chemicobiology
+chemicocautery
+chemicodynamic
+chemicoengineering
+chemicoluminescence
+chemicoluminescent
+chemicomechanical
+chemicomineralogical
+chemicopharmaceutical
+chemicophysical
+chemicophysics
+chemicophysiological
+chemicovital
+chemics
+chemiculture
+chemigraph
+chemigrapher
+chemigraphic
+chemigraphically
+chemigraphy
+chemiloon
+chemiluminescence
+chemiluminescent
+chemin
+cheminee
+chemins
+chemiotactic
+chemiotaxic
+chemiotaxis
+chemiotropic
+chemiotropism
+chemiphotic
+chemis
+chemise
+chemises
+chemisette
+chemism
+chemisms
+chemisorb
+chemisorption
+chemisorptive
+chemist
+chemistries
+chemistry
+chemists
+chemitype
+chemitypies
+chemitypy
+chemizo
+chemmy
+Chemnitz
+chemo-
+chemoautotrophic
+chemoautotrophically
+chemoautotrophy
+chemoceptor
+chemokinesis
+chemokinetic
+chemolysis
+chemolytic
+chemolyze
+chemonite
+chemopallidectomies
+chemopallidectomy
+chemopause
+chemophysiological
+chemophysiology
+chemoprophyalctic
+chemoprophylactic
+chemoprophylaxis
+chemoreception
+chemoreceptive
+chemoreceptivities
+chemoreceptivity
+chemoreceptor
+chemoreflex
+chemoresistance
+chemosensitive
+chemosensitivities
+chemosensitivity
+chemoserotherapy
+chemoses
+Chemosh
+chemosis
+chemosmoic
+chemosmoses
+chemosmosis
+chemosmotic
+chemosorb
+chemosorption
+chemosorptive
+chemosphere
+chemospheric
+chemostat
+chemosterilant
+chemosterilants
+chemosurgery
+chemosurgical
+chemosynthesis
+chemosynthetic
+chemosynthetically
+chemotactic
+chemotactically
+chemotaxis
+chemotaxonomic
+chemotaxonomically
+chemotaxonomist
+chemotaxonomy
+chemotaxy
+chemotherapeutic
+chemotherapeutical
+chemotherapeutically
+chemotherapeuticness
+chemotherapeutics
+chemotherapies
+chemotherapist
+chemotherapists
+chemotherapy
+chemotic
+chemotroph
+chemotrophic
+chemotropic
+chemotropically
+chemotropism
+chempaduk
+Chemstrand
+Chemulpo
+Chemult
+Chemung
+chemurgic
+chemurgical
+chemurgically
+chemurgies
+chemurgy
+Chemush
+Chen
+chena
+Chenab
+chenar
+Chenay
+chende
+cheneau
+cheneaus
+cheneaux
+Chenee
+chenet
+chenevixite
+Cheney
+Cheneyville
+chenfish
+Cheng
+cheng
+chengal
+Chengchow
+Chengteh
+Chengtu
+chenica
+Chenier
+chenier
+chenille
+cheniller
+chenilles
+Chennault
+Chenoa
+chenopod
+Chenopodiaceae
+chenopodiaceous
+Chenopodiales
+Chenopodium
+chenopods
+Chenoweth
+cheongsam
+cheoplastic
+Cheops
+Chepachet
+Chephren
+chepster
+cheque
+chequebook
+chequeen
+chequer
+chequerboard
+chequer-chamber
+chequered
+chequering
+Chequers
+chequers
+chequer-wise
+chequerwise
+chequer-work
+chequerwork
+cheques
+chequin
+chequinn
+chequy
+Cher
+cher
+Chera
+Cheraw
+Cherbourg
+cherchez
+chercock
+Chere
+chere
+cherely
+cherem
+Cheremis
+Cheremiss
+Cheremissian
+Cheremkhovo
+Cherenkov
+cherenkov
+Cherey
+chergui
+Cheri
+Cheria
+Cherian
+Cherianne
+Cheribon
+Cherice
+Cherida
+Cherie
+cherie
+Cheries
+cheries
+Cherilyn
+Cherilynn
+cherimolla
+cherimoya
+cherimoyer
+Cherin
+Cherise
+Cherish
+cherish
+cherishable
+cherished
+cherisher
+cherishers
+cherishes
+cherishing
+cherishingly
+cherishment
+Cheriton
+Cherkess
+Cherkesser
+Cherlyn
+Chermes
+chermes
+Chermidae
+Chermish
+cherna
+chernites
+Chernobyl
+Chernomorish
+Chernovtsy
+Chernow
+chernozem
+chernozemic
+cherogril
+Cherokee
+cherokee
+Cherokees
+cherokees
+cheroot
+cheroots
+Cherri
+cherried
+cherries
+Cherrita
+Cherry
+cherry
+cherryblossom
+cherry-bob
+cherry-cheeked
+cherry-colored
+cherry-crimson
+Cherryfield
+cherry-flavored
+cherrying
+cherrylike
+cherry-lipped
+Cherrylog
+cherry-merry
+cherry-pie
+cherry-red
+cherry-ripe
+cherry-rose
+cherrystone
+cherrystones
+Cherrytree
+Cherryvale
+Cherryville
+cherry-wood
+chersonese
+Chersydridae
+chert
+cherte
+chertier
+chertiest
+cherts
+Chertsey
+cherty
+cherub
+cherubfish
+cherubfishes
+cherubic
+cherubical
+cherubically
+Cherubicon
+Cherubikon
+cherubim
+cherubimic
+cherubimical
+cherubin
+Cherubini
+cherublike
+cherubs
+cherup
+Cherusci
+Chervante
+chervil
+chervils
+chervonei
+chervonets
+chervonetz
+chervontsi
+Chery
+Cherye
+Cheryl
+Cherylene
+Ches
+Chesaning
+Chesapeake
+chesapeake
+chesboil
+chesboll
+chese
+cheselip
+Cheshire
+cheshire
+Cheshunt
+Cheshvan
+chesil
+cheskey
+cheskeys
+cheslep
+Cheslie
+Chesna
+Chesnee
+Chesney
+Chesnut
+cheson
+chesoun
+chess
+Chessa
+chess-apple
+chessart
+chessboard
+chessboards
+chessdom
+chessel
+chesser
+chesses
+chesset
+chessist
+chessman
+chess-men
+chessmen
+chessner
+chessom
+chessplayer
+chessplayers
+chess-tree
+chesstree
+Chessy
+chessylite
+chest
+chest-deep
+chested
+chesteine
+Chester
+chester
+chesterbed
+Chesterfield
+chesterfield
+Chesterfieldian
+chesterfields
+Chesterland
+chesterlite
+Chesterton
+Chestertown
+Chesterville
+chest-foundered
+chestful
+chestfuls
+chestier
+chestiest
+chestily
+chestiness
+chestnut
+chestnut-backed
+chestnut-bellied
+chestnut-brown
+chestnut-collared
+chestnut-colored
+chestnut-crested
+chestnut-crowned
+chestnut-red
+chestnut-roan
+chestnuts
+chestnut-sided
+chestnutty
+chestnut-winged
+Cheston
+chest-on-chest
+chests
+chesty
+Cheswick
+Cheswold
+Chet
+chetah
+chetahs
+Chetek
+cheth
+cheths
+chetif
+chetive
+Chetnik
+Chetopa
+chetopod
+chetrum
+chetrums
+chettik
+chetty
+Chetumal
+chetverik
+chetvert
+Cheung
+cheung
+Cheux
+Chev
+chevachee
+chevachie
+chevage
+Chevak
+cheval
+cheval-de-frise
+chevalet
+chevalets
+cheval-glass
+Chevalier
+chevalier
+Chevalier-Montrachet
+chevaliers
+chevaline
+Chevallier
+chevance
+chevaux
+chevaux-de-frise
+cheve
+chevee
+chevelure
+cheven
+chevener
+cheventayn
+cheverel
+cheveret
+cheveril
+Cheverly
+cheveron
+cheverons
+Cheves
+chevesaile
+chevesne
+chevet
+chevetaine
+cheveys
+chevied
+chevies
+cheville
+chevin
+Cheviot
+cheviot
+cheviots
+chevisance
+chevise
+chevon
+chevre
+chevres
+Chevret
+chevret
+chevrette
+chevreuil
+Chevrier
+Chevrolet
+chevrolet
+chevrolets
+chevron
+chevrone
+chevroned
+chevronel
+chevronelly
+chevronny
+chevrons
+chevron-shaped
+chevronwise
+chevrony
+chevrotain
+Chevrotin
+chevvy
+Chevy
+chevy
+chevying
+Chew
+chew
+Chewa
+chewable
+Chewalla
+chewbark
+chewed
+Chewelah
+cheweler
+chewer
+chewers
+chewet
+chewie
+chewier
+chewiest
+chewing
+chewing-out
+chewink
+chewinks
+chews
+chewstick
+Chewsville
+chewy
+Cheyenne
+cheyenne
+Cheyennes
+cheyennes
+Cheyne
+Cheyney
+cheyney
+cheyneys
+chez
+chg
+chg.
+chhatri
+Chhnang
+CHI
+Chi
+chi
+chia
+Chia-Chia
+chiack
+Chiaki
+Chiam
+Chian
+chian
+Chiang
+Chiangling
+Chiangmai
+Chianti
+chianti
+chiao
+Chiapanec
+Chiapanecan
+Chiapas
+Chiaretto
+Chiari
+chiarooscurist
+chiarooscuro
+chiarooscuros
+chiaroscurist
+chiaroscuro
+chiaroscuros
+Chiarra
+chias
+chiasm
+chiasma
+chiasmal
+chiasmas
+chiasmata
+chiasmatic
+chiasmatype
+chiasmatypy
+chiasmi
+chiasmic
+Chiasmodon
+chiasmodontid
+Chiasmodontidae
+chiasms
+chiasmus
+Chiasso
+chiastic
+chiastolite
+chiastoneural
+chiastoneurous
+chiastoneury
+chiaus
+chiauses
+chiave
+chiavetta
+Chiayi
+Chiba
+chiba
+Chibcha
+chibcha
+Chibchan
+chibchan
+Chibchas
+chibinite
+chibol
+chibouk
+chibouks
+chibouque
+chibrit
+Chic
+chic
+chica
+chicadee
+Chicago
+chicago
+Chicagoan
+chicagoan
+chicagoans
+chicalote
+chicane
+chicaned
+chicaner
+chicaneries
+chicaners
+chicanery
+chicanes
+chicaning
+Chicano
+chicano
+Chicanos
+chicanos
+chicaric
+chicayote
+chiccories
+chiccory
+chicer
+chicest
+chich
+Chicha
+chicha
+chicharra
+Chichester
+chichevache
+Chichewa
+chichi
+chichicaste
+Chichihaerh
+Chichihar
+chichili
+Chichimec
+chichimecan
+chichipate
+chichipe
+chichis
+chichituna
+Chichivache
+chichling
+Chick
+chick
+chickabiddy
+chickadee
+chickadees
+Chickahominy
+Chickamauga
+chickaree
+Chickasaw
+chickasaw
+Chickasaws
+chickasaws
+Chickasha
+chickee
+chickees
+chickell
+chicken
+chickenberry
+chickenbill
+chicken-billed
+chicken-brained
+chicken-breasted
+chickenbreasted
+chicken-breastedness
+chickened
+chicken-farming
+chicken-hazard
+chicken-hearted
+chickenhearted
+chicken-heartedly
+chickenheartedly
+chicken-heartedness
+chickenheartedness
+chickenhood
+chickening
+chicken-livered
+chicken-liveredness
+chicken-meat
+chickenpox
+chickens
+chickenshit
+chicken-spirited
+chickens-toes
+chicken-toed
+chickenweed
+chickenwort
+chicker
+chickery
+chickhood
+Chickie
+chickies
+chickling
+chickories
+chickory
+chick-pea
+chickpea
+chickpeas
+chicks
+chickstone
+chickweed
+chickweeds
+chickwit
+Chicky
+chicky
+Chiclayo
+chicle
+chiclero
+chicles
+chicly
+chicness
+chicnesses
+Chico
+chico
+Chicoine
+Chicomecoatl
+Chicopee
+Chicora
+chicories
+chicory
+chicos
+chicot
+Chicota
+chicote
+chicqued
+chicquer
+chicquest
+chicquing
+chics
+chid
+chidden
+chide
+chided
+chider
+chiders
+chides
+Chidester
+chiding
+chidingly
+chidingness
+chidra
+chief
+chiefage
+chiefdom
+chiefdoms
+chiefer
+chiefery
+chiefess
+chiefest
+chiefish
+chief-justiceship
+Chiefland
+chiefless
+chiefling
+chiefly
+chief-pledge
+chiefry
+chiefs
+chiefship
+chieftain
+chieftaincies
+chieftaincy
+chieftainess
+chieftainries
+chieftainry
+chieftains
+chieftainship
+chieftainships
+chieftess
+chiefty
+chiel
+chield
+chields
+chiels
+Chiemsee
+Chien
+chien
+Chiengmai
+Chiengrai
+chierete
+chievance
+chieve
+chiff-chaff
+chiffchaff
+chiffer
+chifferobe
+chiffon
+chiffonade
+chiffonier
+chiffoniers
+chiffonnier
+chiffonnieres
+chiffonniers
+chiffons
+chiffony
+chifforobe
+chifforobes
+chiffre
+chiffrobe
+Chifley
+chigetai
+chigetais
+chigga
+chiggak
+chigger
+chiggers
+chiggerweed
+Chignik
+chignon
+chignoned
+chignons
+chigoe
+chigoe-poison
+chigoes
+Chigwell
+chih
+chihfu
+Chihli
+Chihuahua
+chihuahua
+chihuahuas
+Chikamatsu
+chikara
+chikee
+Chikmagalur
+Chil
+chil
+chilacavote
+chilacayote
+chilalgia
+chilaria
+chilarium
+chilblain
+chilblained
+chilblains
+Chilcat
+Chilcats
+Chilcoot
+Chilcote
+Child
+child
+childage
+childbear
+child-bearing
+childbearing
+childbed
+childbeds
+child-bereft
+child-birth
+childbirth
+childbirths
+childcrowing
+Childe
+childe
+childed
+Childermas
+childermas
+Childers
+Childersburg
+childes
+child-fashion
+child-god
+child-hearted
+child-heartedness
+childhood
+childhoods
+childing
+childish
+childishly
+childishness
+childishnesses
+childkind
+childless
+childlessness
+childlessnesses
+childlier
+childliest
+childlike
+childlikeness
+child-loving
+childly
+child-minded
+child-mindedness
+childminder
+childness
+childproof
+childre
+children
+childrenite
+Childress
+childridden
+Childs
+childship
+childward
+childwife
+childwite
+Childwold
+Chile
+chile
+Chilean
+chilean
+Chileanization
+Chileanize
+chileans
+chilectropion
+chilenite
+Chiles
+chiles
+Chilhowee
+Chilhowie
+chili
+chiliad
+chiliadal
+chiliadic
+chiliadron
+chiliads
+chiliaedron
+chiliagon
+chiliahedron
+chiliarch
+chiliarchia
+chiliarchy
+chiliasm
+chiliasms
+chiliast
+chiliastic
+chiliasts
+chilicote
+chilicothe
+chilidium
+chilidog
+chilidogs
+chilies
+Chi-lin
+chi-lin
+Chilina
+chilindre
+Chilinidae
+chilio-
+chiliomb
+Chilion
+chilipepper
+chilitis
+Chilkat
+Chilkats
+Chill
+chill
+chilla
+chillagite
+Chillan
+chill-cast
+chilled
+chiller
+chillers
+chillest
+chilli
+Chillicothe
+chillier
+chillies
+chilliest
+chillily
+chilliness
+chillinesses
+chilling
+chillingly
+chillis
+chillish
+Chilliwack
+chillness
+chillo
+chilloes
+Chillon
+chillroom
+chills
+chillsome
+chillum
+chillumchee
+chillums
+chilly
+Chilmark
+Chilo
+chilo-
+chilodon
+chilognath
+Chilognatha
+chilognathan
+chilognathous
+chilogrammo
+chiloma
+Chilomastix
+chilomata
+Chilomonas
+Chilon
+chiloncus
+chiloplasty
+chilopod
+Chilopoda
+chilopodan
+chilopodous
+chilopods
+Chilopsis
+Chiloquin
+Chilostoma
+Chilostomata
+chilostomatous
+chilostome
+chilotomies
+chilotomy
+Chilpancingo
+Chilson
+Chilt
+chilte
+Chiltern
+chiltern
+Chilton
+Chilung
+chilver
+chimachima
+Chimacum
+chimaera
+chimaeras
+chimaerid
+Chimaeridae
+chimaeroid
+Chimaeroidei
+Chimakuan
+Chimakum
+Chimalakwe
+Chimalapa
+Chimane
+chimango
+Chimaphila
+chimar
+Chimarikan
+Chimariko
+chimars
+Chimayo
+chimb
+chimbe
+chimble
+chimbley
+chimbleys
+chimblies
+chimbly
+Chimborazo
+Chimbote
+chimbs
+chime
+chimed
+Chimene
+chimer
+chimera
+chimeral
+chimeras
+chimere
+chimeres
+chimeric
+chimerical
+chimerically
+chimericalness
+chimerism
+chimers
+chimes
+chimesmaster
+chimin
+chiminage
+chiming
+Chimique
+Chimkent
+chimla
+chimlas
+chimley
+chimleys
+Chimmesyan
+chimney
+chimneyed
+chimneyhead
+chimneying
+chimneyless
+chimneylike
+chimneyman
+chimney-piece
+chimneypiece
+chimneypot
+chimneys
+Chimonanthus
+chimopeelagic
+chimopelagic
+chimp
+chimpanzee
+chimpanzees
+chimps
+Chimu
+Chimus
+Ch'in
+Chin
+Chin.
+ch'in
+chin
+China
+china
+chinaberries
+chinaberry
+chinafish
+chinafy
+Chinagraph
+chinalike
+Chinaman
+chinaman
+china-mania
+chinamania
+chinamaniac
+Chinamen
+chinamen
+chinampa
+Chinan
+chinanta
+Chinantecan
+Chinantecs
+chinaphthol
+chinar
+chinaroot
+chinas
+Chinatown
+chinatown
+chinaware
+chinawoman
+chinband
+chinbeak
+chin-bearded
+chin-bone
+chinbone
+chinbones
+chincapin
+chinch
+chincha
+Chinchasuyu
+chinchayote
+chinche
+chincher
+chincherinchee
+chincherinchees
+chinches
+chinchier
+chinchiest
+chinchilla
+chinchillas
+chinchillette
+chin-chin
+chinchiness
+chinching
+chin-chinned
+chin-chinning
+chinchona
+Chin-Chou
+chinchy
+chincloth
+chincof
+chincona
+Chincoteague
+chincough
+chindee
+chin-deep
+chindi
+Chindit
+Chindwin
+chine
+chined
+Chinee
+chinela
+chinenses
+chines
+Chinese
+chinese
+Chinese-houses
+Chinesery
+chinfest
+Ch'ing
+Ching
+ching
+Chinghai
+chingma
+Chingpaw
+Chingtao
+Ching-t'u
+Ching-tu
+Ch'ing-yan
+chin-high
+Chin-Hsien
+Chinhwan
+chinik
+chiniks
+chinin
+chining
+chiniofon
+Chink
+chink
+chinkapin
+chinkara
+chink-backed
+chinked
+chinker
+chinkerinchee
+chinkers
+Chinkiang
+chinkier
+chinkiest
+chinking
+chinkle
+chinks
+chinky
+Chinle
+chinles
+chinless
+chinnam
+Chinnampo
+chinned
+chinner
+chinners
+chinnier
+chinniest
+chinning
+chinny
+Chino
+Chino-
+chino
+chino-
+chinoa
+chinoidin
+chinoidine
+chinois
+chinoiserie
+Chino-japanese
+chinol
+chinoleine
+chinoline
+chinologist
+chinone
+chinones
+Chinook
+chinook
+Chinookan
+chinookan
+Chinooks
+chinooks
+chinos
+chinotoxine
+chinotti
+chinotto
+chinovnik
+chinpiece
+chinquapin
+chins
+chinse
+chinsed
+chinsing
+chint
+chints
+chintses
+chintz
+chintze
+chintzes
+chintzier
+chintziest
+chintziness
+chintzy
+Chinua
+chin-up
+chin-wag
+chinwag
+chinwood
+Chiococca
+chiococcine
+Chiogenes
+chiolite
+chionablepsia
+Chionanthus
+Chionaspis
+Chione
+Chionididae
+Chionis
+Chionodoxa
+chionodoxa
+chionophobia
+chiopin
+Chios
+Chiot
+chiotilla
+Chiou
+Chip
+chip
+chipboard
+chipchap
+chipchop
+Chipewyan
+chiplet
+Chipley
+chipling
+Chipman
+chipmuck
+chipmucks
+chipmunk
+chipmunks
+chipolata
+chippable
+chippage
+chipped
+Chippendale
+chippendale
+chipper
+chippered
+chippering
+chippers
+chipper-up
+Chippewa
+chippewa
+Chippewas
+chippewas
+Chippeway
+Chippeways
+chippie
+chippier
+chippies
+chippiest
+chipping
+chippings
+chip-proof
+chipproof
+chippy
+chips
+chipwood
+chipyard
+chiquero
+chiquest
+Chiquia
+Chiquinquira
+Chiquita
+Chiquitan
+Chiquito
+chir-
+Chirac
+chiragra
+chiragrical
+chiral
+chiralgia
+chirality
+Chiran
+chirapsia
+chirarthritis
+chirata
+Chirau
+chirayta
+Chireno
+Chi-Rho
+chi-rho
+Chi-Rhos
+Chiriana
+Chiricahua
+Chirico
+Chiriguano
+Chirikof
+chirimen
+chirimia
+chirimoya
+chirimoyer
+Chirino
+chirinola
+chiripa
+Chiriqui
+chirivita
+chirk
+chirked
+chirker
+chirkest
+chirking
+chirks
+chirl
+Chirlin
+chirm
+chirmed
+chirming
+chirms
+chiro
+chiro-
+chirocosmetics
+chirogale
+chirognomic
+chirognomically
+chirognomist
+chirognomy
+chirognostic
+chirograph
+chirographary
+chirographer
+chirographers
+chirographic
+chirographical
+chirography
+chirogymnast
+chirolas
+chirological
+chirologically
+chirologies
+chirologist
+chirology
+chiromance
+chiromancer
+chiromancist
+chiromancy
+chiromant
+chiromantic
+chiromantical
+Chiromantis
+chiromegaly
+chirometer
+Chiromyidae
+Chiromys
+Chiron
+chironomic
+chironomid
+Chironomidae
+Chironomus
+chironomy
+chironym
+chiropatagium
+chiroplasty
+chiropod
+chiropodial
+chiropodic
+chiropodical
+chiropodies
+chiropodist
+chiropodistry
+chiropodists
+chiropodous
+chiropody
+chiropompholyx
+chiropractic
+chiropractics
+chiropractor
+chiropractors
+chiropraxis
+chiropter
+Chiroptera
+chiropteran
+chiropterite
+chiropterophilous
+chiropterous
+chiropterygian
+chiropterygious
+chiropterygium
+chiros
+chirosophist
+chirospasm
+Chirotes
+chirotherian
+Chirotherium
+chirothesia
+chirotonsor
+chirotonsory
+chirotony
+chirotype
+chirp
+chirped
+chirper
+chirpers
+chirpier
+chirpiest
+chirpily
+chirpiness
+chirping
+chirpingly
+chirpling
+chirps
+chirpy
+chirr
+chirre
+chirred
+chirres
+chirring
+chirrs
+chirrup
+chirruped
+chirruper
+chirruping
+chirrupper
+chirrups
+chirrupy
+chirt
+chiru
+chirurgeon
+chirurgeonly
+chirurgery
+chirurgic
+chirurgical
+chirurgy
+chis
+Chisedec
+chisel
+chisel-cut
+chiseled
+chisel-edged
+chiseler
+chiselers
+chiseling
+chiselled
+chiseller
+chisellers
+chisellike
+chiselling
+chiselly
+chiselmouth
+chisel-pointed
+chisels
+chisel-shaped
+Chishima
+Chisholm
+Chisimaio
+Chisin
+chisled
+chi-square
+chistera
+chistka
+chit
+Chita
+chitak
+chital
+chitarra
+chitarrino
+chitarrone
+chitarroni
+chit-chat
+chitchat
+chitchats
+chitchatted
+chitchatting
+chitchatty
+chithe
+Chitimacha
+Chitimachan
+chitin
+Chitina
+chitinization
+chitinized
+chitino-arenaceous
+chitinocalcareous
+chitinogenous
+chitinoid
+chitinous
+chitins
+Chitkara
+chitlin
+chitling
+chitlings
+chitlins
+chiton
+chitons
+chitosamine
+chitosan
+chitosans
+chitose
+chitra
+Chitragupta
+Chitrali
+chits
+Chi-tse
+chittack
+Chittagong
+chittak
+chittamwood
+chitted
+Chittenango
+Chittenden
+chitter
+chitter-chatter
+chittered
+chittering
+chitterling
+chitterlings
+chitters
+chitties
+chitting
+chitty
+chitty-face
+Chi-tzu
+chiule
+chiurm
+Chiusi
+chiv
+chivachee
+chivage
+chivalresque
+chivalric
+chivalries
+chivalrous
+chivalrously
+chivalrousness
+chivalrousnesses
+chivalry
+chivaree
+chivareed
+chivareeing
+chivarees
+chivareing
+chivari
+chivaried
+chivariing
+chivaring
+chivaris
+chivarra
+chivarras
+chivarro
+chive
+chiver
+chiveret
+Chivers
+chives
+chivey
+chiviatite
+chivied
+chivies
+Chivington
+chivvied
+chivvies
+chivvy
+chivvying
+chivw
+chivy
+chivying
+Chiwere
+chizz
+chizzel
+chkalik
+Chkalov
+chkfil
+chkfile
+Chladek
+Chladni
+chladnite
+chlamyd
+chlamydate
+chlamydeous
+chlamydes
+Chlamydia
+Chlamydobacteriaceae
+chlamydobacteriaceous
+Chlamydobacteriales
+Chlamydomonadaceae
+Chlamydomonadidae
+Chlamydomonas
+chlamydomonas
+chlamydophore
+Chlamydosaurus
+Chlamydoselachidae
+Chlamydoselachus
+chlamydospore
+chlamydosporic
+Chlamydozoa
+chlamydozoan
+chlamyphore
+Chlamyphorus
+chlamys
+chlamyses
+Chleuh
+Chlidanope
+Chlo
+chloanthite
+chloasma
+chloasmata
+Chlodwig
+Chloe
+chloe
+Chloette
+Chlons-sur-Marne
+chlor
+chlor-
+chloracetate
+chloracne
+chloraemia
+chloragen
+chloragogen
+chloragogue
+chloral
+chloralformamide
+chloralide
+chloralism
+chloralization
+chloralize
+chloralized
+chloralizing
+chloralose
+chloralosed
+chlorals
+chloralum
+chlorambucil
+chloramide
+chloramin
+chloramine
+chloramine-T
+chloramphenicol
+chloranaemia
+chloranemia
+chloranemic
+chloranhydride
+chloranil
+Chloranthaceae
+chloranthaceous
+Chloranthus
+chloranthus
+chloranthy
+chlorapatite
+chlorargyrite
+Chloras
+chlorastrolite
+chlorate
+chlorates
+chlorazide
+chlorcosane
+chlordan
+chlordane
+chlordans
+chlordiazepoxide
+chlore
+chlored
+Chlorella
+chlorella
+Chlorellaceae
+chlorellaceous
+chloremia
+chloremic
+chlorenchyma
+Chlores
+chlorguanide
+chlorhexidine
+chlorhydrate
+chlorhydric
+Chlori
+chloriamb
+chloriambus
+chloric
+chlorid
+chloridate
+chloridated
+chloridation
+chloride
+Chloridella
+Chloridellidae
+chlorider
+chlorides
+chloridic
+chloridize
+chloridized
+chloridizing
+chlorids
+chlorimeter
+chlorimetric
+chlorimetry
+chlorin
+chlorinate
+chlorinated
+chlorinates
+chlorinating
+chlorination
+chlorinations
+chlorinator
+chlorinators
+chlorine
+chlorines
+chlorinity
+chlorinize
+chlorinous
+chlorins
+chloriodide
+Chlorion
+Chlorioninae
+Chloris
+chlorite
+chlorites
+chloritic
+chloritization
+chloritize
+chloritoid
+chlorize
+chlormethane
+chlormethylic
+chlornal
+chloro
+chloro-
+chloroacetate
+chloroacetic
+chloroacetone
+chloroacetophenone
+chloroamide
+chloroamine
+chloroanaemia
+chloroanemia
+chloroaurate
+chloroauric
+chloroaurite
+chlorobenzene
+chlorobromide
+chlorobromomethane
+chlorocalcite
+chlorocarbon
+chlorocarbonate
+chlorochromates
+chlorochromic
+chlorochrous
+Chlorococcaceae
+Chlorococcales
+Chlorococcum
+Chlorococcus
+chlorocresol
+chlorocruorin
+chlorodize
+chlorodized
+chlorodizing
+chlorodyne
+chloroethene
+chloroethylene
+chlorofluorocarbon
+chlorofluoromethane
+chloroform
+chloroformate
+chloroformed
+chloroformic
+chloroforming
+chloroformism
+chloroformist
+chloroformization
+chloroformize
+chloroforms
+chlorogenic
+chlorogenine
+chloroguanide
+chlorohydrin
+chlorohydrocarbon
+chlorohydroquinone
+chloroid
+chloroiodide
+chloroleucite
+chloroma
+chloromata
+chloromelanite
+chlorometer
+chloromethane
+chlorometric
+chlorometry
+Chloromycetin
+chloromycetin
+chloronaphthalene
+chloronitrate
+chloropal
+chloropalladates
+chloropalladic
+chlorophaeite
+chlorophane
+chlorophenol
+chlorophenothane
+chlorophoenicite
+Chlorophora
+Chlorophyceae
+chlorophyceous
+chlorophyl
+chlorophyll
+chlorophyllaceous
+chlorophyllan
+chlorophyllase
+chlorophyllian
+chlorophyllide
+chlorophylliferous
+chlorophylligenous
+chlorophylligerous
+chlorophyllin
+chlorophyllite
+chlorophylloid
+chlorophyllose
+chlorophyllous
+chlorophylls
+chloropia
+chloropicrin
+chloroplast
+chloroplastic
+chloroplastid
+chloroplasts
+chloroplatinate
+chloroplatinic
+chloroplatinite
+chloroplatinous
+chloroprene
+chloropsia
+chloroquine
+chlorosilicate
+chlorosis
+chlorospinel
+chlorosulphonic
+chlorothiazide
+chlorotic
+chlorotically
+chlorotrifluoroethylene
+chlorotrifluoromethane
+chlorous
+chlorozincate
+chlorpheniramine
+chlorphenol
+chlorpicrin
+chlorpikrin
+chlorpromazine
+chlorpropamide
+chlorprophenpyridamine
+chlorsalol
+chlortetracycline
+Chlor-Trimeton
+chloryl
+ChM
+chm
+chm.
+Chmielewski
+chmn
+chn
+Chnier
+Chnuphis
+Cho
+cho
+choachyte
+choak
+choana
+choanae
+choanate
+Choanephora
+choanite
+choanocytal
+choanocyte
+Choanoflagellata
+choanoflagellate
+Choanoflagellida
+Choanoflagellidae
+choanoid
+choanophorous
+choanosomal
+choanosome
+Choapas
+Choate
+choate
+choaty
+chob
+chobdar
+chobie
+Chobot
+choca
+chocalho
+chocard
+Choccolocco
+Chocho
+chocho
+chochos
+choc-ice
+chock
+chock-a-block
+chockablock
+chocked
+chocker
+chockful
+chock-full
+chockfull
+chocking
+chockler
+chockman
+chocks
+chockstone
+Choco
+choco
+Chocoan
+chocolate
+chocolate-box
+chocolate-brown
+chocolate-coated
+chocolate-colored
+chocolate-flower
+chocolate-red
+chocolates
+chocolatey
+chocolatier
+chocolatiere
+chocolaty
+Chocorua
+Chocowinity
+Choctaw
+choctaw
+choctaw-root
+Choctaws
+choctaws
+choel
+choenix
+Choephori
+Choeropsis
+Choes
+choffer
+choga
+chogak
+chogset
+Chogyal
+Choiak
+choice
+choice-drawn
+choiceful
+choiceless
+choicelessness
+choicely
+choiceness
+choicer
+choices
+choicest
+choicier
+choiciest
+choicy
+choil
+choile
+choiler
+choir
+choirboy
+choirboys
+choired
+choirgirl
+choiring
+choirlike
+choirman
+choirmaster
+choirmasters
+choirs
+choirwise
+choise
+Choiseul
+Choisya
+chok
+chokage
+choke
+choke-
+chokeable
+chokeberries
+chokeberry
+choke-bore
+chokebore
+chokecherries
+chokecherry
+choked
+chokedamp
+choke-full
+choker
+chokered
+chokerman
+chokers
+chokes
+chokestrap
+chokeweed
+chokey
+chokeys
+chokidar
+chokier
+chokies
+chokiest
+choking
+chokingly
+Chokio
+choko
+Chokoloskee
+chokra
+choky
+Chol
+chol
+chol-
+Chola
+chola
+cholaemia
+cholagogic
+cholagogue
+cholalic
+cholam
+Cholame
+cholane
+cholangiographic
+cholangiography
+cholangioitis
+cholangitis
+cholanic
+cholanthrene
+cholate
+cholates
+chold
+chole-
+choleate
+cholecalciferol
+cholecyanin
+cholecyanine
+cholecyst
+cholecystalgia
+cholecystectasia
+cholecystectomies
+cholecystectomized
+cholecystectomy
+cholecystenterorrhaphy
+cholecystenterostomy
+cholecystgastrostomy
+cholecystic
+cholecystis
+cholecystitis
+cholecystnephrostomy
+cholecystocolostomy
+cholecystocolotomy
+cholecystoduodenostomy
+cholecystogastrostomy
+cholecystogram
+cholecystography
+cholecystoileostomy
+cholecystojejunostomy
+cholecystokinin
+cholecystolithiasis
+cholecystolithotripsy
+cholecystonephrostomy
+cholecystopexy
+cholecystorrhaphy
+cholecystostomies
+cholecystostomy
+cholecystotomies
+cholecystotomy
+choledoch
+choledochal
+choledochectomy
+choledochitis
+choledochoduodenostomy
+choledochoenterostomy
+choledocholithiasis
+choledocholithotomy
+choledocholithotripsy
+choledochoplasty
+choledochorrhaphy
+choledochostomies
+choledochostomy
+choledochotomies
+choledochotomy
+choledography
+cholee
+cholehematin
+choleic
+choleine
+choleinic
+cholelith
+cholelithiasis
+cholelithic
+cholelithotomy
+cholelithotripsy
+cholelithotrity
+cholemia
+cholent
+cholents
+choleokinase
+cholepoietic
+choler
+cholera
+choleraic
+choleras
+choleric
+cholerically
+cholericly
+cholericness
+choleriform
+cholerigenous
+cholerine
+choleroid
+choleromania
+cholerophobia
+cholerrhagia
+cholers
+cholestane
+cholestanol
+cholesteatoma
+cholesteatomatous
+cholestene
+cholesterate
+cholesteremia
+cholesteric
+cholesterin
+cholesterinemia
+cholesterinic
+cholesterinuria
+cholesterol
+cholesterolemia
+cholesterols
+cholesteroluria
+cholesterosis
+cholesteryl
+choletelin
+choletherapy
+choleuria
+choli
+choliamb
+choliambic
+choliambist
+cholic
+cholick
+choline
+cholinergic
+cholines
+cholinesterase
+cholinic
+cholinolytic
+cholla
+chollas
+choller
+chollers
+Cholo
+cholo
+cholo-
+cholochrome
+cholocyanine
+Choloepus
+chologenetic
+choloid
+choloidic
+choloidinic
+chololith
+chololithic
+Cholon
+Cholonan
+Cholones
+cholophaein
+cholophein
+cholorrhea
+Cholos
+cholos
+choloscopy
+cholralosed
+cholterheaded
+choltry
+Cholula
+cholum
+choluria
+Choluteca
+chomage
+chomer
+chomp
+chomped
+chomper
+chompers
+chomping
+chomps
+Chomsky
+Chon
+chon
+chonchina
+chondr-
+chondral
+chondralgia
+chondrarsenite
+chondre
+chondrectomy
+chondrenchyma
+chondri
+chondria
+chondric
+Chondrichthyes
+chondrification
+chondrified
+chondrify
+chondrigen
+chondrigenous
+Chondrilla
+chondrin
+chondrinous
+chondriocont
+chondrioma
+chondriome
+chondriomere
+chondriomite
+chondriosomal
+chondriosome
+chondriosomes
+chondriosphere
+chondrite
+chondrites
+chondritic
+chondritis
+chondro-
+chondroadenoma
+chondroalbuminoid
+chondroangioma
+chondroarthritis
+chondroblast
+chondroblastoma
+chondrocarcinoma
+chondrocele
+chondroclasis
+chondroclast
+chondrocoracoid
+chondrocostal
+chondrocranial
+chondrocranium
+chondrocyte
+chondrodite
+chondroditic
+chondrodynia
+chondrodystrophia
+chondrodystrophy
+chondroendothelioma
+chondroepiphysis
+chondrofetal
+chondrofibroma
+chondrofibromatous
+Chondroganoidei
+chondrogen
+chondrogenesis
+chondrogenetic
+chondrogenous
+chondrogeny
+chondroglossal
+chondroglossus
+chondrography
+chondroid
+chondroitic
+chondroitin
+chondroitin-sulphuric
+chondrolipoma
+chondrology
+chondroma
+chondromalacia
+chondromas
+chondromata
+chondromatous
+chondromucoid
+Chondromyces
+chondromyoma
+chondromyxoma
+chondromyxosarcoma
+chondro-osseous
+chondropharyngeal
+chondropharyngeus
+chondrophore
+chondrophyte
+chondroplast
+chondroplastic
+chondroplasty
+chondroprotein
+chondropterygian
+Chondropterygii
+chondropterygious
+chondrosamine
+chondrosarcoma
+chondrosarcomas
+chondrosarcomata
+chondrosarcomatous
+chondroseptum
+chondrosin
+chondrosis
+chondroskeleton
+chondrostean
+Chondrostei
+chondrosteoma
+chondrosteous
+chondrosternal
+chondrotome
+chondrotomy
+chondroxiphoid
+chondrule
+chondrules
+chondrus
+Chong
+Chongjin
+chonicrite
+Chonju
+chonk
+chonolith
+chonta
+Chontal
+Chontalan
+Chontaquiro
+chontawood
+Choo
+choo-choo
+choochoo
+choo-chooed
+choo-chooing
+chook
+chookie
+chookies
+chooky
+choom
+Choong
+choop
+choora
+choosable
+choosableness
+choose
+chooseable
+chooser
+choosers
+chooses
+choosey
+choosier
+choosiest
+choosiness
+choosing
+choosingly
+choosy
+chop
+chopa
+chopas
+chopboat
+chop-cherry
+chop-chop
+chop-church
+chopdar
+chop-fallen
+chopfallen
+chop-house
+chophouse
+chophouses
+Chopin
+chopin
+chopine
+chopines
+chopins
+chop-logic
+choplogic
+choplogical
+chopped
+chopped-off
+chopper
+choppered
+choppers
+choppier
+choppiest
+choppily
+choppin
+choppiness
+choppinesses
+chopping
+choppy
+chops
+chop-stick
+chopstick
+Chopsticks
+chopsticks
+chop-suey
+Chopunnish
+Chor
+Chora
+choragi
+choragic
+choragion
+choragium
+choragus
+choraguses
+choragy
+Chorai
+choral
+choralcelo
+chorale
+choraleon
+chorales
+choralist
+chorally
+chorals
+Chorasmian
+chord
+chorda
+Chordaceae
+chordacentrous
+chordacentrum
+chordaceous
+chordal
+chordally
+chordamesoderm
+chordamesodermal
+chordamesodermic
+Chordata
+chordata
+chordate
+chordates
+chorded
+chordee
+Chordeiles
+chording
+chorditis
+chordoid
+chordomesoderm
+chordophone
+chordotomy
+chordotonal
+chords
+-chore
+chore
+chorea
+choreal
+choreas
+choreatic
+chored
+choree
+choregi
+choregic
+choregrapher
+choregraphic
+choregraphically
+choregraphy
+choregus
+choreguses
+choregy
+chorei
+choreic
+choreiform
+choreman
+choremen
+choreo-
+choreodrama
+choreograph
+choreographed
+choreographer
+choreographers
+choreographic
+choreographical
+choreographically
+choreographies
+choreographing
+choreographs
+choreography
+choreoid
+choreomania
+chorepiscopal
+chorepiscope
+chorepiscopus
+chores
+choreus
+choreutic
+chorgi
+chori-
+chorial
+choriamb
+choriambi
+choriambic
+choriambize
+choriambs
+choriambus
+choriambuses
+choribi
+choric
+chorically
+chorine
+chorines
+choring
+chorio
+chorioadenoma
+chorioallantoic
+chorioallantoid
+chorioallantois
+choriocapillaris
+choriocapillary
+choriocarcinoma
+choriocarcinomas
+choriocarcinomata
+choriocele
+chorioepithelioma
+chorioepitheliomas
+chorioepitheliomata
+chorioid
+chorioidal
+chorioiditis
+chorioidocyclitis
+chorioidoiritis
+chorioidoretinitis
+chorioids
+chorioma
+choriomas
+choriomata
+chorion
+chorionepithelioma
+chorionic
+chorions
+Chorioptes
+chorioptic
+chorioretinal
+chorioretinitis
+Choripetalae
+choripetalous
+choriphyllous
+chorisepalous
+chorisis
+chorism
+choriso
+chorisos
+chorist
+choristate
+chorister
+choristers
+choristership
+choristic
+choristoblastoma
+choristoma
+choristoneura
+choristry
+chorization
+chorizo
+c-horizon
+chorizont
+chorizontal
+chorizontes
+chorizontic
+chorizontist
+chorizos
+Chorley
+chorobates
+chorogi
+chorograph
+chorographer
+chorographic
+chorographical
+chorographically
+chorographies
+chorography
+choroid
+choroidal
+choroidea
+choroiditis
+choroidocyclitis
+choroidoiritis
+choroidoretinitis
+choroids
+chorological
+chorologist
+chorology
+choromania
+choromanic
+chorometry
+chorook
+Chorotega
+Choroti
+chorous
+chort
+chorten
+Chorti
+chortle
+chortled
+chortler
+chortlers
+chortles
+chortling
+chortosterol
+chorus
+chorused
+choruser
+choruses
+chorusing
+choruslike
+chorusmaster
+chorussed
+chorusses
+chorussing
+Chorwat
+Chorwon
+choryos
+Chorz
+Chorzow
+chose
+Chosen
+chosen
+choses
+chosing
+Chosn
+Chosunilbo
+Choteau
+CHOTS
+chott
+chotts
+Chou
+chou
+Chouan
+chouan
+Chouanize
+choucroute
+Choudrant
+Chouest
+chouette
+chou-fleur
+choufleur
+chough
+choughs
+chouka
+Choukoutien
+choule
+choultries
+choultry
+chounce
+choup
+choupic
+chouquette
+chous
+chouse
+choused
+chouser
+chousers
+chouses
+choush
+choushes
+chousing
+chousingha
+chout
+Chouteau
+choux
+Chow
+chow
+Chowanoc
+Chowchilla
+chow-chow
+chowchow
+chowchows
+chowder
+chowdered
+chowderhead
+chowderheaded
+chowderheadedness
+chowdering
+chowders
+chowed
+chowhound
+chowing
+chowk
+chowries
+chowry
+chows
+chowse
+chowsed
+chowses
+chowsing
+chowtime
+chowtimes
+choy
+choya
+choyaroot
+choyroot
+Chozar
+CHP
+CHQ
+Chr
+Chr.
+chrematheism
+chrematist
+chrematistic
+chrematistics
+chremsel
+chremzel
+chremzlach
+chreotechnics
+chresard
+chresards
+chresmology
+chrestomathic
+chrestomathics
+chrestomathies
+chrestomathy
+Chretien
+chria
+Chriesman
+chrimsel
+Chris
+chrism
+chrisma
+chrismal
+chrismale
+Chrisman
+chrismary
+chrismatine
+chrismation
+chrismatite
+chrismatize
+chrismatories
+chrismatory
+chrismon
+chrismons
+chrisms
+Chrisney
+chrisom
+chrisomloosing
+chrisoms
+Chrisoula
+chrisroot
+Chrissa
+Chrisse
+Chrissie
+Chrissy
+Christ
+christ
+Christa
+Christabel
+Christabella
+Christabelle
+Christadelphian
+Christadelphianism
+Christal
+Christalle
+Christan
+Christ-borne
+Christchurch
+Christ-confessing
+christ-cross
+christcross
+christ-cross-row
+christcross-row
+Christdom
+christdom
+Christean
+Christed
+christed
+Christel
+Christen
+christen
+Christendie
+Christendom
+christendom
+christened
+christener
+christeners
+christenhead
+christening
+christenings
+Christenmas
+christens
+Christensen
+Christenson
+Christ-given
+Christhood
+christhood
+Christ-hymning
+Christi
+Christiaan
+Christiad
+Christian
+christian
+Christiana
+Christiane
+Christiania
+christiania
+Christianiadeal
+Christianisation
+Christianise
+Christianised
+Christianiser
+Christianising
+Christianism
+christianism
+christianite
+Christianities
+Christianity
+christianity
+Christianization
+christianization
+Christianize
+christianize
+Christianized
+christianized
+Christianizer
+christianizes
+Christianizing
+christianizing
+Christianlike
+Christianly
+Christianna
+Christianness
+Christiano
+christiano-
+Christianogentilism
+Christianography
+Christianomastix
+Christianopaganism
+Christiano-platonic
+christians
+Christiansand
+Christiansburg
+Christiansen
+Christian-socialize
+Christianson
+Christiansted
+Christicide
+Christie
+christie
+Christies
+christies
+Christiform
+Christ-imitating
+Christin
+Christina
+Christine
+christine
+Christ-inspired
+Christis
+Christless
+christless
+Christlessness
+Christlike
+christ-like
+christlike
+Christlikeness
+Christliness
+Christly
+christly
+Christmann
+Christmas
+christmas
+Christmasberries
+Christmasberry
+christmases
+Christmasing
+Christmastide
+christmastide
+Christmastime
+Christmasy
+Christo-
+christo-
+Christocentric
+Christocentrism
+Christoff
+Christoffel
+Christoffer
+Christoforo
+Christogram
+Christolatry
+Christological
+christological
+Christologies
+Christologist
+Christology
+christology
+Christoper
+Christoph
+Christophanic
+Christophanies
+Christophany
+christophany
+Christophe
+Christopher
+christopher
+Christophorus
+Christos
+Christoval
+Christ-professing
+christs
+Christ's-thorn
+christ's-thorn
+Christ-taught
+christ-tide
+christward
+Christy
+christy
+Christye
+Christyna
+Chrisy
+chroatol
+Chrobat
+chrom-
+chroma
+chroma-blind
+chromaffin
+chromaffinic
+chromamamin
+chromammine
+chromaphil
+chromaphore
+chromas
+chromascope
+chromat-
+chromate
+chromates
+chromatic
+chromatical
+chromatically
+chromatician
+chromaticism
+chromaticity
+chromaticness
+chromatics
+chromatid
+chromatin
+chromatinic
+Chromatioideae
+chromatism
+chromatist
+Chromatium
+chromatize
+chromato-
+chromatocyte
+chromatodysopia
+chromatogenous
+chromatogram
+chromatograph
+chromatographic
+chromatographically
+chromatography
+chromatoid
+chromatologies
+chromatology
+chromatolysis
+chromatolytic
+chromatometer
+chromatone
+chromatopathia
+chromatopathic
+chromatopathy
+chromatophil
+chromatophile
+chromatophilia
+chromatophilic
+chromatophilous
+chromatophobia
+chromatophore
+chromatophoric
+chromatophorous
+chromatoplasm
+chromatopsia
+chromatoptometer
+chromatoptometry
+chromatoscope
+chromatoscopy
+chromatosis
+chromatosphere
+chromatospheric
+chromatrope
+chromaturia
+chromatype
+chromazurine
+chromdiagnosis
+-chrome
+chrome
+chromed
+Chromel
+chromene
+chrome-nickel
+chromeplate
+chromeplated
+chromeplating
+chromes
+chromesthesia
+chrome-tanned
+chrometophobia
+chromhidrosis
+chromic
+chromicize
+chromicizing
+chromid
+Chromidae
+chromide
+Chromides
+chromides
+chromidial
+Chromididae
+chromidiogamy
+chromidiosome
+chromidium
+chromidrosis
+chromiferous
+chrominance
+chroming
+chromiole
+chromism
+chromite
+chromites
+chromitite
+chromium
+chromium-plate
+chromium-plated
+chromiums
+chromize
+chromized
+chromizes
+chromizing
+Chromo
+chromo
+chromo-
+chromo-arsenate
+Chromobacterieae
+Chromobacterium
+chromoblast
+chromocenter
+chromocentral
+chromochalcographic
+chromochalcography
+chromocollograph
+chromocollographic
+chromocollography
+chromocollotype
+chromocollotypy
+chromocratic
+chromoctye
+chromocyte
+chromocytometer
+chromodermatosis
+chromodiascope
+chromogen
+chromogene
+chromogenesis
+chromogenetic
+chromogenic
+chromogenous
+chromogram
+chromograph
+chromoisomer
+chromoisomeric
+chromoisomerism
+chromoleucite
+chromolipoid
+chromolith
+chromolithic
+chromolithograph
+chromolithographer
+chromolithographic
+chromolithography
+chromolysis
+chromomere
+chromomeric
+chromometer
+chromone
+chromonema
+chromonemal
+chromonemata
+chromonematal
+chromonematic
+chromonemic
+chromoparous
+chromophage
+chromophane
+chromophil
+chromophile
+chromophilia
+chromophilic
+chromophilous
+chromophobe
+chromophobia
+chromophobic
+chromophor
+chromophore
+chromophoric
+chromophorous
+chromophotograph
+chromophotographic
+chromophotography
+chromophotolithograph
+chromophyl
+chromophyll
+chromoplasm
+chromoplasmic
+chromoplast
+chromoplastid
+chromoprotein
+chromopsia
+chromoptometer
+chromoptometrical
+chromos
+chromosantonin
+chromoscope
+chromoscopic
+chromoscopy
+chromosomal
+chromosomally
+chromosome
+chromosomes
+chromosomic
+chromosphere
+chromospheres
+chromospheric
+chromotherapist
+chromotherapy
+chromotrope
+chromotropic
+chromotropism
+chromotropy
+chromotype
+chromotypic
+chromotypographic
+chromotypography
+chromotypy
+chromous
+chromoxylograph
+chromoxylography
+chromule
+chromy
+chromyl
+chromyls
+Chron
+Chron.
+chron
+chron-
+chron.
+chronal
+chronanagram
+chronaxia
+chronaxie
+chronaxies
+chronaxy
+chroncmeter
+chronic
+chronica
+chronical
+chronically
+chronicity
+chronicle
+chronicled
+chronicler
+chroniclers
+Chronicles
+chronicles
+chronicling
+chronicon
+chronics
+chronique
+chronisotherm
+chronist
+Chronium
+chrono-
+chronobarometer
+chronobiology
+chronocarator
+chronocinematography
+chronocrator
+chronocyclegraph
+chronodeik
+chronogeneous
+chronogenesis
+chronogenetic
+chronogram
+chronogrammatic
+chronogrammatical
+chronogrammatically
+chronogrammatist
+chronogrammic
+chronograph
+chronographer
+chronographic
+chronographical
+chronographically
+chronographs
+chronography
+chronoisothermal
+chronol
+chronologer
+chronologic
+chronological
+chronologically
+chronologies
+chronologist
+chronologists
+chronologize
+chronologizing
+chronology
+chronomancy
+chronomantic
+chronomastix
+chronometer
+chronometers
+chronometric
+chronometrical
+chronometrically
+chronometry
+chronon
+chrononomy
+chronons
+chronopher
+chronophotograph
+chronophotographic
+chronophotography
+Chronos
+chronoscope
+chronoscopic
+chronoscopically
+chronoscopv
+chronoscopy
+chronosemic
+chronostichon
+chronothermal
+chronothermometer
+Chronotron
+chronotropic
+chronotropism
+Chroococcaceae
+chroococcaceous
+Chroococcales
+chroococcoid
+Chroococcus
+-chroous
+Chrosperma
+Chrotoem
+chrotta
+chry
+chrys-
+Chrysa
+chrysal
+chrysalid
+chrysalida
+chrysalidal
+chrysalides
+chrysalidian
+chrysaline
+chrysalis
+chrysalises
+chrysaloid
+chrysamine
+chrysammic
+chrysamminic
+Chrysamphora
+chrysanilin
+chrysaniline
+chrysanisic
+chrysanthemin
+chrysanthemum
+chrysanthemums
+chrysanthous
+Chrysaor
+chrysarobin
+chrysatropic
+chrysazin
+chrysazol
+Chryseis
+chryseis
+chryselectrum
+chryselephantine
+Chrysemys
+chrysene
+chrysenic
+Chryses
+chrysid
+Chrysidella
+chrysidid
+Chrysididae
+chrysin
+Chrysippus
+Chrysis
+Chrysler
+chrysler
+chryslers
+chryso-
+chrysoaristocracy
+Chrysobalanaceae
+Chrysobalanus
+chrysoberyl
+chrysobull
+chrysocale
+chrysocarpous
+chrysochlore
+Chrysochloridae
+Chrysochloris
+chrysochlorous
+chrysochrous
+chrysocolla
+chrysocracy
+chrysoeriol
+chrysogen
+chrysograph
+chrysographer
+chrysography
+chrysohermidin
+chrysoidine
+chrysolite
+chrysolitic
+chrysology
+Chrysolophus
+chrysome
+chrysomelid
+Chrysomelidae
+chrysomonad
+Chrysomonadales
+Chrysomonadina
+chrysomonadine
+Chrysomyia
+Chrysopa
+chrysopal
+chrysopee
+chrysophan
+chrysophane
+chrysophanic
+Chrysophanus
+chrysophenin
+chrysophenine
+chrysophilist
+chrysophilite
+Chrysophlyctis
+chrysophyll
+Chrysophyllum
+chrysophyte
+chrysopid
+Chrysopidae
+chrysopoeia
+chrysopoetic
+chrysopoetics
+chrysoprase
+chrysoprasus
+Chrysops
+Chrysopsis
+chrysorin
+chrysosperm
+Chrysosplenium
+Chrysostom
+chrysostomic
+Chrysostomus
+Chrysothamnus
+Chrysothemis
+chrysotherapy
+Chrysothrix
+chrysotile
+Chrysotis
+Chryssee
+Chrystal
+Chryste
+Chrystel
+chrystocrene
+chs
+chs.
+Chtaura
+chteau
+Chteauroux
+Chteau-Thierry
+chthonian
+chthonic
+Chthonius
+chthonophagia
+chthonophagy
+Chu
+Chuadanga
+Chuah
+Chualar
+chuana
+Chuanchow
+chub
+chubasco
+chubascos
+Chubb
+chubb
+chubbed
+chubbedness
+chubbier
+chubbiest
+chubbily
+chubbiness
+chubbinesses
+chubby
+chubby-faced
+chub-faced
+chubs
+chubsucker
+Chuch
+Chuchchi
+Chuchchis
+Chucho
+Chuchona
+Chuck
+chuck
+chuck-a-luck
+chuckawalla
+Chuckchi
+Chuckchis
+chucked
+chucker
+chucker-out
+chuckers-out
+Chuckey
+chuck-farthing
+chuckfarthing
+chuck-full
+chuckfull
+chuckhole
+chuckholes
+chuckie
+chuckies
+chucking
+chuckingly
+chuckle
+chuckled
+chucklehead
+chuckleheaded
+chuckleheadedness
+chuckler
+chucklers
+chuckles
+chucklesome
+chuckling
+chucklingly
+chuck-luck
+chuckram
+chuckrum
+chucks
+chuckstone
+chuckwalla
+chuck-will's-widow
+chucky
+chucky-chuck
+chucky-chucky
+Chud
+chuddah
+chuddahs
+chuddar
+chuddars
+chudder
+chudders
+Chude
+Chudic
+chuet
+Chueta
+chufa
+chufas
+chuff
+chuffed
+chuffer
+chuffest
+chuffier
+chuffiest
+chuffily
+chuffiness
+chuffing
+chuffs
+chuffy
+chug
+chug-a-lug
+chugalug
+chugalugged
+chugalugging
+chugalugs
+chug-chug
+chugged
+chugger
+chuggers
+chugging
+chughole
+Chugiak
+chugs
+Chugwater
+chuhra
+Chui
+Chuipek
+Chuje
+chukar
+chukars
+Chukchee
+Chukchees
+Chukchi
+Chukchis
+chukka
+chukkar
+chukkars
+chukkas
+chukker
+chukkers
+chukor
+Chula
+chulan
+chulha
+chullo
+chullpa
+chulpa
+chultun
+chum
+chumar
+Chumash
+Chumashan
+Chumashim
+Chumawi
+chumble
+Chumley
+chummage
+chummed
+chummer
+chummery
+chummier
+chummies
+chummiest
+chummily
+chumminess
+chumming
+chummy
+chump
+chumpa
+chumpaka
+chumped
+chumpiness
+chumping
+chumpish
+chumpishness
+Chumpivilca
+chumps
+chumpy
+chums
+chumship
+chumships
+Chumulu
+Chun
+chun
+chunam
+chunari
+Chuncho
+Chunchula
+chundari
+chunder
+chunderous
+Chung
+chung
+chunga
+Chungking
+chungking
+Chunichi
+chunk
+chunked
+chunkhead
+chunkier
+chunkiest
+chunkily
+chunkiness
+chunking
+chunks
+chunky
+Chunnel
+chunner
+chunnia
+chunter
+chuntered
+chuntering
+chunters
+chupa-chupa
+chupak
+chupatti
+chupatty
+chupon
+chuppah
+chuppahs
+chuppoth
+chuprassi
+chuprassie
+chuprassy
+Chuquicamata
+Chur
+Chura
+churada
+Church
+church
+church-ale
+churchanity
+church-chopper
+churchcraft
+churchdom
+church-door
+churched
+churches
+churchful
+church-gang
+church-garth
+churchgo
+churchgoer
+churchgoers
+churchgoing
+churchgoings
+church-government
+churchgrith
+churchianity
+churchier
+churchiest
+churchified
+Churchill
+churchill
+Churchillian
+churchiness
+churching
+churchish
+churchism
+churchite
+churchless
+churchlet
+churchlier
+churchliest
+churchlike
+churchliness
+churchly
+Churchman
+churchman
+churchmanly
+churchmanship
+churchmaster
+churchmen
+church-papist
+churchreeve
+church-scot
+churchscot
+churchshot
+church-soken
+Churchton
+Churchville
+church-ward
+churchward
+churchwarden
+churchwardenism
+churchwardenize
+churchwardens
+churchwardenship
+churchwards
+churchway
+churchwise
+churchwoman
+churchwomen
+churchy
+churchyard
+churchyards
+Churdan
+churel
+churidars
+churinga
+churingas
+churl
+churled
+churlhood
+churlier
+churliest
+churlish
+churlishly
+churlishness
+churls
+churly
+churm
+churn
+churnability
+churnable
+churn-butted
+churned
+churner
+churners
+churnful
+churning
+churnings
+churnmilk
+churns
+churnstaff
+Churoya
+Churoyan
+churr
+churrasco
+churred
+churrigueresco
+Churrigueresque
+churrigueresque
+churring
+churrip
+churro
+churr-owl
+churrs
+churruck
+churrus
+churr-worm
+churrworm
+Churubusco
+chuse
+chuser
+chusite
+chut
+Chute
+chute
+chuted
+chuter
+chutes
+chute-the-chute
+chute-the-chutes
+chuting
+chutist
+chutists
+chutnee
+chutnees
+chutney
+chutneys
+chuttie
+chutzpa
+chutzpadik
+chutzpah
+chutzpahs
+chutzpanik
+chutzpas
+Chuu
+chuumnapm
+Chuvash
+chuvashes
+Chuvashi
+chuzwi
+Chwana
+Chwang-tse
+chwas
+chyack
+chyak
+chyazic
+chylaceous
+chylangioma
+chylaqueous
+chyle
+chylemia
+chyles
+chylidrosis
+chylifaction
+chylifactive
+chylifactory
+chyliferous
+chylific
+chylification
+chylificatory
+chylified
+chyliform
+chylify
+chylifying
+chylo-
+chylocaulous
+chylocaulously
+chylocauly
+chylocele
+chylocyst
+chyloid
+chylomicron
+chylopericardium
+chylophyllous
+chylophyllously
+chylophylly
+chylopoetic
+chylopoiesis
+chylopoietic
+chylosis
+chylothorax
+chylous
+chyluria
+chym-
+chymaqueous
+chymase
+chyme
+chymes
+chymia
+chymic
+chymics
+chymiferous
+chymification
+chymified
+chymify
+chymifying
+chymist
+chymistry
+chymists
+chymo-
+chymosin
+chymosinogen
+chymosins
+chymotrypsin
+chymotrypsinogen
+chymous
+chyometer
+Chyou
+chypre
+chytra
+chytrid
+Chytridiaceae
+chytridiaceous
+chytridial
+Chytridiales
+chytridiose
+chytridiosis
+Chytridium
+Chytroi
+C.I.
+CI
+Ci
+ci-
+CIA
+Cia
+cia
+CIAC
+Ciales
+Ciampino
+Cianca
+Ciano
+ciao
+Ciapas
+Ciapha
+Ciaphus
+Ciardi
+CIB
+cibaria
+cibarial
+cibarian
+cibaries
+cibarious
+cibarium
+cibation
+cibbaria
+Cibber
+cibboria
+Cibis
+cibol
+Cibola
+Cibolan
+cibolero
+Cibolo
+cibols
+Ciboney
+cibophobia
+cibophobiafood
+ciboria
+ciborium
+cibory
+ciboule
+ciboules
+CIC
+CICA
+cicad
+cicada
+cicadae
+cicadas
+Cicadellidae
+cicadid
+Cicadidae
+cicala
+cicalas
+cicale
+cicatrice
+cicatrices
+cicatricial
+cicatricle
+cicatricose
+cicatricula
+cicatriculae
+cicatricule
+cicatrisant
+cicatrisate
+cicatrisation
+cicatrise
+cicatrised
+cicatriser
+cicatrising
+cicatrisive
+cicatrix
+cicatrixes
+cicatrizant
+cicatrizate
+cicatrization
+cicatrize
+cicatrized
+cicatrizer
+cicatrizing
+cicatrose
+Ciccia
+cicelies
+Cicely
+cicely
+Cicenia
+cicer
+Cicero
+cicero
+ciceronage
+cicerone
+cicerones
+ciceroni
+Ciceronian
+ciceronian
+Ciceronianism
+ciceronianism
+ciceronianisms
+ciceronianist
+ciceronianists
+Ciceronianize
+ciceronians
+Ciceronic
+Ciceronically
+ciceroning
+ciceronism
+ciceronize
+ciceros
+cichar
+cichlid
+Cichlidae
+cichlidae
+cichlids
+cichloid
+Cichocki
+cichoraceous
+Cichoriaceae
+cichoriaceous
+Cichorium
+cich-pea
+Cichus
+Cicily
+Cicindela
+cicindelid
+cicindelidae
+cicisbei
+cicisbeism
+cicisbeo
+ciclatoun
+Ciclo
+cicone
+Cicones
+Ciconia
+Ciconiae
+ciconian
+Ciconians
+ciconiform
+ciconiid
+Ciconiidae
+ciconiiform
+Ciconiiformes
+ciconine
+ciconioid
+cicoree
+cicorees
+cicrumspections
+CICS
+CICSVS
+cicurate
+Cicuta
+cicuta
+cicutoxin
+CID
+Cid
+cid
+Cida
+-cidal
+cidarid
+Cidaridae
+cidaris
+Cidaroida
+-cide
+cider
+ciderish
+ciderist
+ciderkin
+ciderlike
+ciders
+ci-devant
+CIDIN
+Cidney
+Cidra
+CIE
+Cie
+cie
+Ciel
+cienaga
+cienega
+Cienfuegos
+cierge
+cierzo
+cierzos
+CIF
+cif
+cig
+cigala
+cigale
+cigar
+cigaresque
+cigaret
+cigarets
+cigarette
+cigarettes
+cigarette-smoker
+cigarfish
+cigar-flower
+cigarillo
+cigarillos
+cigarito
+cigaritos
+cigarless
+cigar-loving
+cigars
+cigar-shaped
+cigar-smoker
+CIGS
+cigua
+ciguatera
+CII
+Ciitroen
+Cila
+cilantro
+cilantros
+cilectomy
+cilery
+cilia
+ciliary
+Ciliata
+ciliata
+ciliate
+ciliated
+ciliate-leaved
+ciliately
+ciliates
+ciliate-toothed
+ciliation
+cilice
+cilices
+Cilicia
+Cilician
+cilicious
+Cilicism
+cilicism
+ciliectomy
+ciliella
+ciliferous
+ciliform
+ciliiferous
+ciliiform
+ciliium
+Cilioflagellata
+cilioflagellate
+ciliograde
+ciliola
+ciliolate
+ciliolum
+Ciliophora
+cilioretinal
+cilioscleral
+ciliospinal
+ciliotomy
+Cilissa
+cilium
+Cilix
+Cilka
+cill
+Cilla
+cillosis
+Cillus
+Cilo
+cilo-spinal
+Cilurzo
+CIM
+CIMA
+Cima
+cima
+Cimabue
+Cimah
+cimaise
+cimaroon
+Cimarosa
+Cimarron
+cimbal
+cimbalom
+cimbaloms
+cimbia
+cimborio
+Cimbri
+Cimbrian
+Cimbric
+Cimbura
+cimcumvention
+cimelia
+cimeliarch
+cimelium
+cimeter
+cimex
+cimices
+cimicid
+Cimicidae
+cimicide
+cimiciform
+Cimicifuga
+cimicifugin
+cimicoid
+cimier
+ciminite
+cimline
+cimmaron
+Cimmeria
+Cimmerian
+cimmerian
+Cimmerianism
+Cimmerium
+cimnel
+cimolite
+Cimon
+C-in-C
+cinch
+cincha
+cinched
+cincher
+cinches
+cinching
+cincholoipon
+cincholoiponic
+cinchomeronic
+Cinchona
+cinchona
+Cinchonaceae
+cinchonaceous
+cinchonamin
+cinchonamine
+cinchonas
+cinchonate
+Cinchonero
+cinchonia
+cinchonic
+cinchonicin
+cinchonicine
+cinchonidia
+cinchonidine
+cinchonin
+cinchonine
+cinchoninic
+cinchonisation
+cinchonise
+cinchonised
+cinchonising
+cinchonism
+cinchonization
+cinchonize
+cinchonized
+cinchonizing
+cinchonology
+cinchophen
+cinchotine
+cinchotoxine
+cincinatti
+cincinnal
+Cincinnati
+cincinnati
+Cincinnatia
+Cincinnatian
+Cincinnatus
+cincinni
+cincinnus
+Cinclidae
+cinclides
+Cinclidotus
+cinclis
+Cinclus
+cinct
+cincture
+cinctured
+cinctures
+cincturing
+Cinda
+Cindee
+Cindelyn
+cinder
+cindered
+Cinderella
+cinderella
+cindering
+cinderlike
+cinderman
+cinderous
+cinders
+cindery
+Cindi
+Cindie
+Cindra
+Cindy
+Cindylou
+cine
+cine-
+cineangiocardiographic
+cineangiocardiography
+cineangiographic
+cineangiography
+cineast
+cineaste
+cineastes
+cineasts
+Cinebar
+cinecamera
+cinefaction
+cinefilm
+cinel
+Cinelli
+cinema
+cinemactic
+cinemagoer
+cinemagoers
+cinemas
+CinemaScope
+Cinemascope
+CinemaScopic
+cinematheque
+cinematheques
+cinematic
+cinematical
+cinematically
+cinematics
+cinematize
+cinematized
+cinematizing
+cinematograph
+cinematographer
+cinematographers
+cinematographic
+cinematographical
+cinematographically
+cinematographies
+cinematographist
+cinematography
+cinemelodrama
+cinemese
+cinemize
+cinemograph
+cinenchym
+cinenchyma
+cinenchymatous
+cinene
+cinenegative
+cineol
+cineole
+cineoles
+cineolic
+cineols
+cinephone
+cinephotomicrography
+cineplastics
+cineplasty
+cineraceous
+cineradiography
+Cinerama
+cinerama
+cinerararia
+Cineraria
+cineraria
+cinerarias
+cinerarium
+cinerary
+cineration
+cinerator
+cinerea
+cinereal
+cinereous
+cinerin
+cinerins
+cineritious
+cinerous
+cines
+cinevariety
+Cingalese
+cingalese
+cingle
+cingula
+cingular
+cingulate
+cingulated
+cingulectomies
+cingulectomy
+cingulum
+Cini
+ciniphes
+Cinna
+cinnabar
+cinnabaric
+cinnabarine
+cinnabars
+cinnamal
+cinnamaldehyde
+cinnamate
+cinnamein
+cinnamene
+cinnamenyl
+cinnamic
+Cinnamodendron
+cinnamol
+cinnamomic
+Cinnamomum
+Cinnamon
+cinnamon
+cinnamoned
+cinnamonic
+cinnamonlike
+cinnamonroot
+cinnamons
+cinnamonwood
+cinnamoyl
+cinnamyl
+cinnamylidene
+cinnamyls
+cinnolin
+cinnoline
+cinnyl
+cinofoil
+cinquain
+cinquains
+cinquanter
+cinque
+cinquecentism
+cinquecentist
+cinquecento
+cinquedea
+cinquefoil
+cinquefoiled
+cinquefoils
+cinquepace
+cinques
+cinque-spotted
+cinter
+cintre
+Cinura
+cinuran
+cinurous
+Cinyras
+Cinzano
+C.I.O.
+CIO
+Cioban
+Cioffred
+cion
+cionectomy
+cionitis
+cionocranial
+cionocranian
+cionoptosis
+cionorrhaphia
+cionotome
+cionotomy
+cions
+cioppino
+cioppinos
+CIP
+Cipango
+cipaye
+cipher
+cipherable
+cipherdom
+ciphered
+cipherer
+cipherhood
+ciphering
+ciphers
+ciphertext
+ciphertexts
+ciphonies
+ciphony
+cipo
+cipolin
+cipolins
+cipollino
+cippi
+cippus
+Ciprian
+Cipus
+cir
+cir.
+circ
+CIRCA
+circa
+circadian
+Circaea
+Circaeaceae
+Circaean
+Circaetus
+circar
+Circassia
+Circassian
+circassian
+Circassic
+Circe
+circe
+Circean
+Circensian
+circensian
+circinal
+circinate
+circinately
+circination
+Circini
+Circinus
+circinus
+circiter
+circle
+circle-branching
+circled
+circle-in
+circle-out
+circler
+circlers
+circles
+circle-shearing
+circle-squaring
+circlet
+circleting
+circlets
+Circleville
+circle-wise
+circlewise
+circline
+circling
+circling-in
+circling-out
+Circlorama
+circocele
+Circosta
+circovarian
+circs
+circue
+circuit
+circuitable
+circuital
+circuited
+circuiteer
+circuiter
+circuities
+circuiting
+circuition
+circuitman
+circuitmen
+circuitor
+circuitous
+circuitously
+circuitousness
+circuit-riding
+circuitries
+circuitry
+circuits
+circuituously
+circuity
+circulable
+circulant
+circular
+circular-cut
+circularisation
+circularise
+circularised
+circulariser
+circularising
+circularism
+circularities
+circularity
+circularization
+circularizations
+circularize
+circularized
+circularizer
+circularizers
+circularizes
+circularizing
+circular-knit
+circularly
+circularness
+circulars
+circularwise
+circulatable
+circulate
+circulated
+circulates
+circulating
+circulation
+circulations
+circulative
+circulator
+circulatories
+circulators
+circulatory
+circule
+circulet
+circuli
+circulin
+circulus
+circum
+circum-
+circumaction
+circumadjacent
+circumagitate
+circumagitation
+circumambages
+circumambagious
+circumambience
+circumambiencies
+circumambiency
+circumambient
+circumambiently
+circumambulate
+circumambulated
+circumambulates
+circumambulating
+circumambulation
+circumambulations
+circumambulator
+circumambulatory
+circumanal
+circumantarctic
+circumarctic
+Circum-arean
+circumarticular
+circumaviate
+circumaviation
+circumaviator
+circumaxial
+circumaxile
+circumaxillary
+circumbasal
+circumbendibus
+circumbendibuses
+circumboreal
+circumbuccal
+circumbulbar
+circumcallosal
+Circumcellion
+circumcellion
+circumcenter
+circumcentral
+circumcinct
+circumcincture
+circumcircle
+circumcise
+circumcised
+circumciser
+circumcises
+circumcising
+circumcision
+circumcisions
+circumcission
+circumclude
+circumclusion
+circumcolumnar
+circumcone
+circumconic
+circumcorneal
+circumcrescence
+circumcrescent
+Circum-cytherean
+circumdate
+circumdenudation
+circumdiction
+circumduce
+circumducing
+circumduct
+circumducted
+circumduction
+circumesophagal
+circumesophageal
+circumfer
+circumference
+circumferences
+circumferent
+circumferential
+circumferentially
+circumferentor
+circumflant
+circumflect
+circumflex
+circumflexes
+circumflexion
+circumfluence
+circumfluent
+circumfluous
+circumforaneous
+circumfulgent
+circumfuse
+circumfused
+circumfusile
+circumfusing
+circumfusion
+circumgenital
+circumgestation
+circumgyrate
+circumgyration
+circumgyratory
+circumhorizontal
+circumincession
+circuminsession
+circuminsular
+circumintestinal
+circumitineration
+circumjacence
+circumjacencies
+circumjacency
+circumjacent
+Circum-jovial
+circumjovial
+circumlental
+circumlitio
+circumlittoral
+circumlocute
+circumlocution
+circumlocutional
+circumlocutionary
+circumlocutionist
+circumlocutions
+circumlocutory
+circumlunar
+Circum-mercurial
+circum-meridian
+circummeridian
+circummeridional
+circummigrate
+circummigration
+circummundane
+circummure
+circummured
+circummuring
+circumnatant
+circumnavigable
+circumnavigate
+circumnavigated
+circumnavigates
+circumnavigating
+circumnavigation
+circumnavigations
+circumnavigator
+circumnavigatory
+Circum-neptunian
+circumneutral
+circumnuclear
+circumnutate
+circumnutated
+circumnutating
+circumnutation
+circumnutatory
+circumocular
+circumoesophagal
+circumoral
+circumorbital
+circumpacific
+circumpallial
+circumparallelogram
+circumpentagon
+circumplanetary
+circumplect
+circumplicate
+circumplication
+circumpolar
+circumpolygon
+circumpose
+circumposition
+circumquaque
+circumradii
+circumradius
+circumradiuses
+circumrenal
+circumrotate
+circumrotated
+circumrotating
+circumrotation
+circumrotatory
+circumsail
+Circum-saturnal
+Circum-saturnian
+circumsaturnian
+circumsciss
+circumscissile
+circumscribable
+circumscribe
+circumscribed
+circumscriber
+circumscribes
+circumscribing
+circumscript
+circumscription
+circumscriptions
+circumscriptive
+circumscriptively
+circumscriptly
+circumscrive
+circumsession
+circumsinous
+circumsolar
+circumspangle
+circumspatial
+circumspect
+circumspection
+circumspections
+circumspective
+circumspectively
+circumspectly
+circumspectness
+circumspheral
+circumsphere
+circumstance
+circumstanced
+circumstances
+circumstancing
+circumstant
+circumstantiability
+circumstantiable
+circumstantial
+circumstantialities
+circumstantiality
+circumstantially
+circumstantialness
+circumstantiate
+circumstantiated
+circumstantiates
+circumstantiating
+circumstantiation
+circumstantiations
+circumstellar
+circumtabular
+circumterraneous
+circumterrestrial
+circumtonsillar
+circumtropical
+circumumbilical
+circumundulate
+circumundulation
+Circum-uranian
+circumvallate
+circumvallated
+circumvallating
+circumvallation
+circumvascular
+circumvent
+circumventable
+circumvented
+circumventer
+circumventing
+circumvention
+circumventions
+circumventive
+circumventor
+circumvents
+circumvest
+circumviate
+circumvoisin
+circumvolant
+circumvolute
+circumvolution
+circumvolutory
+circumvolve
+circumvolved
+circumvolving
+circumzenithal
+circus
+circuses
+circusy
+circut
+circuted
+circuting
+circuts
+cire
+Cirenaica
+Cirencester
+cire-perdue
+cires
+Ciri
+Cirilla
+Cirillo
+Cirilo
+cirl
+cirmcumferential
+Ciro
+Cirone
+cirque
+cirque-couchant
+cirques
+cirr-
+cirrate
+cirrated
+Cirratulidae
+Cirratulus
+cirrh-
+Cirrhopetalum
+cirrhopod
+cirrhose
+cirrhosed
+cirrhoses
+cirrhosis
+cirrhotic
+cirrhous
+cirrhus
+Cirri
+cirri
+cirribranch
+cirriferous
+cirriform
+cirrigerous
+cirrigrade
+cirriped
+cirripede
+Cirripedia
+cirripedial
+cirripeds
+CIRRIS
+cirro-
+cirro-cumular
+cirrocumular
+cirro-cumulative
+cirrocumulative
+cirro-cumulous
+cirrocumulous
+cirro-cumulus
+cirrocumulus
+cirro-fillum
+cirro-filum
+cirrolite
+cirro-macula
+cirro-nebula
+cirropodous
+cirrose
+cirrosely
+cirro-stome
+cirrostome
+Cirrostomi
+cirro-strative
+cirrostrative
+cirro-stratous
+cirro-stratus
+cirrostratus
+cirrous
+cirro-velum
+cirrus
+cirsectomies
+cirsectomy
+Cirsium
+cirsocele
+cirsoid
+cirsomphalos
+cirsophthalmia
+cirsotome
+cirsotomies
+cirsotomy
+cirterion
+ciruela
+cirurgian
+ciruses
+CIS
+Cis
+cis
+cis-
+Cisalpine
+cisalpine
+Cisalpinism
+cisandine
+cisatlantic
+CISC
+Ciscaucasia
+Cisco
+cisco
+ciscoes
+ciscos
+cise
+ciseaux
+cisele
+ciseleur
+ciseleurs
+cis-Elizabethan
+ciselure
+ciselures
+cis-elysian
+cisgangetic
+cising
+cisium
+cisjurane
+Ciskei
+cisleithan
+cislunar
+cismarine
+Cismontane
+cismontane
+Cismontanism
+Cisne
+cisoceanic
+cispadane
+cisplatine
+cispontine
+Cis-reformation
+cisrhenane
+Cissaea
+Cissampelos
+Cissie
+Cissiee
+cissies
+cissing
+cissoid
+cissoidal
+cissoids
+Cissus
+Cissy
+cissy
+cist
+cista
+Cistaceae
+cistaceous
+cistae
+cisted
+Cistercian
+cistercian
+Cistercianism
+cistern
+cisterna
+cisternae
+cisternal
+cisterns
+cistic
+cistophori
+cistophoric
+cistophorus
+cistori
+cis-trans
+cistron
+cistronic
+cistrons
+cists
+Cistudo
+Cistus
+cistus
+cistuses
+cistvaen
+Ciszek
+CIT
+cit
+cit.
+Cita
+citable
+citadel
+citadels
+cital
+Citarella
+Citation
+citation
+citational
+citations
+citator
+citators
+citatory
+citatum
+cite
+citeable
+cited
+citee
+Citellus
+citer
+citers
+cites
+citess
+Cithaeron
+Cithaeronian
+cithara
+citharas
+Citharexylum
+citharist
+citharista
+citharoedi
+citharoedic
+citharoedus
+cither
+cithern
+citherns
+cithers
+cithren
+cithrens
+citicism
+citicorp
+citied
+cities
+citification
+citified
+citifies
+citify
+citifying
+Citigradae
+citigrade
+citing
+citizen
+citizendom
+citizeness
+citizenhood
+citizenish
+citizenism
+citizenize
+citizenized
+citizenizing
+citizenly
+citizenries
+citizenry
+citizens
+citizenship
+citizenships
+Citlaltepetl
+Citlaltpetl
+citola
+citolas
+citole
+citoler
+citolers
+citoles
+citoyen
+citoyenne
+citoyens
+citr-
+Citra
+citra-
+citraconate
+citraconic
+citral
+citrals
+citramide
+citramontane
+citrange
+citrangeade
+citrate
+citrated
+citrates
+citrean
+citrene
+citreous
+citric
+citriculture
+citriculturist
+citril
+citrin
+citrination
+citrine
+citrines
+citrinin
+citrinins
+citrinous
+citrins
+citrocola
+Citroen
+citrometer
+Citromyces
+Citron
+citron
+citronade
+citronalis
+citron-colored
+citronella
+citronellal
+Citronelle
+citronelle
+citronellic
+citronellol
+citronin
+citronize
+citrons
+citronwood
+citron-yellow
+Citropsis
+citropten
+citrous
+citrul
+citrullin
+citrulline
+Citrullus
+Citrus
+citrus
+citruses
+citrylidene
+cittern
+citternhead
+citterns
+Cittticano
+citua
+City
+city
+city-born
+city-bound
+city-bred
+citybuster
+citycism
+city-commonwealth
+citydom
+cityfied
+cityfolk
+cityful
+city-god
+cityish
+cityless
+citylike
+cityness
+citynesses
+cityscape
+cityscapes
+city-state
+cityward
+citywards
+city-wide
+citywide
+CIU
+Ciudad
+ciudad
+civ
+civ.
+cive
+civet
+civet-cat
+civetlike
+civetone
+civets
+Civia
+civic
+civical
+civically
+civicism
+civicisms
+civic-minded
+civic-mindedly
+civic-mindedness
+civics
+civie
+civies
+civil
+civile
+civiler
+civilest
+civilian
+civilianization
+civilianize
+civilians
+civilisable
+civilisation
+civilisational
+civilisations
+civilisatory
+civilise
+civilised
+civilisedness
+civiliser
+civilises
+civilising
+civilist
+civilite
+civilities
+civility
+civilizable
+civilizade
+civilization
+civilizational
+civilizationally
+civilizations
+civilizatory
+civilize
+civilized
+civilizedness
+civilizee
+civilizer
+civilizers
+civilizes
+civilizing
+civil-law
+civilly
+civilness
+civil-rights
+civism
+civisms
+Civitan
+civitas
+civite
+civory
+civvies
+civvy
+civy
+ciwies
+cixiid
+Cixiidae
+Cixo
+cizar
+cize
+CJ
+ck
+ckw
+C/L
+CL
+Cl
+cl
+cl.
+clabber
+clabbered
+clabbering
+clabbers
+clabbery
+clablaria
+Clabo
+clabularia
+clabularium
+clach
+clachan
+clachans
+clachs
+clack
+Clackama
+Clackamas
+clackdish
+clacked
+clacker
+clackers
+clacket
+clackety
+clacking
+Clackmannan
+Clackmannanshire
+clacks
+Clacton
+Clactonian
+clactonian
+clad
+cladanthous
+cladautoicous
+cladding
+claddings
+clade
+cladine
+cladistic
+clado-
+cladocarpous
+Cladocera
+cladoceran
+cladocerans
+cladocerous
+cladode
+cladodes
+cladodial
+cladodium
+cladodont
+cladodontid
+Cladodontidae
+Cladodus
+cladogenesis
+cladogenetic
+cladogenetically
+cladogenous
+Cladonia
+Cladoniaceae
+cladoniaceous
+cladonioid
+Cladophora
+cladophora
+Cladophoraceae
+cladophoraceous
+Cladophorales
+cladophyll
+cladophyllum
+cladoptosis
+cladose
+Cladoselache
+Cladoselachea
+cladoselachian
+Cladoselachidae
+cladosiphonic
+Cladosporium
+Cladothrix
+Cladrastis
+clads
+cladus
+claes
+Claflin
+clag
+clagged
+clagging
+claggum
+claggy
+clags
+Claiborn
+Claiborne
+Claibornian
+claik
+claim
+claimable
+claimant
+claimants
+claimed
+claimer
+claimers
+claiming
+claim-jumper
+claim-jumping
+claimless
+claims
+claimsman
+claimsmen
+Clair
+clair
+clairaudience
+clairaudient
+clairaudiently
+Clairaut
+clairce
+Claire
+claire
+clairecole
+clairecolle
+claires
+Clairfield
+clair-obscure
+clairschach
+clairschacher
+clairseach
+clairseacher
+clairsentience
+clairsentient
+Clairton
+clairvoyance
+clairvoyances
+clairvoyancies
+clairvoyancy
+clairvoyant
+clairvoyantly
+clairvoyants
+claith
+claithes
+claiver
+clake
+Clallam
+clam
+Claman
+clamant
+clamantly
+clamaroo
+clamation
+clamative
+Clamatores
+clamatorial
+clamatory
+clamb
+clambake
+clambakes
+clamber
+clambered
+clamberer
+clambering
+clambers
+clamcracker
+clame
+clamehewit
+clamer
+clamflat
+clamjamfery
+clamjamfry
+clamjamphrie
+clamlike
+clammed
+clammer
+clammers
+clammersome
+clammier
+clammiest
+clammily
+clamminess
+clamminesses
+clamming
+clammish
+clammy
+clammyweed
+clamor
+clamored
+clamorer
+clamorers
+clamoring
+clamorist
+clamorous
+clamorously
+clamorousness
+clamors
+clamorsome
+clamour
+clamoured
+clamourer
+clamouring
+clamourist
+clamourous
+clamours
+clamoursome
+clamp
+clampdown
+clamped
+clamper
+clampers
+clamping
+clamps
+clams
+clamshell
+clamshells
+clamworm
+clamworms
+clan
+Clance
+clancular
+clancularly
+Clancy
+clandestine
+clandestinely
+clandestineness
+clandestinity
+clanfellow
+clang
+clanged
+clanger
+clangers
+clangful
+clanging
+clangingly
+clangor
+clangored
+clangoring
+clangorous
+clangorously
+clangorousness
+clangors
+clangour
+clangoured
+clangouring
+clangours
+clangs
+Clangula
+clanjamfray
+clanjamfrey
+clanjamfrie
+clanjamphrey
+clank
+clanked
+clankety
+clanking
+clankingly
+clankingness
+clankless
+clanks
+clankum
+clanless
+clanned
+clanning
+clannish
+clannishly
+clannishness
+clannishnesses
+clans
+clansfolk
+clanship
+clansman
+clansmanship
+clansmen
+clanswoman
+clanswomen
+Clanton
+Claosaurus
+clap
+clapboard
+clapboarding
+clapboards
+clapbread
+clapcake
+clapdish
+clape
+Clapeyron
+clapholt
+clapmatch
+clapnest
+clap-net
+clapnet
+clapotis
+Clapp
+clappe
+clapped
+Clapper
+clapper
+clapperboard
+clapper-claw
+clapperclaw
+clapperclawer
+clapperdudgeon
+clappered
+clappering
+clappermaclaw
+clappers
+clapping
+claps
+clap-stick
+clapstick
+clapt
+Clapton
+claptrap
+claptraps
+clapwort
+claque
+claquer
+claquers
+claques
+claqueur
+claqueurs
+clar
+Clara
+clarabella
+Clarabelle
+clarain
+Claramae
+Clarance
+Clarcona
+Clardy
+Clare
+clare
+Claremont
+Claremore
+Clarence
+clarence
+clarences
+Clarenceux
+clarenceux
+Clarenceuxship
+Clarencieux
+Clarendon
+clarendon
+clare-obscure
+clares
+Claresta
+claret
+Clareta
+Claretian
+claretian
+clarets
+Claretta
+Clarette
+Clarey
+Clarhe
+Clari
+Claribel
+claribel
+claribella
+Clarice
+clarichord
+Clarie
+claries
+clarifiable
+clarifiant
+clarificant
+clarification
+clarifications
+clarified
+clarifier
+clarifiers
+clarifies
+clarify
+clarifying
+clarigate
+clarigation
+clarigold
+clarin
+clarina
+Clarinda
+Clarine
+clarine
+clarinet
+clarinetist
+clarinetists
+clarinets
+clarinettist
+clarinettists
+Clarington
+clarini
+clarino
+clarinos
+Clarion
+clarion
+clarioned
+clarionet
+clarioning
+clarions
+clarion-voiced
+Clarisa
+Clarise
+Clarissa
+Clarisse
+clarissimo
+Clarist
+Clarita
+clarities
+claritude
+clarity
+Clark
+clark
+Clarkdale
+Clarke
+clarke
+Clarkedale
+clarkeite
+clarkeites
+Clarkesville
+Clarkfield
+Clarkia
+clarkia
+clarkias
+Clarkin
+Clarks
+Clarksboro
+Clarksburg
+Clarksdale
+Clarkson
+Clarkston
+Clarksville
+clarksville
+Clarkton
+claro
+claroes
+Claromontane
+Claromontanus
+claros
+clarre
+clarsach
+clarseach
+clarsech
+clarseth
+clarshech
+clart
+clartier
+clartiest
+clarts
+clarty
+Clary
+clary
+Claryville
+-clase
+clash
+clashed
+clashee
+clasher
+clashers
+clashes
+clashing
+clashingly
+clashy
+clasmatocyte
+clasmatocytic
+clasmatosis
+CLASP
+clasp
+clasped
+clasper
+claspers
+clasping
+clasping-leaved
+clasps
+claspt
+CLASS
+class
+class.
+classable
+classbook
+class-cleavage
+class-conscious
+classed
+classer
+classers
+classes
+classfellow
+classic
+classical
+classicalism
+classicalist
+classicalities
+classicality
+classicalize
+classically
+classicalness
+classicise
+classicised
+classicising
+classicism
+classicisms
+classicist
+classicistic
+classicists
+classicize
+classicized
+classicizing
+classico
+classico-
+classicolatry
+classico-lombardic
+classics
+classier
+classiest
+classifiable
+classific
+classifically
+classification
+classificational
+classifications
+classificator
+classificatory
+classified
+classifier
+classifiers
+classifies
+classify
+classifying
+classily
+classiness
+classing
+classis
+classism
+classisms
+classist
+classists
+classless
+classlessness
+classman
+classmanship
+classmate
+classmates
+classmen
+classroom
+classrooms
+classwise
+classwork
+classy
+clast
+clastic
+clastics
+clasts
+clat
+clatch
+clatchy
+Clathraceae
+clathraceous
+Clathraria
+clathrarian
+clathrate
+Clathrina
+Clathrinidae
+clathroid
+clathrose
+clathrulate
+Clathrus
+Clatonia
+Clatskanie
+Clatsop
+clatter
+clattered
+clatterer
+clattering
+clatteringly
+clatters
+clattertrap
+clattertraps
+clattery
+clatty
+clauber
+claucht
+Claud
+Clauddetta
+Claude
+Claudel
+Claudell
+Claudelle
+claudent
+claudetite
+claudetites
+Claudetta
+Claudette
+Claudia
+Claudian
+Claudianus
+claudicant
+claudicate
+claudication
+Claudie
+Claudina
+Claudine
+Claudio
+Claudius
+claudius
+Claudville
+Claudy
+claught
+claughted
+claughting
+claughts
+Claunch
+Claus
+claus
+clausal
+clause
+Clausen
+clauses
+Clausewitz
+Clausilia
+Clausiliidae
+Clausius
+clauster
+clausthalite
+claustra
+claustral
+claustration
+claustrophilia
+claustrophobe
+claustrophobia
+claustrophobiac
+claustrophobias
+claustrophobic
+claustrum
+clausula
+clausulae
+clausular
+clausule
+clausum
+clausure
+claut
+Clava
+clava
+clavacin
+clavae
+claval
+Clavaria
+Clavariaceae
+clavariaceous
+clavate
+clavated
+clavately
+clavatin
+clavation
+clave
+clavecin
+clavecinist
+clavel
+clavelization
+clavelize
+clavellate
+clavellated
+claver
+Claverack
+clavered
+clavering
+clavers
+claves
+clavi
+clavial
+claviature
+clavicembali
+clavicembalist
+clavicembalo
+Claviceps
+clavichord
+clavichordist
+clavichordists
+clavichords
+clavicithern
+clavicittern
+clavicle
+clavicles
+clavicor
+clavicorn
+clavicornate
+Clavicornes
+Clavicornia
+clavicotomy
+clavicular
+clavicularium
+claviculate
+claviculo-humeral
+claviculus
+clavicylinder
+clavicymbal
+clavicytheria
+clavicytherium
+clavicythetheria
+clavier
+clavierist
+clavieristic
+clavierists
+claviers
+claviform
+claviger
+clavigerous
+claviharp
+clavilux
+claviol
+claviole
+clavipectoral
+clavis
+clavises
+Clavius
+clavodeltoid
+clavodeltoideus
+clavola
+clavolae
+clavolet
+clavus
+clavuvi
+clavy
+claw
+clawback
+clawed
+clawer
+clawers
+claw-footed
+clawhammer
+clawing
+clawk
+clawker
+clawless
+clawlike
+claws
+clawsick
+Clawson
+claw-tailed
+claxon
+claxons
+Claxton
+Clay
+clay
+claybank
+claybanks
+Clayberg
+Clayborn
+Clayborne
+clay-bound
+Claybourne
+claybrained
+clay-built
+clay-cold
+clay-colored
+clay-digging
+clay-dimmed
+clay-drying
+claye
+clayed
+clayen
+clayer
+clayey
+clay-faced
+clay-filtering
+clay-forming
+clay-grinding
+Clayhole
+clayier
+clayiest
+clayiness
+claying
+clayish
+claylike
+clay-lined
+clayman
+clay-mixing
+Claymont
+claymore
+claymores
+Clayoquot
+claypan
+claypans
+Claypool
+clays
+Claysburg
+Clayson
+claystone
+Claysville
+clay-tempering
+Clayton
+Claytonia
+claytonia
+Claytonville
+clayver-grass
+Clayville
+clayware
+claywares
+clay-washing
+clayweed
+clay-wrapped
+CLDN
+-cle
+Clea
+cleach
+clead
+cleaded
+cleading
+cleam
+cleamer
+clean
+clean-
+cleanable
+clean-appearing
+clean-armed
+clean-boled
+clean-bred
+clean-built
+clean-complexioned
+clean-cut
+cleaned
+cleaner
+cleaner-off
+cleaner-out
+cleaners
+cleaner-up
+cleanest
+clean-faced
+clean-feeding
+clean-fingered
+clean-grained
+clean-handed
+cleanhanded
+cleanhandedness
+cleanhearted
+cleaning
+cleanings
+cleanish
+clean-legged
+cleanlier
+cleanliest
+cleanlily
+clean-limbed
+cleanliness
+cleanlinesses
+clean-lived
+clean-living
+clean-looking
+cleanly
+clean-made
+clean-minded
+clean-moving
+cleanness
+cleannesses
+cleanout
+cleans
+cleansable
+clean-sailing
+clean-saying
+cleanse
+cleansed
+clean-seeming
+cleanser
+cleansers
+cleanses
+clean-shanked
+clean-shaped
+clean-shaved
+clean-shaven
+cleansing
+clean-skin
+cleanskin
+clean-skinned
+cleanskins
+clean-smelling
+clean-souled
+clean-speaking
+clean-sweeping
+Cleanth
+Cleantha
+Cleanthes
+clean-thinking
+clean-timbered
+cleanup
+cleanups
+clean-washed
+clear
+clearable
+clearage
+clearance
+clearances
+clear-boled
+Clearbrook
+Clearchus
+clear-cole
+clearcole
+clear-complexioned
+clear-crested
+clear-cut
+clear-cutness
+clear-cutting
+cleared
+clearedness
+clearer
+clearers
+clearest
+clear-eye
+clear-eyed
+clear-eyes
+clear-faced
+clear-featured
+Clearfield
+clear-headed
+clearheaded
+clearheadedly
+clearheadedness
+clearhearted
+clearing
+clearinghouse
+clearinghouses
+clearings
+clearish
+clearly
+clear-minded
+clearminded
+clear-mindedness
+Clearmont
+clearness
+clearnesses
+clear-obscure
+clears
+clear-sighted
+clearsighted
+clear-sightedly
+clear-sightedness
+clearsightedness
+Clearsite
+clear-skinned
+clearskins
+clear-spirited
+clear-starch
+clearstarch
+clear-starcher
+clearstarcher
+clear-stemmed
+clearstoried
+clearstories
+clear-story
+clearstory
+clear-sunned
+clear-throated
+clear-tinted
+clear-toned
+clear-up
+Clearview
+Clearville
+clear-visioned
+clear-voiced
+clear-walled
+Clearwater
+clearwater
+clearway
+clearweed
+clearwing
+clear-witted
+Cleary
+Cleasta
+cleat
+cleated
+cleating
+Cleaton
+cleats
+cleavability
+cleavable
+cleavage
+cleavages
+Cleave
+cleave
+cleaved
+cleaveful
+cleavelandite
+cleaver
+cleavers
+cleaverwort
+Cleaves
+cleaves
+cleaving
+cleavingly
+Cleavland
+Cleburne
+cleche
+clechee
+clechy
+cleck
+cled
+cledde
+cledge
+cledgy
+cledonism
+clee
+cleech
+cleek
+cleeked
+cleeking
+cleeks
+cleeky
+Cleelum
+Cleethorpes
+CLEF
+clef
+clefs
+cleft
+clefted
+cleft-footed
+cleft-graft
+clefting
+clefts
+cleg
+Cleghorn
+CLEI
+cleidagra
+cleidarthritis
+cleidocostal
+cleidocranial
+cleidohyoid
+cleidoic
+cleidomancy
+cleido-mastoid
+cleidomastoid
+cleido-occipital
+cleidorrhexis
+cleidoscapular
+cleidosternal
+cleidotomy
+cleidotripsy
+Clein
+Cleisthenes
+cleistocarp
+cleistocarpous
+cleistogamic
+cleistogamically
+cleistogamous
+cleistogamously
+cleistogamy
+cleistogene
+cleistogenous
+cleistogeny
+cleistotcia
+cleistothecia
+cleistothecium
+Cleistothecopsis
+cleithral
+cleithrum
+Clela
+Cleland
+Clellan
+Clem
+clem
+Clematis
+clematis
+clematises
+clematite
+Clemclemalats
+Clemen
+Clemence
+clemence
+Clemenceau
+clemencies
+Clemency
+clemency
+Clemens
+Clement
+clement
+Clementas
+Clemente
+Clementi
+Clementia
+Clementina
+Clementine
+clementine
+Clementis
+Clementius
+clemently
+clementness
+Clementon
+Clements
+clements
+clemmed
+Clemmie
+clemming
+Clemmons
+Clemmy
+Clemon
+Clemons
+Clemson
+clench
+clench-built
+clenched
+clencher
+clenchers
+clenches
+clenching
+Clendenin
+Cleo
+Cleobis
+Cleobulus
+Cleodaeus
+Cleodal
+Cleodel
+Cleodell
+cleoid
+Cleome
+cleome
+cleomes
+Cleon
+Cleone
+Cleopatra
+cleopatra
+Cleopatre
+Cleostratus
+Cleota
+Cleothera
+clep
+clepe
+cleped
+clepes
+cleping
+Clepsine
+clepsydra
+clepsydrae
+clepsydras
+clept
+cleptobioses
+cleptobiosis
+cleptobiotic
+cleptomania
+cleptomaniac
+Clerc
+Clercq
+Clere
+Cleres
+clerestoried
+clerestories
+clerestory
+clerete
+clergess
+clergies
+clergion
+clergy
+clergyable
+clergylike
+clergyman
+clergymen
+clergywoman
+clergywomen
+cleric
+clerical
+clericalism
+clericalist
+clericalists
+clericality
+clericalize
+clerically
+clericals
+clericate
+clericature
+clericism
+clericity
+clerico-
+clerico-political
+clerics
+clericum
+clerid
+Cleridae
+clerids
+clerihew
+clerihews
+clerisies
+Clerissa
+clerisy
+Clerk
+clerk
+clerkage
+clerk-ale
+clerkdom
+clerkdoms
+clerked
+clerkery
+clerkess
+clerkhood
+clerking
+clerkish
+clerkless
+clerklier
+clerkliest
+clerklike
+clerkliness
+clerkly
+clerks
+clerkship
+clerkships
+Clermont
+Clermont-Ferrand
+clernly
+clero-
+Clerodendron
+cleromancy
+cleronomy
+clerstory
+cleruch
+cleruchial
+cleruchic
+cleruchies
+cleruchy
+clerum
+Clerus
+Clervaux
+Cleta
+cletch
+Clete
+Clethra
+clethra
+Clethraceae
+clethraceous
+clethrionomys
+Cleti
+Cletis
+Cletus
+cleuch
+cleuk
+cleuks
+Cleva
+Cleve
+cleve
+cleveite
+cleveites
+Cleveland
+cleveland
+Clevenger
+clever
+cleverality
+clever-clever
+Cleverdale
+cleverer
+cleverest
+clever-handed
+cleverish
+cleverishly
+cleverly
+cleverness
+clevernesses
+Cleves
+Clevey
+Clevie
+clevis
+clevises
+clew
+clewed
+clewgarnet
+clewing
+Clewiston
+clews
+CLI
+cli
+cliack
+clianthus
+clich
+cliche
+cliched
+cliche-ridden
+cliches
+Clichy
+Clichy-la-Garenne
+click
+click-clack
+clicked
+clicker
+clickers
+clicket
+clickety-clack
+clickety-click
+clicking
+clickless
+clicks
+clicky
+CLID
+Clidastes
+Clide
+Clie
+cliency
+client
+clientage
+cliental
+cliented
+clientelage
+clientele
+clienteles
+clientless
+clientry
+clients
+clientship
+Cliff
+cliff
+cliff-bound
+cliff-chafed
+cliffed
+Cliffes
+cliff-girdled
+cliffhang
+cliff-hanger
+cliffhanger
+cliffhangers
+cliff-hanging
+cliffhanging
+cliffier
+cliffiest
+cliffing
+cliffless
+clifflet
+clifflike
+cliff-marked
+Clifford
+cliffs
+cliffside
+cliffsman
+cliffweed
+Cliffwood
+cliff-worn
+cliffy
+Clift
+clift
+Clifton
+Cliftonia
+cliftonite
+clifts
+Clifty
+clifty
+Clim
+clima
+Climaciaceae
+climaciaceous
+Climacium
+climacter
+climacterial
+climacteric
+climacterical
+climacterically
+climacterics
+climactery
+climactic
+climactical
+climactically
+climacus
+climant
+climata
+climatal
+climatarchic
+climate
+climates
+climath
+climatic
+climatical
+climatically
+Climatius
+climatize
+climatographical
+climatography
+climatologic
+climatological
+climatologically
+climatologist
+climatologists
+climatology
+climatometer
+climatotherapeutics
+climatotherapies
+climatotherapy
+climature
+climax
+climaxed
+climaxes
+climaxing
+climb
+climbable
+climb-down
+climbed
+climber
+climbers
+climbing
+climbingfish
+climbingfishes
+climbs
+clime
+climes
+climograph
+clin
+clin-
+clinah
+-clinal
+clinal
+clinally
+clinamen
+clinamina
+clinandrdria
+clinandria
+clinandrium
+clinanthia
+clinanthium
+clinch
+clinch-built
+Clinchco
+clinched
+clincher
+clincher-built
+clinchers
+clinches
+Clinchfield
+clinching
+clinchingly
+clinchingness
+clinchpoop
+-cline
+Cline
+cline
+clines
+cling
+Clingan
+clinged
+clinger
+clingers
+clingfish
+clingfishes
+clingier
+clingiest
+clinginess
+clinging
+clingingly
+clingingness
+cling-rascal
+clings
+clingstone
+clingstones
+clingy
+clinia
+-clinic
+clinic
+clinical
+clinically
+clinician
+clinicians
+clinicist
+clinicopathologic
+clinicopathological
+clinicopathologically
+clinics
+clinid
+Clinis
+clinium
+clink
+clinkant
+clink-clank
+clinked
+clinker
+clinker-built
+clinkered
+clinkerer
+clinkering
+clinkers
+clinkery
+clinkety-clink
+clinking
+clinks
+clinkstone
+clinkum
+clino-
+clinoaxis
+clinocephalic
+clinocephalism
+clinocephalous
+clinocephalus
+clinocephaly
+clinochlore
+clinoclase
+clinoclasite
+clinodiagonal
+clinodomatic
+clinodome
+clinograph
+clinographic
+clinohedral
+clinohedrite
+clinohumite
+clinoid
+clinologic
+clinology
+clinometer
+clinometria
+clinometric
+clinometrical
+clinometry
+clinophobia
+clinopinacoid
+clinopinacoidal
+Clinopodium
+clinoprism
+clinopyramid
+clinopyroxene
+clinorhombic
+clinospore
+clinostat
+-clinous
+clinquant
+Clint
+clint
+clinting
+Clintock
+Clinton
+Clintondale
+Clintonia
+clintonia
+clintonite
+Clintonville
+clints
+Clintwood
+clinty
+Clio
+clio
+Cliona
+Clione
+clip
+clipboard
+clipboards
+clip-clop
+clip-edged
+clipei
+clipeus
+clip-fed
+clip-marked
+clip-on
+clippable
+Clippard
+clipped
+clipper
+clipper-built
+clipperman
+clippers
+clippety-clop
+clippie
+clipping
+clippingly
+clippings
+clips
+clipse
+clipsheet
+clipsheets
+clipsome
+clipt
+clip-winged
+clique
+cliqued
+cliquedom
+cliqueier
+cliqueiest
+cliqueless
+cliques
+cliquey
+cliqueyness
+cliquier
+cliquiest
+cliquing
+cliquish
+cliquishly
+cliquishness
+cliquism
+cliquy
+cliseometer
+clisere
+clish-clash
+clish-ma-claver
+clishmaclaver
+Clisiocampa
+Clisthenes
+clistocarp
+clistocarpous
+Clistogastra
+clistothcia
+clistothecia
+clistothecium
+clit
+clitch
+Clite
+clite
+clitella
+clitellar
+clitelliferous
+clitelline
+clitellum
+clitellus
+clites
+clithe
+Clitherall
+clithral
+clithridiate
+clitia
+clitic
+clition
+Clitocybe
+clitoral
+Clitoria
+clitoric
+clitoridauxe
+clitoridean
+clitoridectomies
+clitoridectomy
+clitoriditis
+clitoridotomy
+clitoris
+clitorises
+clitorism
+clitoritis
+clitoromania
+clitoromaniac
+clitoromaniacal
+clitter
+clitterclatter
+Clitus
+cliv
+clival
+Clive
+clive
+cliver
+clivers
+Clivia
+clivia
+clivias
+clivis
+clivises
+clivus
+clk
+CLLI
+Cllr
+CLNP
+Clo
+clo
+cloaca
+cloacae
+cloacal
+cloacaline
+cloacas
+cloacean
+cloacinal
+cloacinean
+cloacitis
+cloak
+cloakage
+cloak-and-dagger
+cloak-and-suiter
+cloak-and-sword
+cloaked
+cloakedly
+cloak-fashion
+cloaking
+cloakless
+cloaklet
+cloakmaker
+cloakmaking
+cloak-room
+cloakroom
+cloakrooms
+cloaks
+cloakwise
+cloam
+cloamen
+cloamer
+Cloanthus
+clobber
+clobbered
+clobberer
+clobbering
+clobbers
+clochan
+clochard
+clochards
+cloche
+clocher
+cloches
+clochette
+clock
+clockbird
+clockcase
+clocked
+clocker
+clockers
+clockface
+clock-hour
+clockhouse
+clocking
+clockings
+clockkeeper
+clockless
+clocklike
+clockmaker
+clock-making
+clockmaking
+clock-minded
+clockmutch
+clockroom
+clocks
+clocksmith
+Clockville
+clock-watcher
+clockwatcher
+clock-watching
+clockwise
+clock-work
+clockwork
+clockworked
+clockworks
+clod
+clodbreaker
+clod-brown
+clodded
+clodder
+cloddier
+cloddiest
+cloddily
+cloddiness
+clodding
+cloddish
+cloddishly
+cloddishness
+cloddy
+clodhead
+clod-hopper
+clodhopper
+clodhopperish
+clodhoppers
+clodhopping
+clodknocker
+clodlet
+clodlike
+clod-pate
+clodpate
+clodpated
+clodpates
+clodpole
+clodpoles
+clod-poll
+clodpoll
+clodpolls
+clods
+clod-tongued
+Cloe
+Cloelia
+cloes
+Cloete
+clof
+cloff
+clofibrate
+clog
+clogdogdo
+clogged
+clogger
+cloggier
+cloggiest
+cloggily
+clogginess
+clogging
+cloggy
+cloghad
+cloghaun
+cloghead
+cloglike
+clogmaker
+clogmaking
+clogs
+clogwheel
+clogwood
+clogwyn
+cloine
+cloiochoanitic
+Clois
+cloison
+cloisonless
+cloisonn
+cloisonne
+cloisonnism
+Cloisonnisme
+Cloisonnist
+cloister
+cloisteral
+cloistered
+cloisterer
+cloistering
+cloisterless
+cloisterlike
+cloisterliness
+cloisterly
+cloisters
+cloisterwise
+cloistral
+cloistress
+cloit
+cloke
+clokies
+cloky
+clomb
+clomben
+clomiphene
+clomp
+clomped
+clomping
+clomps
+clon
+clonal
+clonally
+clone
+cloned
+cloner
+cloners
+clones
+clong
+clonic
+clonicity
+clonicotonic
+cloning
+clonings
+clonism
+clonisms
+clonk
+clonked
+clonking
+clonks
+clonorchiasis
+Clonorchis
+clonos
+Clonothrix
+clons
+Clontarf
+clonus
+clonuses
+cloof
+cloop
+cloot
+clootie
+Cloots
+cloots
+clop
+clop-clop
+clopped
+clopping
+clops
+Clopton
+cloque
+cloques
+Cloquet
+cloragen
+clorargyrite
+clorinator
+Clorinda
+Clorinde
+cloriodid
+Cloris
+Clorox
+CLOS
+clos
+closable
+Close
+close
+closeable
+close-annealed
+close-at-hand
+close-banded
+close-barred
+close-bitten
+close-bodied
+close-bred
+close-buttoned
+close-by
+close-clad
+close-clapped
+close-clipped
+close-coifed
+close-compacted
+close-connected
+close-couched
+close-coupled
+close-cropped
+closecross
+close-curled
+close-curtained
+close-cut
+closed
+closed-circuit
+closed-coil
+closed-door
+closed-end
+closed-in
+closed-minded
+closed-out
+closedown
+close-drawn
+close-eared
+close-fertilization
+close-fertilize
+close-fibered
+close-fights
+close-fisted
+closefisted
+closefistedly
+closefistedness
+close-fitting
+closefitting
+close-gleaning
+close-grain
+close-grained
+close-grated
+close-handed
+closehanded
+close-haul
+close-hauled
+closehauled
+close-headed
+closehearted
+close-herd
+close-hooded
+close-in
+close-jointed
+close-kept
+close-knit
+close-latticed
+close-legged
+close-lipped
+closelipped
+closely
+close-lying
+close-meshed
+close-minded
+closemouth
+close-mouthed
+closemouthed
+closen
+closeness
+closenesses
+close-out
+closeout
+closeouts
+close-packed
+close-partnered
+close-pent
+close-piled
+close-pressed
+closer
+close-reef
+close-reefed
+close-ribbed
+close-rounded
+closers
+closes
+close-set
+close-shanked
+close-shaven
+close-shut
+close-soled
+closest
+close-standing
+close-sticking
+close-stool
+closestool
+closet
+closeted
+close-tempered
+close-textured
+closetful
+close-thinking
+closeting
+close-tongued
+closets
+close-up
+closeup
+closeups
+close-visaged
+close-winded
+closewing
+close-woven
+close-written
+closh
+closing
+closings
+closish
+closkey
+closky
+Closplint
+Closter
+closter
+Closterium
+clostridia
+clostridial
+clostridian
+Clostridium
+clostridium
+closure
+closured
+closures
+closuring
+clot
+clot-bird
+clot-bur
+clotbur
+clote
+cloth
+cloth-backed
+clothbound
+cloth-calendering
+cloth-covered
+cloth-cropping
+cloth-cutting
+cloth-drying
+cloth-dyeing
+clothe
+cloth-eared
+clothed
+clothes
+clothesbag
+clothesbasket
+clothesbrush
+clothes-conscious
+clothes-consciousness
+clothes-drier
+clothes-drying
+clotheshorse
+clotheshorses
+clothesless
+clothesline
+clotheslines
+clothesman
+clothesmen
+clothesmonger
+clothes-peg
+clothespin
+clothespins
+clothes-press
+clothespress
+clothespresses
+clothes-washing
+clothesyard
+cloth-faced
+cloth-finishing
+cloth-folding
+clothier
+clothiers
+clothify
+Clothilda
+Clothilde
+clothing
+clothings
+cloth-inserted
+cloth-laying
+clothlike
+cloth-lined
+cloth-maker
+clothmaker
+clothmaking
+cloth-measuring
+Clotho
+clotho
+cloth-of-gold
+cloths
+cloth-shearing
+cloth-shrinking
+cloth-smoothing
+cloth-sponger
+cloth-spreading
+cloth-stamping
+cloth-testing
+cloth-weaving
+cloth-winding
+clothworker
+clothy
+cloth-yard
+Clotilda
+Clotilde
+clot-poll
+clots
+clottage
+clotted
+clottedness
+clotter
+clotting
+clotty
+cloture
+clotured
+clotures
+cloturing
+clotweed
+clou
+CLOUD
+cloud
+cloudage
+cloud-ascending
+cloud-barred
+cloudberries
+cloudberry
+cloud-born
+cloud-built
+cloudburst
+cloudbursts
+cloudcap
+cloud-capped
+cloud-compacted
+cloud-compeller
+cloud-compelling
+cloud-covered
+cloud-crammed
+Cloudcroft
+cloud-crossed
+Cloud-cuckoo-land
+Cloudcuckooland
+cloud-cuckoo-land
+cloud-curtained
+cloud-dispelling
+cloud-dividing
+cloud-drowned
+cloud-eclipsed
+clouded
+cloud-enveloped
+cloud-flecked
+cloudful
+cloud-girt
+cloud-headed
+cloud-hidden
+cloudier
+cloudiest
+cloudily
+cloudiness
+cloudinesses
+clouding
+cloud-kissing
+cloud-laden
+cloudland
+cloud-led
+cloudless
+cloudlessly
+cloudlessness
+cloudlet
+cloudlets
+cloudlike
+cloudling
+cloudology
+cloud-piercing
+cloud-rocked
+Clouds
+clouds
+cloud-scaling
+cloudscape
+cloud-seeding
+cloud-shaped
+cloudship
+cloud-surmounting
+cloud-surrounded
+cloud-topped
+cloud-touching
+cloudward
+cloudwards
+cloud-woven
+cloud-wrapped
+cloudy
+clouee
+Clouet
+Clough
+clough
+Clougher
+cloughs
+clour
+cloured
+clouring
+clours
+clout
+clouted
+clouter
+clouterly
+clouters
+Cloutierville
+clouting
+Cloutman
+clouts
+clout-shoe
+clouty
+Clova
+Clovah
+clove
+clove-gillyflower
+cloven
+clovene
+cloven-footed
+cloven-footedness
+cloven-hoofed
+Clover
+clover
+Cloverdale
+clovered
+clover-grass
+cloverlay
+cloverleaf
+cloverleafs
+cloverleaves
+cloverley
+cloveroot
+Cloverport
+cloverroot
+clovers
+clover-sick
+clover-sickness
+clovery
+cloves
+clove-strip
+clovewort
+Clovis
+clow
+clowder
+clowders
+Clower
+clower
+clow-gilofre
+clown
+clownade
+clownage
+clowned
+clowneries
+clownery
+clownheal
+clowning
+clownish
+clownishly
+clownishness
+clownishnesses
+clowns
+clownship
+clowre
+clowring
+cloxacillin
+cloy
+cloyed
+cloyedness
+cloyer
+cloying
+cloyingly
+cloyingness
+cloyless
+cloyment
+cloyne
+cloys
+cloysome
+cloze
+clozes
+CLR
+clr
+CLRC
+CLS
+CLTP
+CLU
+club
+clubability
+clubable
+club-armed
+Clubb
+clubbability
+clubbable
+clubbed
+clubber
+clubbers
+clubbier
+clubbiest
+clubbily
+clubbiness
+clubbing
+clubbish
+clubbishness
+clubbism
+clubbist
+clubby
+clubdom
+club-ended
+clubfeet
+clubfellow
+club-fist
+clubfist
+clubfisted
+club-foot
+clubfoot
+club-footed
+clubfooted
+clubhand
+clubhands
+club-haul
+clubhaul
+clubhauled
+clubhauling
+clubhauls
+club-headed
+club-high
+clubhouse
+clubhouses
+clubionid
+Clubionidae
+clubland
+club-law
+club-man
+clubman
+clubmate
+clubmen
+clubmobile
+clubmonger
+club-moss
+clubridden
+club-riser
+clubroom
+clubrooms
+clubroot
+clubroots
+club-rush
+clubs
+club-shaped
+clubstart
+clubster
+clubweed
+clubwoman
+clubwomen
+clubwood
+cluck
+clucked
+clucking
+clucks
+clucky
+cludder
+clue
+clued
+clueing
+clueless
+clues
+cluff
+cluing
+Cluj
+clum
+clumber
+clumbers
+clump
+clumped
+clumper
+clumpier
+clumpiest
+clumping
+clumpish
+clumpishness
+clumplike
+clumproot
+clumps
+clumpst
+clumpy
+clumse
+clumsier
+clumsiest
+clumsily
+clumsiness
+clumsinesses
+clumsy
+clumsy-fisted
+clunch
+Clune
+clung
+Cluniac
+cluniac
+Cluniacensian
+Clunisian
+Clunist
+clunk
+clunked
+clunker
+clunkers
+clunkier
+clunking
+clunks
+clunky
+clunter
+Cluny
+clupanodonic
+Clupea
+clupeid
+Clupeidae
+clupeids
+clupeiform
+clupein
+clupeine
+clupeiod
+Clupeodei
+clupeoid
+clupeoids
+clupien
+cluppe
+cluricaune
+Clurman
+Clusia
+Clusiaceae
+clusiaceous
+Clusium
+cluster
+clusterberry
+clustered
+clusterfist
+clustering
+clusteringly
+clusterings
+clusters
+clustery
+CLUT
+clutch
+clutched
+clutcher
+clutches
+clutching
+clutchingly
+clutchman
+clutchy
+Clute
+cluther
+Clutier
+clutter
+cluttered
+clutterer
+cluttering
+clutterment
+clutters
+cluttery
+CLV
+Clwyd
+Cly
+cly
+Clyde
+Clydebank
+Clydesdale
+clydesdale
+Clydeside
+Clydesider
+clyer
+clyers
+clyfaker
+clyfaking
+Clyman
+Clymene
+Clymenia
+Clymenus
+Clymer
+Clynes
+Clyo
+clype
+clypeal
+Clypeaster
+clypeaster
+Clypeastridea
+Clypeastrina
+clypeastroid
+Clypeastroida
+Clypeastroidea
+clypeate
+clypeated
+clypei
+clypeiform
+clypeo-
+clypeola
+clypeolar
+clypeolate
+clypeole
+clypeus
+clyses
+clysis
+clysma
+clysmian
+clysmic
+clyssus
+clyster
+clysterize
+clysters
+Clytaemnesra
+Clyte
+Clytemnestra
+clytemnestra
+Clytia
+Clytie
+Clytius
+Clyve
+Clywd
+CM
+Cm
+c.m.
+c/m
+cm
+CMA
+CMAC
+CMC
+CMCC
+CMD
+cmd
+CMDF
+cmdg
+Cmdr
+Cmdr.
+cmdr
+CMDS
+CMF
+C.M.G.
+CMG
+CM-glass
+CMH
+CMI
+CMIP
+CMIS
+CMISE
+c-mitosis
+CML
+cml
+cml.
+CMMU
+Cmon
+CMOS
+CMOT
+CMRR
+CMS
+CMSGT
+CMT
+CMTC
+CMU
+CMW
+CMYK
+C/N
+CN
+cn-
+CNA
+CNAA
+CNAB
+CNC
+CNCC
+CND
+cnemapophysis
+cnemial
+cnemic
+cnemides
+cnemidium
+Cnemidophorus
+cnemis
+Cneoraceae
+cneoraceous
+Cneorum
+CNES
+CNI
+cnibophore
+cnicin
+Cnicus
+cnida
+cnidae
+Cnidaria
+cnidarian
+Cnidean
+Cnidia
+Cnidian
+cnidoblast
+cnidocell
+cnidocil
+cnidocyst
+cnidogenous
+cnidophobia
+cnidophore
+cnidophorous
+cnidopod
+cnidosac
+Cnidoscolus
+cnidosis
+Cnidus
+CNM
+CNMS
+CNN
+CNO
+Cnossian
+Cnossus
+C-note
+CNR
+CNS
+CNSR
+Cnut
+C.O.
+C/O
+C/o
+CO
+Co
+Co.
+c/o
+co
+co-
+coabode
+coabound
+coabsume
+coacceptor
+coacervate
+coacervated
+coacervating
+coacervation
+coach
+coachability
+coachable
+coach-and-four
+coach-box
+coachbuilder
+coachbuilding
+coach-built
+coached
+coachee
+Coachella
+coacher
+coachers
+coaches
+coachfellow
+coachful
+coaching
+coachlet
+coachmaker
+coachmaking
+coachman
+coachmanship
+coachmaster
+coachmen
+coachs
+coachsmith
+coachsmithing
+coachway
+coach-whip
+coachwhip
+coachwise
+coachwoman
+coachwood
+coachwork
+coachwright
+coachy
+coact
+coacted
+coacting
+coaction
+coactions
+coactive
+coactively
+coactivity
+coactor
+coactors
+coacts
+Coad
+coadamite
+coadapt
+co-adaptation
+coadaptation
+coadaptations
+coadapted
+coadapting
+coadequate
+coadjacence
+coadjacency
+coadjacent
+coadjacently
+coadjudicator
+coadjument
+co-adjust
+coadjust
+coadjustment
+coadjutant
+coadjutator
+coadjute
+coadjutement
+coadjutive
+coadjutor
+coadjutors
+coadjutorship
+coadjutress
+coadjutrice
+coadjutrices
+coadjutrix
+coadjuvancy
+coadjuvant
+coadjuvate
+coadminister
+coadministration
+coadministrator
+coadministratrix
+coadmiration
+coadmire
+coadmired
+coadmires
+coadmiring
+coadmit
+coadmits
+coadmitted
+coadmitting
+coadnate
+coadore
+coadsorbent
+coadunate
+coadunated
+coadunating
+coadunation
+coadunative
+coadunatively
+coadunite
+co-adventure
+coadventure
+coadventured
+coadventurer
+coadventuress
+coadventuring
+coadvice
+Coady
+coae-
+coaeval
+coaevals
+coaffirmation
+co-afforest
+coafforest
+coaged
+coagel
+coagencies
+co-agency
+coagency
+coagent
+coagents
+coaggregate
+coaggregated
+coaggregation
+coagitate
+coagitator
+coagment
+coagmentation
+coagonize
+coagriculturist
+coagula
+coagulability
+coagulable
+coagulant
+coagulants
+coagulase
+coagulate
+coagulated
+coagulates
+coagulating
+coagulation
+coagulations
+coagulative
+coagulator
+coagulators
+coagulatory
+coagule
+coagulin
+coaguline
+coagulometer
+coagulose
+coagulum
+coagulums
+Coahoma
+Coahuila
+Coahuiltecan
+coaid
+coaita
+coak
+coakum
+coal
+coala
+coalas
+coalbag
+coalbagger
+coal-bearing
+coalbin
+coalbins
+coal-black
+coal-blue
+coal-boring
+coalbox
+coalboxes
+coal-breaking
+coal-burning
+coal-cutting
+Coaldale
+coal-dark
+coaldealer
+coal-dumping
+coaled
+coal-elevating
+coaler
+coalers
+coalesce
+coalesced
+coalescence
+coalescency
+coalescent
+coalesces
+coalescing
+coal-eyed
+coalface
+coal-faced
+Coalfield
+coalfield
+coalfields
+coal-fired
+coal-fish
+coalfish
+coalfishes
+coalfitter
+coal-gas
+Coalgood
+coal-handling
+coalheugh
+coalhole
+coalholes
+coal-house
+coalier
+coaliest
+coalification
+coalified
+coalifies
+coalify
+coalifying
+Coaling
+coaling
+Coalinga
+Coalisland
+Coalite
+coalite
+coalition
+coalitional
+coalitioner
+coalitionist
+coalitions
+coalize
+coalized
+coalizer
+coalizing
+coal-laden
+coalless
+coal-leveling
+co-allied
+coal-loading
+co-ally
+coal-man
+coal-measure
+coal-meter
+coalmonger
+Coalmont
+coalmouse
+coal-picking
+coal-pit
+coalpit
+coalpits
+Coalport
+coal-producing
+coal-pulverizing
+coalrake
+coals
+Coalsack
+coal-sack
+coalsack
+coalsacks
+coal-scuttle
+coalshed
+coalsheds
+coal-sifting
+coal-stone
+coal-tar
+coalternate
+coalternation
+coalternative
+coal-tester
+coal-tit
+coaltitude
+Coalton
+Coalville
+coal-whipper
+coal-whipping
+Coalwood
+coal-works
+coaly
+coalyard
+coalyards
+COAM
+coambassador
+coambulant
+coamiable
+coaming
+coamings
+Coamo
+Coan
+Coanda
+coanimate
+coannex
+coannexed
+coannexes
+coannexing
+coannihilate
+coapostate
+coapparition
+co-appear
+coappear
+coappearance
+coappeared
+coappearing
+coappears
+coappellee
+coapprehend
+coapprentice
+coappriser
+coapprover
+coapt
+coaptate
+coaptation
+coapted
+coapting
+coapts
+co-aration
+coaration
+coarb
+coarbiter
+coarbitrator
+coarct
+coarctate
+coarctation
+coarcted
+coarcting
+coardent
+coarrange
+coarrangement
+coarse
+coarse-featured
+coarse-fibered
+Coarsegold
+coarse-grained
+coarse-grainedness
+coarse-haired
+coarse-handed
+coarse-lipped
+coarsely
+coarse-minded
+coarsen
+coarsened
+coarseness
+coarsenesses
+coarsening
+coarsens
+coarser
+coarse-skinned
+coarse-spoken
+coarse-spun
+coarsest
+coarse-textured
+coarse-tongued
+coarse-toothed
+coarse-wrought
+coarsish
+coart
+coarticulate
+coarticulation
+coascend
+coassert
+coasserter
+coassession
+co-assessor
+coassessor
+coassignee
+co-assist
+coassist
+coassistance
+coassistant
+coassisted
+coassisting
+coassists
+coassume
+coassumed
+coassumes
+coassuming
+coast
+coastal
+coastally
+coasted
+coaster
+coasters
+coast-fishing
+Coastguard
+coastguard
+coastguardman
+coastguardsman
+coastguardsmen
+coasting
+coastings
+coastland
+coastline
+coastlines
+coastman
+coastmen
+coasts
+coastside
+coastwaiter
+coastward
+coastwards
+coastways
+coastwise
+coat
+coat-armour
+Coatbridge
+coat-card
+coatdress
+coated
+coatee
+coatees
+coater
+coaters
+Coates
+Coatesville
+coathangers
+coati
+coatie
+coati-mondi
+coatimondie
+coati-mundi
+coatimundi
+coating
+coatings
+coation
+coatis
+coatless
+coat-money
+coatrack
+coatracks
+coatroom
+coatrooms
+Coats
+coats
+Coatsburg
+Coatsville
+Coatsworth
+coat-tail
+coattail
+coattailed
+coattails
+coattend
+coattended
+coattending
+coattends
+co-attest
+coattest
+coattestation
+coattestator
+coattested
+coattesting
+coattests
+coaudience
+coauditor
+coaugment
+coauthered
+coauthor
+coauthored
+coauthoring
+coauthority
+coauthors
+coauthorship
+coauthorships
+coawareness
+co-ax
+coax
+coaxal
+coaxation
+coaxed
+coaxer
+coaxers
+coaxes
+coaxial
+coaxially
+coaxing
+coaxingly
+coaxy
+coazervate
+coazervation
+COB
+Cob
+cob
+cobaea
+cobalamin
+cobalamine
+cobalt
+cobaltamine
+cobaltammine
+cobalti-
+cobaltic
+cobalticyanic
+cobalticyanides
+cobaltiferous
+cobaltine
+cobaltinitrite
+cobaltite
+cobalto-
+cobaltocyanic
+cobaltocyanide
+cobaltous
+cobalts
+Coban
+cobang
+Cobb
+cobb
+cobbed
+cobber
+cobberer
+cobbers
+Cobbett
+Cobbie
+cobbier
+cobbiest
+cobbin
+cobbing
+cobble
+cobbled
+cobbler
+cobblerfish
+cobblerism
+cobblerless
+cobblers
+cobblership
+cobblery
+cobbles
+cobble-stone
+cobblestone
+cobblestoned
+cobblestones
+cobbling
+cobbly
+cobbra
+cobbs
+Cobbtown
+Cobby
+cobby
+cobcab
+Cobden
+Cobdenism
+cobdenism
+Cobdenite
+COBE
+cobego
+cobelief
+cobeliever
+cobelligerent
+Coben
+cobenignity
+coberger
+cobewail
+Cobh
+Cobham
+cobhead
+cobhouse
+cobia
+cobias
+cob-iron
+cobiron
+co-bishop
+cobishop
+Cobitidae
+Cobitis
+coble
+cobleman
+Coblentzian
+Coblenz
+cobles
+Cobleskill
+cobless
+cobloaf
+cob-nut
+cobnut
+cobnuts
+COBOL
+Cobol
+cobol
+cobola
+coboss
+coboundless
+cobourg
+Cobra
+cobra
+cobra-hooded
+cobras
+cobreathe
+cobridgehead
+cobriform
+co-brother
+cobrother
+cobs
+cobstone
+cob-swan
+Coburg
+coburg
+coburgess
+coburgher
+coburghership
+Coburn
+Cobus
+cobweb
+cobwebbed
+cobwebbery
+cobwebbier
+cobwebbiest
+cobwebbing
+cobwebby
+cobwebs
+cobwork
+COC
+coca
+cocaceous
+Coca-Cola
+cocaigne
+cocain
+cocaine
+cocaines
+cocainisation
+cocainise
+cocainised
+cocainising
+cocainism
+cocainist
+cocainization
+cocainize
+cocainized
+cocainizing
+cocainomania
+cocainomaniac
+cocains
+Cocalus
+Cocama
+Cocamama
+cocamine
+Cocanucos
+cocao
+cocaptain
+cocaptains
+cocarboxylase
+cocarde
+cocas
+cocash
+cocashweed
+cocause
+cocautioner
+Coccaceae
+coccaceous
+coccagee
+coccal
+Cocceian
+cocceian
+Cocceianism
+coccerin
+cocci
+coccic
+coccid
+Coccidae
+coccidia
+coccidial
+coccidian
+Coccidiidea
+coccidioidal
+Coccidioides
+coccidioidomycosis
+Coccidiomorpha
+coccidiosis
+coccidium
+coccidology
+coccids
+cocciferous
+cocciform
+coccigenic
+coccin
+coccinella
+coccinellid
+Coccinellidae
+coccineous
+coccionella
+cocco
+coccobaccilli
+coccobacilli
+coccobacillus
+coccochromatic
+Coccogonales
+coccogone
+Coccogoneae
+coccogonium
+coccoid
+coccoidal
+coccoids
+coccolite
+coccolith
+coccolithophorid
+Coccolithophoridae
+Coccoloba
+Coccolobis
+Coccomyces
+coccosphere
+coccostean
+coccosteid
+Coccosteidae
+Coccosteus
+Coccothraustes
+coccothraustine
+Coccothrinax
+coccous
+coccule
+cocculiferous
+Cocculus
+cocculus
+-coccus
+coccus
+coccy-
+coccydynia
+coccygalgia
+coccygeal
+coccygean
+coccygectomy
+coccygeo-anal
+coccygeo-mesenteric
+coccygerector
+coccyges
+coccygeus
+coccygine
+Coccygius
+coccygo-
+coccygodynia
+coccygomorph
+Coccygomorphae
+coccygomorphic
+coccygotomy
+coccyodynia
+coccyx
+coccyxes
+Coccyzus
+cocentric
+coch
+Cochabamba
+cochair
+cochaired
+cochairing
+cochairman
+cochairmanship
+cochairmen
+cochairs
+cochal
+cochampion
+cochampions
+Cochard
+Cochecton
+cocher
+cochero
+cochief
+Cochin
+cochin
+Cochin-China
+cochin-china
+Cochinchine
+cochineal
+cochins
+Cochise
+cochlea
+cochleae
+cochlear
+cochleare
+Cochlearia
+cochlearifoliate
+cochleariform
+cochleary
+cochleas
+cochleate
+cochleated
+cochleiform
+cochleitis
+cochleleae
+cochleleas
+cochleous
+cochlidiid
+Cochlidiidae
+cochliodont
+Cochliodontidae
+Cochliodus
+cochlite
+cochlitis
+Cochlospermaceae
+cochlospermaceous
+Cochlospermum
+cochon
+Cochran
+Cochrane
+Cochranea
+Cochranton
+Cochranville
+cochromatography
+cochurchwarden
+cochylis
+cocillana
+cocin
+cocinera
+cocineras
+cocinero
+cocircular
+cocircularity
+cocitizen
+cocitizenship
+Cock
+cock
+cock-a
+cockabondy
+cockade
+cockaded
+cockades
+cock-a-doodle
+cock-a-doodle-doo
+cockadoodledoo
+cock-a-doodle--dooed
+cock-a-doodle--dooing
+cock-a-doodle-doos
+cock-a-hoop
+cock-a-hooping
+cock-a-hoopish
+cock-a-hoopness
+Cockaigne
+cockaigne
+cockal
+cockalan
+cock-a-leekie
+cockaleekie
+cockalorum
+cockamamie
+cockamamy
+cockamaroo
+cock-and-bull
+cock-and-bull-story
+cock-and-pinch
+cockandy
+cockapoo
+cockapoos
+cockard
+cockarouse
+cock-as-hoop
+cockateel
+cockatiel
+cockatoo
+cockatoos
+cockatrice
+cockatrices
+cockawee
+cock-a-whoop
+cock-awhoop
+Cockayne
+cockbell
+cock-bill
+cockbill
+cockbilled
+cockbilling
+cockbills
+cockbird
+cock-boat
+cockboat
+cockboats
+cock-brain
+cockbrain
+cock-brained
+Cockburn
+cockchafer
+Cockcroft
+cock-crow
+cockcrow
+cockcrower
+cock-crowing
+cockcrowing
+cockcrows
+Cocke
+cocked
+Cocker
+cocker
+cockered
+cockerel
+cockerels
+cockerie
+cockering
+cockermeg
+cockernonnie
+cockernony
+cockerouse
+cockers
+cocket
+cocketed
+cocketing
+cock-eye
+cockeye
+cock-eyed
+cockeyed
+cockeyedly
+cockeyedness
+cockeyes
+Cockeysville
+cock-feathered
+cock-feathering
+cock-fight
+cockfight
+cockfighter
+cock-fighting
+cockfighting
+cockfights
+cockhead
+cock-horse
+cockhorse
+cockhorses
+cockie
+cockie-leekie
+cockieleekie
+cockier
+cockies
+cockiest
+cockily
+cockiness
+cockinesses
+cocking
+cockish
+cockishly
+cockishness
+cock-laird
+cockle
+cockleboat
+cockle-bread
+cocklebur
+cockled
+cockle-headed
+cockler
+cockles
+cockle-shell
+cockleshell
+cockleshells
+cocklet
+cocklewife
+cocklight
+cocklike
+cockling
+cockloche
+cock-loft
+cockloft
+cocklofts
+cockly
+cock-master
+cockmaster
+cock-match
+cockmatch
+cockmate
+cockneian
+cockneity
+cock-nest
+Cockney
+cockney
+cockneybred
+cockneydom
+cockneyese
+cockneyess
+cockneyfication
+cockneyfied
+cockneyfy
+cockneyfying
+cockneyish
+cockneyishly
+cockneyism
+cockneyize
+cockneyland
+cockneylike
+cockneys
+cockneyship
+cock-of-the-rock
+cock-paddle
+cockpaddle
+cock-penny
+cockpit
+cockpits
+cockroach
+cockroaches
+cock-road
+Cocks
+cocks
+cock's-comb
+cockscomb
+cockscombed
+cockscombs
+cock's-foot
+cocksfoot
+cock's-head
+cockshead
+cockshies
+cockshoot
+cockshot
+cock-shut
+cockshut
+cockshuts
+cock-shy
+cockshy
+cockshying
+cocks-of-the-rock
+cocksparrow
+cock-sparrowish
+cockspur
+cockspurs
+cockstone
+cock-stride
+cock-sure
+cocksure
+cocksuredom
+cocksureism
+cocksurely
+cocksureness
+cocksurety
+cockswain
+cocksy
+cocktail
+cock-tailed
+cocktailed
+cocktailing
+cocktails
+cock-throppled
+cockthrowing
+cock-up
+cockup
+cockups
+cockweed
+cocky
+cocky-leeky
+cockyolly
+co-clause
+Cocle
+coclea
+Cocles
+Coco
+coco
+cocoa
+cocoa-brown
+cocoach
+cocoa-colored
+cocoanut
+cocoanuts
+cocoas
+cocoawood
+cocobola
+cocobolas
+cocobolo
+cocobolos
+cocodette
+Cocolalla
+Cocolamus
+COCOM
+CoComanchean
+cocomat
+cocomats
+cocomposer
+cocomposers
+cocona
+Coconino
+coconnection
+coconqueror
+coconscious
+coconsciously
+coconsciousness
+coconsecrator
+co-conspirator
+coconspirator
+coconspirators
+coconstituent
+cocontractor
+Coconucan
+Coconuco
+coconut
+coconuts
+cocoon
+cocooned
+cocooneries
+cocoonery
+cocooning
+cocoons
+cocopan
+cocopans
+coco-plum
+cocorico
+cocoroot
+Cocos
+cocos
+COCOT
+cocotte
+cocottes
+cocovenantor
+cocowood
+cocowort
+cocoyam
+cocozelle
+cocreate
+cocreated
+cocreates
+cocreating
+cocreator
+cocreators
+cocreatorship
+cocreditor
+cocrucify
+coct
+Cocteau
+coctile
+coction
+coctoantigen
+coctoprecipitin
+cocuisa
+cocuiza
+cocullo
+cocurator
+cocurrent
+cocurricular
+cocus
+cocuswood
+cocuyo
+Cocytean
+Cocytus
+cocytus
+C.O.D.
+COD
+Cod
+cod
+coda
+codable
+Codacci-Pisanelli
+codal
+codamin
+codamine
+codas
+CODASYL
+cod-bait
+codbank
+CODCF
+Codd
+codded
+codder
+codders
+Codding
+codding
+Coddington
+coddle
+coddled
+coddler
+coddlers
+coddles
+coddling
+coddy
+coddy-moddy
+code
+codebook
+codebooks
+codebreak
+codebreaker
+codebtor
+codebtors
+CODEC
+codec
+codeclination
+codecree
+codecs
+coded
+Codee
+co-defendant
+codefendant
+codefendants
+codeia
+codeias
+codein
+codeina
+codeinas
+codeine
+codeines
+codeins
+Codel
+codeless
+codelight
+codelinquency
+codelinquent
+Codell
+Coden
+coden
+codenization
+codens
+codeposit
+coder
+coderive
+coderived
+coderives
+coderiving
+coders
+codes
+codescendant
+codesign
+codesigned
+codesigner
+codesigners
+codesigning
+codesigns
+codespairer
+codetermination
+codetermine
+codetta
+codettas
+codette
+codevelop
+codeveloped
+codeveloper
+codevelopers
+codeveloping
+codevelops
+codeword
+codewords
+codex
+cod-fish
+codfish
+codfisher
+codfisheries
+codfishery
+codfishes
+codfishing
+codger
+codgers
+codhead
+codheaded
+Codi
+Codiaceae
+codiaceous
+Codiaeum
+Codiales
+codical
+codices
+codicil
+codicilic
+codicillary
+codicils
+codicology
+codictatorship
+Codie
+codifiability
+codification
+codifications
+codified
+codifier
+codifiers
+codifies
+codify
+codifying
+codilla
+codille
+coding
+codings
+codiniac
+codirect
+codirected
+codirecting
+codirectional
+codirector
+codirectors
+codirectorship
+codirects
+codiscoverer
+codiscoverers
+codisjunct
+codist
+Codium
+codivine
+codlin
+codline
+codling
+codlings
+codlins
+codlins-and-cream
+codman
+codo
+codol
+codomain
+codomestication
+codominant
+codon
+codons
+Codorus
+cod-piece
+codpiece
+codpieces
+codpitchings
+codrive
+codriven
+co-driver
+codriver
+codrives
+codrove
+Codrus
+cods
+codshead
+cod-smack
+codswallop
+codworm
+Cody
+COE
+Coe
+coe
+Coeburn
+coecal
+coecum
+co-ed
+coed
+coedit
+coedited
+coediting
+coeditor
+coeditors
+coeditorship
+coedits
+coeds
+coeducate
+co-education
+coeducation
+coeducational
+coeducationalism
+coeducationalize
+coeducationally
+coeducations
+COEES
+coef
+coeff
+co-effect
+coeffect
+coeffects
+co-efficacy
+coefficacy
+coefficient
+coefficiently
+coefficients
+coeffluent
+coeffluential
+coehorn
+coel-
+coelacanth
+coelacanthid
+Coelacanthidae
+coelacanthine
+Coelacanthini
+coelacanthoid
+coelacanthous
+coelanaglyphic
+coelar
+coelarium
+Coelastraceae
+coelastraceous
+Coelastrum
+Coelata
+coelder
+coeldership
+-coele
+Coelebogyne
+coelect
+coelection
+coelector
+coelectron
+coelelminth
+Coelelminthes
+coelelminthic
+Coelentera
+coelentera
+Coelenterata
+coelenterata
+coelenterate
+coelenterates
+coelenteric
+coelenteron
+coelestial
+coelestine
+coelevate
+coelho
+coelia
+coeliac
+coelialgia
+coelian
+Coelicolae
+Coelicolist
+coeligenous
+coelin
+coeline
+coelio-
+coeliomyalgia
+coeliorrhea
+coeliorrhoea
+coelioscopy
+coeliotomy
+Coello
+coelo-
+coeloblastic
+coeloblastula
+Coelococcus
+coelodont
+coelogastrula
+Coeloglossum
+Coelogyne
+coelom
+coeloma
+Coelomata
+coelomata
+coelomate
+coelomatic
+coelomatous
+coelome
+coelomes
+coelomesoblast
+coelomic
+Coelomocoela
+coelomopore
+coeloms
+coelonavigation
+coelongated
+coeloplanula
+coeloscope
+coelosperm
+coelospermous
+coelostat
+coelozoic
+coeltera
+coemanate
+coembedded
+coembodied
+coembodies
+coembody
+coembodying
+coembrace
+coeminency
+coemperor
+coemploy
+coemployed
+coemployee
+coemploying
+coemployment
+coemploys
+coempt
+coempted
+coempting
+coemptio
+coemption
+coemptional
+coemptionator
+coemptive
+coemptor
+coempts
+coen-
+coenacle
+coenact
+coenacted
+coenacting
+coenactor
+coenacts
+coenacula
+coenaculous
+coenaculum
+coenaesthesis
+coenamor
+coenamored
+coenamoring
+coenamorment
+coenamors
+coenamourment
+coenanthium
+coendear
+Coendidae
+Coendou
+coendure
+coendured
+coendures
+coenduring
+coenenchym
+coenenchyma
+coenenchymal
+coenenchymata
+coenenchymatous
+coenenchyme
+coenesthesia
+coenesthesis
+coenflame
+coengage
+coengager
+coenjoy
+coenla
+coeno
+coeno-
+coenobe
+coenobiar
+coenobic
+coenobiod
+coenobioid
+coenobite
+coenobitic
+coenobitical
+coenobitism
+coenobium
+coenoblast
+coenoblastic
+coenoby
+coenocentrum
+coenocyte
+coenocytic
+coenodioecism
+coenoecial
+coenoecic
+coenoecium
+coenogamete
+coenogenesis
+coenogenetic
+coenomonoecism
+coenosarc
+coenosarcal
+coenosarcous
+coenosite
+coenospecies
+coenospecific
+coenospecifically
+coenosteal
+coenosteum
+coenotrope
+coenotype
+coenotypic
+coenthrone
+coenunuri
+coenure
+coenures
+coenuri
+coenurus
+coenzymatic
+coenzymatically
+coenzyme
+coenzymes
+coequal
+coequality
+coequalize
+coequally
+coequalness
+coequals
+co-equate
+coequate
+coequated
+coequates
+coequating
+coequation
+COER
+coerce
+coerceable
+coerced
+coercement
+coercend
+coercends
+coercer
+coercers
+coerces
+coercibility
+coercible
+coercibleness
+coercibly
+coercing
+coercion
+coercionary
+coercionist
+coercions
+coercitive
+coercive
+coercively
+coerciveness
+coercivity
+Coerebidae
+coerect
+coerected
+coerecting
+coerects
+coeruleolactite
+coes
+coesite
+coesites
+coessential
+coessentiality
+coessentially
+coessentialness
+co-establishment
+coestablishment
+co-estate
+coestate
+coetanean
+coetaneity
+coetaneous
+coetaneously
+coetaneousness
+coeternal
+coeternally
+coeternity
+coetus
+Coeus
+coeval
+coevality
+coevally
+coevalneity
+coevalness
+coevals
+coevolution
+coevolutionary
+coevolve
+coevolved
+coevolvedcoevolves
+coevolves
+coevolving
+coexchangeable
+coexclusive
+coexecutant
+co-executor
+coexecutor
+coexecutors
+coexecutrices
+coexecutrix
+coexert
+coexerted
+coexerting
+coexertion
+coexerts
+co-exist
+coexist
+coexisted
+coexistence
+coexistences
+coexistency
+coexistent
+coexisting
+coexists
+coexpand
+coexpanded
+coexperiencer
+coexpire
+coexplosion
+coextend
+coextended
+coextending
+coextends
+coextension
+coextensive
+coextensively
+coextensiveness
+coextent
+Coeymans
+cofactor
+cofactors
+Cofane
+cofaster
+cofather
+cofathership
+cofeature
+cofeatures
+co-feoffee
+cofeoffee
+coferment
+cofermentation
+COFF
+coff
+Coffea
+Coffee
+coffee
+coffee-and
+coffeeberries
+coffeeberry
+coffee-blending
+coffee-brown
+coffeebush
+coffeecake
+coffeecakes
+coffee-cleaning
+coffee-color
+coffee-colored
+coffeecup
+coffee-faced
+coffee-grading
+coffee-grinding
+coffeegrower
+coffeegrowing
+coffee-house
+coffeehouse
+coffeehoused
+coffeehouses
+coffeehousing
+coffee-imbibing
+coffee-klatsch
+coffeeleaf
+coffee-making
+coffeeman
+Coffeen
+coffee-planter
+coffee-planting
+coffee-polishing
+coffeepot
+coffeepots
+coffee-roasting
+coffee-room
+coffeeroom
+coffees
+coffee-scented
+coffeetime
+Coffeeville
+coffeeweed
+coffeewood
+Coffeng
+coffer
+coffer-dam
+cofferdam
+cofferdams
+coffered
+cofferer
+cofferfish
+coffering
+cofferlike
+coffers
+coffer-work
+cofferwork
+Coffey
+Coffeyville
+coff-fronted
+Coffin
+coffin
+coffined
+coffin-fashioned
+coffing
+coffin-headed
+coffining
+coffinite
+coffinless
+coffinmaker
+coffinmaking
+coffins
+coffin-shaped
+coffle
+coffled
+coffles
+coffling
+Coffman
+coffret
+coffrets
+coffs
+Cofield
+cofighter
+cofinal
+cofinance
+cofinanced
+cofinances
+cofinancing
+coforeknown
+coformulator
+cofound
+cofounded
+cofounder
+cofounders
+cofounding
+cofoundress
+cofounds
+cofreighter
+Cofsky
+coft
+cofunction
+cog
+cog.
+Cogan
+cogboat
+Cogen
+cogence
+cogences
+cogencies
+cogency
+cogener
+cogeneration
+cogeneric
+cogenial
+cogent
+cogently
+Coggan
+cogged
+cogger
+coggers
+coggie
+cogging
+coggle
+coggledy
+cogglety
+coggly
+Coggon
+coghle
+cogida
+cogie
+cogit
+cogitability
+cogitable
+cogitabund
+cogitabundity
+cogitabundly
+cogitabundous
+cogitant
+cogitantly
+cogitate
+cogitated
+cogitates
+cogitating
+cogitatingly
+cogitation
+cogitations
+cogitative
+cogitatively
+cogitativeness
+cogitativity
+cogitator
+cogitators
+cogito
+cogitos
+coglorify
+coglorious
+cogman
+cogmen
+Cognac
+cognac
+cognacs
+cognate
+cognately
+cognateness
+cognates
+cognati
+cognatic
+cognatical
+cognation
+cognatus
+cognisability
+cognisable
+cognisableness
+cognisably
+cognisance
+cognisant
+cognise
+cognised
+cogniser
+cognises
+cognising
+cognition
+cognitional
+cognitions
+cognitive
+cognitively
+cognitives
+cognitivity
+Cognitum
+cognitum
+cognizability
+cognizable
+cognizableness
+cognizably
+cognizance
+cognizances
+cognizant
+cognize
+cognized
+cognizee
+cognizer
+cognizers
+cognizes
+cognizing
+cognizor
+cognomen
+cognomens
+cognomina
+cognominal
+cognominally
+cognominate
+cognominated
+cognomination
+cognosce
+cognoscent
+cognoscente
+cognoscenti
+cognoscibility
+cognoscible
+cognoscing
+cognoscitive
+cognoscitively
+cognovit
+cognovits
+cogon
+cogonal
+cogons
+cogovernment
+cogovernor
+cogracious
+cograil
+cogrediency
+cogredient
+cogroad
+cogs
+Cogswell
+Cogswellia
+coguarantor
+co-guardian
+coguardian
+cogue
+cogware
+cogway
+cogways
+cogweel
+cogweels
+cog-wheel
+cogwheel
+cogwheels
+cog-wood
+cogwood
+Coh
+cohabit
+cohabitancy
+cohabitant
+cohabitate
+cohabitation
+cohabitations
+cohabited
+cohabiter
+cohabiting
+cohabits
+Cohagen
+Cohan
+Cohanim
+cohanim
+cohanims
+coharmonious
+coharmoniously
+coharmonize
+Cohasset
+Cohbath
+Cohberg
+Cohbert
+Cohby
+Cohdwell
+Cohe
+cohead
+coheaded
+coheading
+coheads
+coheartedness
+coheir
+coheiress
+coheiresses
+coheirs
+coheirship
+cohelper
+cohelpership
+Coheman
+Cohen
+cohen
+cohenite
+Cohens
+cohens
+coherald
+cohere
+cohered
+coherence
+coherences
+coherency
+coherent
+coherently
+coherer
+coherers
+coheres
+coheretic
+cohering
+coheritage
+coheritor
+cohert
+cohesibility
+cohesible
+cohesion
+cohesionless
+cohesions
+cohesive
+cohesively
+cohesiveness
+Cohette
+cohibit
+cohibition
+cohibitive
+cohibitor
+Cohin
+cohitre
+Cohl
+Cohla
+Cohleen
+Cohlette
+Cohlier
+Cohligan
+Cohn
+coho
+cohob
+cohoba
+cohobate
+cohobated
+cohobates
+cohobating
+cohobation
+cohobator
+Cohoctah
+Cohocton
+Cohoes
+cohog
+cohogs
+cohol
+coholder
+coholders
+cohomology
+Co-hong
+cohorn
+cohort
+cohortation
+cohortative
+cohorts
+cohos
+cohosh
+cohoshes
+cohost
+cohosted
+cohostess
+cohostesses
+cohosting
+cohosts
+cohow
+cohue
+cohune
+cohunes
+cohusband
+Cohutta
+COI
+Coibita
+coidentity
+coif
+coifed
+coiffe
+coiffed
+coiffes
+coiffeur
+coiffeurs
+coiffeuse
+coiffeuses
+coiffing
+coiffure
+coiffured
+coiffures
+coiffuring
+coifing
+coifs
+coign
+coigne
+coigned
+coignes
+coigning
+coigns
+coigny
+coigue
+coil
+Coila
+coilability
+coiled
+coiler
+coilers
+coil-filling
+coiling
+coillen
+coils
+coilsmith
+coil-testing
+coil-winding
+coilyear
+Coimbatore
+Coimbra
+coimmense
+coimplicant
+coimplicate
+coimplore
+coin
+coinable
+coinage
+coinages
+coincide
+coincided
+coincidence
+coincidences
+coincidency
+coincident
+coincidental
+coincidentally
+coincidently
+coincidents
+coincider
+coincides
+coinciding
+coinclination
+coincline
+coin-clipper
+coin-clipping
+coinclude
+coin-controlled
+coincorporate
+coin-counting
+coindicant
+coindicate
+coindication
+coindwelling
+coined
+coiner
+coiners
+coinfeftment
+coinfer
+coinferred
+coinferring
+coinfers
+co-infinite
+coinfinite
+coinfinity
+coing
+co-inhabit
+coinhabit
+coinhabitant
+coinhabitor
+co-inhere
+coinhere
+coinhered
+coinherence
+coinherent
+coinheres
+coinhering
+coinheritance
+co-inheritor
+coinheritor
+coining
+coinitial
+Coinjock
+coin-made
+coinmaker
+coinmaking
+coinmate
+coinmates
+coin-op
+coin-operated
+coin-operating
+coinquinate
+coins
+coin-separating
+coin-shaped
+coinspire
+coinstantaneity
+coinstantaneous
+coinstantaneously
+coinstantaneousness
+coinsurable
+coinsurance
+coinsure
+coinsured
+coinsurer
+coinsures
+coinsuring
+cointense
+cointension
+cointensity
+cointer
+cointerest
+cointerred
+cointerring
+cointers
+cointersecting
+cointise
+Cointon
+Cointreau
+coinvent
+coinventor
+coinventors
+coinvestigator
+coinvestigators
+coinvolve
+coin-weighing
+coiny
+coir
+Coire
+coirs
+coislander
+coisns
+coistrel
+coistrels
+coistril
+coistrils
+Coit
+coit
+coital
+coitally
+coition
+coitional
+coitions
+coitophobia
+coiture
+coitus
+coituses
+Coix
+cojoin
+cojoined
+cojoins
+cojones
+cojudge
+cojudices
+cojuror
+cojusticiar
+Cokato
+Coke
+coke
+Cokeburg
+coked
+Cokedale
+cokelike
+cokeman
+cokeney
+Coker
+coker
+cokernut
+cokers
+coker-sack
+cokery
+cokes
+Cokeville
+cokewold
+cokey
+cokie
+coking
+cokneyfy
+cokuloris
+coky
+Col
+Col.
+col
+col-
+col.
+COLA
+Cola
+cola
+colaborer
+co-labourer
+colacobioses
+colacobiosis
+colacobiotic
+Colada
+colage
+colalgia
+colament
+Colan
+colander
+colanders
+colane
+colaphize
+Colares
+colarin
+Colas
+colas
+colascione
+colasciones
+colascioni
+colat
+colate
+colation
+co-latitude
+colatitude
+colatorium
+colature
+colauxe
+Colaxais
+colazione
+Colb
+colback
+Colbaith
+Colbert
+colberter
+colbertine
+Colbertism
+Colburn
+Colby
+Colbye
+colcannon
+Colchester
+Colchian
+Colchicaceae
+colchicia
+colchicin
+colchicine
+Colchicum
+colchicum
+Colchis
+colchyte
+Colcine
+Colcord
+colcothar
+Cold
+cold
+coldblood
+cold-blooded
+coldblooded
+cold-bloodedly
+cold-bloodedness
+coldbloodedness
+cold-braving
+Coldbrook
+cold-catching
+cold-chisel
+cold-chiseled
+cold-chiseling
+cold-chiselled
+cold-chiselling
+coldcock
+cold-complexioned
+cold-cream
+cold-draw
+cold-drawing
+cold-drawn
+cold-drew
+Colden
+cold-engendered
+colder
+coldest
+cold-faced
+cold-finch
+coldfinch
+cold-flow
+cold-forge
+cold-hammer
+cold-hammered
+cold-head
+cold-hearted
+coldhearted
+cold-heartedly
+coldheartedly
+cold-heartedness
+coldheartedness
+coldish
+coldly
+cold-natured
+coldness
+coldnesses
+cold-nipped
+coldong
+cold-pack
+cold-patch
+cold-pated
+cold-press
+cold-producing
+coldproof
+cold-roll
+cold-rolled
+colds
+cold-saw
+cold-short
+cold-shortness
+cold-shoulder
+cold-shut
+cold-slain
+coldslaw
+cold-spirited
+cold-storage
+cold-store
+Coldstream
+Cold-streamers
+cold-swage
+cold-sweat
+cold-taking
+coldturkey
+cold-type
+Coldwater
+cold-water
+cold-weld
+cold-white
+cold-work
+cold-working
+Cole
+cole
+colead
+coleader
+coleads
+Colebrook
+colecannon
+colectomies
+colectomy
+coled
+Coleen
+colegatee
+colegislator
+cole-goose
+Coleman
+colemanite
+colemouse
+Colen
+colen
+colen-bell
+Colene
+colent
+Coleochaetaceae
+coleochaetaceous
+Coleochaete
+Coleophora
+Coleophoridae
+coleopter
+Coleoptera
+coleoptera
+coleopteral
+coleopteran
+coleopterist
+coleopteroid
+coleopterological
+coleopterology
+coleopteron
+coleopterous
+coleoptile
+coleoptilum
+coleopttera
+coleorhiza
+coleorhizae
+Coleosporiaceae
+Coleosporium
+coleplant
+cole-prophet
+colera
+Colerain
+Coleraine
+cole-rake
+Coleridge
+Coleridge-Taylor
+Coleridgian
+Coles
+coles
+Colesburg
+coleseed
+coleseeds
+cole-slaw
+coleslaw
+coleslaws
+co-lessee
+colessee
+colessees
+colessor
+colessors
+cole-staff
+Colet
+colet
+Coleta
+cole-tit
+coletit
+Coletta
+Colette
+coleur
+Coleus
+coleus
+coleuses
+Coleville
+colewort
+coleworts
+coley
+Colfax
+Colfin
+colfox
+Colgate
+coli
+coliander
+Colias
+colibacillosis
+colibacterin
+colibert
+colibertus
+colibri
+colic
+colical
+colichemarde
+colicin
+colicine
+colicines
+colicins
+colicker
+colicky
+colicolitis
+colicroot
+colics
+colicweed
+colicwort
+colicystitis
+colicystopyelitis
+Colier
+colies
+co-life
+coliform
+coliforms
+Coligni
+Coligny
+Coliidae
+Coliiformes
+colilysin
+Colima
+colima
+Colin
+colin
+colinear
+colinearity
+colinephritis
+Colinette
+coling
+colins
+Colinson
+Colinus
+coliphage
+coliplication
+colipuncture
+colipyelitis
+colipyuria
+Colis
+colisepsis
+Coliseum
+coliseum
+coliseums
+colistin
+colistins
+colitic
+colitis
+colitises
+colitoxemia
+coliuria
+Colius
+colk
+coll
+coll-
+coll.
+Colla
+colla
+collab
+collabent
+collaborate
+collaborated
+collaborates
+collaborateur
+collaborating
+collaboration
+collaborationism
+collaborationist
+collaborationists
+collaborations
+collaborative
+collaboratively
+collaborativeness
+collaborator
+collaborators
+collada
+colladas
+collage
+collaged
+collagen
+collagenase
+collagenic
+collagenous
+collagens
+collages
+collagist
+collapsability
+collapsable
+collapsar
+collapse
+collapsed
+collapses
+collapsibility
+collapsible
+collapsing
+Collar
+collar
+collarband
+collarbird
+collar-bone
+collarbone
+collarbones
+collar-bound
+collar-cutting
+collard
+collards
+collare
+collared
+collaret
+collarets
+collarette
+collaring
+collarino
+collarinos
+collarless
+collarman
+collars
+collar-shaping
+collar-to-collar
+collar-wearing
+collat
+collat.
+collatable
+collate
+collated
+collatee
+collateral
+collaterality
+collateralize
+collateralized
+collateralizing
+collaterally
+collateralness
+collaterals
+collates
+collating
+collation
+collational
+collationer
+collations
+collatitious
+collative
+collator
+collators
+collatress
+collaud
+collaudation
+Collayer
+Collbaith
+Collbran
+colleague
+colleagued
+colleagues
+colleagueship
+colleaguesmanship
+colleaguing
+Collect
+collect
+collectability
+collectable
+collectables
+collectanea
+collectarium
+collected
+collectedly
+collectedness
+collectibility
+collectible
+collectibles
+collecting
+collection
+collectional
+collectioner
+collections
+collective
+collectively
+collectiveness
+collectives
+collectivise
+collectivism
+collectivist
+collectivistic
+collectivistically
+collectivists
+collectivities
+collectivity
+collectivization
+collectivize
+collectivized
+collectivizes
+collectivizing
+collectivum
+collector
+collectorate
+collectors
+collectorship
+collectress
+collects
+Colleen
+colleen
+colleens
+collegatary
+college
+college-bred
+college-preparatory
+colleger
+collegers
+colleges
+collegese
+collegia
+collegial
+collegialism
+collegiality
+collegially
+collegian
+collegianer
+collegians
+Collegiant
+collegiate
+collegiately
+collegiateness
+collegiation
+collegiugia
+collegium
+collegiums
+Collembola
+collembolan
+collembole
+collembolic
+collembolous
+Collen
+collen
+collenchyma
+collenchymatic
+collenchymatous
+collenchyme
+collencytal
+collencyte
+Colleri
+Colleries
+Collery
+collery
+collet
+colletarium
+Collete
+colleted
+colleter
+colleterial
+colleterium
+Colletes
+Colletia
+colletic
+Colletidae
+colleting
+Colletotrichum
+collets
+colletside
+Collette
+Collettsville
+Colley
+colley
+Colleyville
+collibert
+collicle
+colliculate
+colliculus
+collide
+collided
+collides
+collidin
+collidine
+colliding
+Collie
+collie
+collied
+collielike
+Collier
+collier
+collieries
+Colliers
+colliers
+Colliersville
+Collierville
+colliery
+collies
+collieshangie
+colliflower
+colliform
+Colligan
+colligance
+colligate
+colligated
+colligating
+colligation
+colligative
+colligible
+collimate
+collimated
+collimates
+collimating
+collimation
+collimator
+collimators
+Collimore
+Collin
+collin
+collinal
+Colline
+colline
+collinear
+collinearity
+collinearly
+collineate
+collineation
+colling
+collingly
+Collingswood
+collingual
+Collingwood
+Collins
+collins
+collinses
+Collinsia
+collinsia
+collinsite
+Collinsonia
+Collinston
+Collinsville
+Collinwood
+colliquable
+colliquament
+colliquate
+colliquation
+colliquative
+colliquativeness
+colliquefaction
+Collis
+collis
+collision
+collisional
+collision-proof
+collisions
+collisive
+Collison
+collo-
+colloblast
+collobrierite
+collocal
+Collocalia
+collocate
+collocated
+collocates
+collocating
+collocation
+collocationable
+collocational
+collocations
+collocative
+collocatory
+collochemistry
+collochromate
+collock
+collocution
+collocutor
+collocutory
+Collodi
+collodio-
+collodiochloride
+collodion
+collodionization
+collodionize
+collodiotype
+collodium
+collogen
+collogue
+collogued
+collogues
+colloguing
+colloid
+colloidal
+colloidality
+colloidally
+colloider
+colloidize
+colloidochemical
+colloids
+Collomia
+collomia
+collop
+colloped
+collophane
+collophanite
+collophore
+collops
+Colloq
+colloq
+colloq.
+colloque
+colloquia
+colloquial
+colloquialism
+colloquialisms
+colloquialist
+colloquiality
+colloquialize
+colloquializer
+colloquially
+colloquialness
+colloquies
+colloquiquia
+colloquiquiums
+colloquist
+colloquium
+colloquiums
+colloquize
+colloquized
+colloquizing
+colloququia
+colloquy
+collossians
+collothun
+collotype
+collotyped
+collotypic
+collotyping
+collotypy
+collow
+colloxylin
+colluctation
+collude
+colluded
+colluder
+colluders
+colludes
+colluding
+Collum
+collum
+collumelliaceous
+collun
+collunaria
+collunarium
+collusion
+collusions
+collusive
+collusively
+collusiveness
+collusory
+collut
+collution
+collutoria
+collutories
+collutorium
+collutory
+colluvia
+colluvial
+colluvies
+colluvium
+colluviums
+Colly
+colly
+collyba
+Collybia
+collybist
+Collyer
+collying
+collylyria
+collyr
+collyria
+Collyridian
+collyridian
+collyrie
+collyrite
+collyrium
+collyriums
+collywest
+collyweston
+collywobbles
+Colman
+Colmar
+colmar
+colmars
+Colmer
+Colmesneil
+colmose
+Coln
+colnaria
+Colner
+Colo
+Colo.
+colo-
+colob
+colobi
+colobin
+colobium
+coloboma
+Colobus
+colobus
+Colocasia
+colocate
+colocated
+colocates
+colocating
+colocentesis
+Colocephali
+colocephalous
+coloclysis
+colocola
+colocolic
+colocolo
+colocynth
+colocynthin
+colodyspepsia
+coloenteritis
+colog
+cologarithm
+Cologne
+cologne
+cologned
+colognes
+cologs
+colola
+cololite
+Coloma
+colomb
+Colomb-Bchar
+Colombes
+Colombi
+Colombia
+colombia
+Colombian
+colombian
+colombians
+colombier
+colombin
+Colombina
+Colombo
+colombo
+Colome
+colometric
+colometrically
+colometry
+Colon
+colon
+Colona
+colonaded
+colonalgia
+colonate
+colone
+colonel
+colonelcies
+colonel-commandantship
+colonelcy
+colonels
+colonelship
+colonelships
+coloner
+colones
+colonette
+colongitude
+coloni
+colonial
+colonialise
+colonialised
+colonialising
+colonialism
+colonialist
+colonialistic
+colonialists
+colonialization
+colonialize
+colonialized
+colonializing
+colonially
+colonialness
+colonials
+colonic
+colonical
+colonics
+Colonie
+Colonies
+colonies
+colonisability
+colonisable
+colonisation
+colonisationist
+colonise
+colonised
+coloniser
+colonises
+colonising
+colonist
+colonists
+colonitis
+colonizability
+colonizable
+colonization
+colonizationist
+colonizations
+colonize
+colonized
+colonizer
+colonizers
+colonizes
+colonizing
+colonnade
+colonnaded
+colonnades
+colonnette
+colonopathy
+colonopexy
+colonoscope
+colonoscopy
+colons
+Colonsay
+colonus
+colony
+colopexia
+colopexotomy
+colopexy
+coloph-
+colophan
+colophane
+colophany
+colophene
+colophenic
+Colophon
+colophon
+colophonate
+Colophonian
+colophonic
+colophonist
+colophonite
+colophonium
+colophons
+colophony
+coloplication
+coloppe
+coloproctitis
+coloptosis
+colopuncture
+coloquies
+coloquintid
+coloquintida
+color
+Colora
+colorability
+colorable
+colorableness
+colorably
+Coloradan
+coloradan
+coloradans
+Colorado
+colorado
+Coloradoan
+coloradoite
+colorant
+colorants
+colorate
+coloration
+colorational
+colorationally
+colorations
+colorative
+coloratura
+coloraturas
+colorature
+color-bearer
+colorbearer
+color-blind
+colorblind
+colorblindness
+colorbreed
+colorcast
+colorcasted
+colorcaster
+colorcasting
+colorcasts
+colorectitis
+colorectostomy
+colored
+coloreds
+colorer
+colorers
+color-fading
+colorfast
+colorfastness
+color-free
+colorful
+colorfully
+colorfulness
+color-grinding
+colorific
+colorifics
+colorimeter
+colorimetric
+colorimetrical
+colorimetrically
+colorimetrics
+colorimetrist
+colorimetry
+colorin
+coloring
+colorings
+colorism
+colorisms
+colorist
+coloristic
+coloristically
+colorists
+colorization
+colorize
+colorless
+colorlessly
+colorlessness
+colormaker
+colormaking
+colorman
+color-matching
+coloroto
+colorrhaphy
+colors
+color-sensitize
+color-testing
+colortype
+Colorum
+color-washed
+colory
+coloslossi
+coloslossuses
+coloss
+Colossae
+colossal
+colossality
+colossally
+colossean
+Colosseum
+colosseum
+colossi
+Colossian
+colossian
+Colossians
+colossians
+colosso
+Colossochelys
+colossus
+colossuses
+Colossuswise
+colostomies
+colostomy
+colostral
+colostration
+colostric
+colostrous
+colostrum
+colotomies
+colotomy
+colotyphoid
+colour
+colourability
+colourable
+colourableness
+colourably
+colouration
+colourational
+colourationally
+colourative
+colour-blind
+colour-box
+Coloured
+coloured
+colourer
+colourers
+colourfast
+colourful
+colourfully
+colourfulness
+colourific
+colourifics
+colouring
+colourist
+colouristic
+colourize
+colourless
+colourlessly
+colourlessness
+colourman
+colours
+colourtype
+coloury
+-colous
+colove
+Colp
+colp
+colpenchyma
+colpeo
+colpeurynter
+colpeurysis
+colpheg
+Colpin
+colpindach
+colpitis
+colpitises
+colpo-
+colpocele
+colpocystocele
+Colpoda
+colpohyperplasia
+colpohysterotomy
+colpoperineoplasty
+colpoperineorrhaphy
+colpoplastic
+colpoplasty
+colpoptosis
+colporrhagia
+colporrhaphy
+colporrhea
+colporrhexis
+colport
+colportage
+colporter
+colporteur
+colporteurs
+colposcope
+colposcopy
+colpostat
+colpotomies
+colpotomy
+colpus
+Colquitt
+Colrain
+cols
+Colson
+colstaff
+Colston
+Colstrip
+COLT
+Colt
+colt
+Coltee
+colter
+colters
+colt-herb
+colthood
+Coltin
+coltish
+coltishly
+coltishness
+coltlike
+Colton
+coltoria
+colt-pixie
+coltpixie
+coltpixy
+Coltrane
+colts
+coltsfoot
+coltsfoots
+coltskin
+Coltson
+colt's-tail
+Coltun
+Coltwood
+colubaria
+Coluber
+coluber
+colubrid
+Colubridae
+colubrids
+colubriform
+Colubriformes
+Colubriformia
+Colubrina
+Colubrinae
+colubrine
+colubroid
+colugo
+colugos
+Colum
+Columba
+columba
+columbaceous
+Columbae
+Columban
+Columbanian
+columbaria
+columbaries
+columbarium
+columbary
+columbate
+columbeia
+columbeion
+Columbella
+Columbia
+columbia
+columbiad
+Columbian
+columbian
+Columbiana
+Columbiaville
+columbic
+Columbid
+Columbidae
+columbier
+columbiferous
+Columbiformes
+columbin
+Columbine
+columbine
+columbines
+columbite
+columbium
+columbo
+columboid
+columbotantalate
+columbotitanate
+columbous
+Columbus
+columbus
+Columbyne
+columel
+columella
+columellae
+columellar
+columellate
+Columellia
+Columelliaceae
+columelliform
+columels
+column
+columna
+columnal
+columnar
+columnarian
+columnarity
+columnarized
+columnate
+columnated
+columnates
+columnating
+columnation
+columnea
+columned
+columner
+columniation
+columniferous
+columniform
+columning
+columnist
+columnistic
+columnists
+columnization
+columnize
+columnized
+columnizes
+columnizing
+columns
+columnwise
+colunar
+colure
+colures
+Colusa
+colusite
+Colutea
+colutea
+Colver
+Colvert
+Colville
+Colvin
+Colwell
+Colwen
+Colwich
+Colwin
+Colwyn
+coly
+colyba
+Colyer
+Colymbidae
+colymbiform
+colymbion
+Colymbriformes
+Colymbus
+colyone
+colyonic
+colytic
+colyum
+colyumist
+colza
+colzas
+COM
+Com
+Com.
+com
+com-
+com.
+coma
+comacine
+comade
+comae
+Comaetho
+comagistracy
+comagmatic
+comake
+comaker
+comakers
+comakes
+comaking
+comal
+comales
+comals
+comamie
+Coman
+comanage
+comanagement
+comanagements
+comanager
+comanagers
+Comanche
+comanche
+Comanchean
+comanchean
+Comanches
+comanches
+comandante
+comandantes
+comandanti
+Comandra
+Comaneci
+comanic
+comarca
+co-mart
+comart
+co-martyr
+Comarum
+comarum
+COMAS
+comas
+co-mate
+comate
+comates
+comatic
+comatik
+comatiks
+comatose
+comatosely
+comatoseness
+comatosity
+comatous
+comatula
+comatulae
+comatulid
+comb
+comb.
+combaron
+combasou
+combat
+combatable
+combatant
+combatants
+combated
+combater
+combaters
+combating
+combative
+combatively
+combativeness
+combativity
+combats
+combattant
+combattants
+combatted
+combatter
+combatting
+comb-back
+comb-broach
+comb-brush
+comb-building
+Combe
+combe
+Combe-Capelle
+Combe-capelle
+combed
+comber
+combers
+Combes
+combes
+combfish
+combfishes
+combflower
+comb-footed
+comb-grained
+combinability
+combinable
+combinableness
+combinably
+combinant
+combinantive
+combinate
+combination
+combinational
+combinations
+combinative
+combinator
+combinatorial
+combinatorially
+combinatoric
+combinatorics
+combinators
+combinatory
+combind
+combine
+combined
+combinedly
+combinedness
+combinement
+combiner
+combiners
+combines
+combing
+combings
+combining
+combite
+comble
+combless
+comblessness
+comblike
+combmaker
+combmaking
+combo
+comboloio
+combos
+comb-out
+comboy
+combre
+Combretaceae
+combretaceous
+Combretum
+Combs
+combs
+comb-shaped
+combure
+comburendo
+comburent
+comburgess
+comburimeter
+comburimetry
+comburivorous
+combust
+combusted
+combustibilities
+combustibility
+combustible
+combustibleness
+combustibles
+combustibly
+combusting
+combustion
+combustions
+combustious
+combustive
+combustively
+combustor
+combusts
+combwise
+combwright
+comby
+comd
+COMDEX
+comdg
+comdg.
+comdia
+Comdr
+Comdr.
+comdr
+Comdt
+Comdt.
+comdt
+come
+come-all-ye
+come-along
+come-at-ability
+come-at-able
+comeatable
+come-at-ableness
+come-back
+comeback
+comebacker
+comebacks
+come-between
+come-by-chance
+Comecon
+Comecrudo
+comeddle
+comedia
+comedial
+comedian
+comedians
+comediant
+comedic
+comedical
+comedically
+comedienne
+comediennes
+comedies
+comedietta
+comediettas
+comediette
+comedist
+comedo
+comedones
+comedos
+come-down
+comedown
+comedowns
+comedy
+come-hither
+come-hithery
+comelier
+comeliest
+comelily
+comeliness
+comeling
+comely
+comely-featured
+comendite
+comenic
+Comenius
+come-off
+come-on
+come-out
+come-outer
+comephorous
+Comer
+comer
+Comerio
+comers
+comes
+comessation
+comestible
+comestibles
+comestion
+comet
+cometaria
+cometarium
+cometary
+Cometes
+cometh
+comether
+comethers
+cometic
+cometical
+cometlike
+cometographer
+cometographical
+cometography
+cometoid
+cometology
+comets
+cometwise
+comeupance
+comeuppance
+comeuppances
+comfier
+comfiest
+comfily
+comfiness
+comfit
+comfits
+comfiture
+Comfort
+comfort
+comfortabilities
+comfortability
+comfortable
+comfortableness
+comfortably
+comfortation
+comfortative
+comforted
+Comforter
+comforter
+comforters
+comfortful
+comforting
+comfortingly
+comfortless
+comfortlessly
+comfortlessness
+comfortress
+comfortroot
+comforts
+Comfrey
+comfrey
+comfreys
+comfy
+Comiakin
+comic
+comical
+comicality
+comically
+comicalness
+comices
+comic-iambic
+comico-
+comicocratic
+comicocynical
+comicodidactic
+comicography
+comicoprosaic
+comicotragedy
+comicotragic
+comicotragical
+comicry
+comics
+Comid
+comida
+comiferous
+Comilla
+COMINCH
+Comines
+Cominform
+Cominformist
+cominformist
+cominformists
+coming
+coming-forth
+comingle
+coming-on
+comings
+comino
+Comins
+Comintern
+comintern
+comique
+comism
+Comiso
+Comitadji
+comitadji
+comital
+comitant
+comitatensian
+comitative
+comitatus
+comite
+comites
+comitia
+comitial
+comities
+Comitium
+comitiva
+comitje
+comitragedy
+comity
+comix
+coml
+COMM
+comm
+comm.
+comma
+Commack
+commaes
+Commager
+commaing
+command
+commandable
+commandant
+commandants
+commandatory
+commanded
+commandedness
+commandeer
+commandeered
+commandeering
+commandeers
+commander
+commanderies
+commanders
+commandership
+commandery
+commanding
+commandingly
+commandingness
+commandite
+commandless
+commandment
+commandments
+commando
+commandoes
+commandoman
+commandos
+commandress
+commandrie
+commandries
+commandry
+commands
+commark
+commas
+commassation
+commassee
+commata
+commaterial
+commatic
+commation
+commatism
+comme
+commeasurable
+commeasure
+commeasured
+commeasuring
+commeddle
+Commelina
+Commelinaceae
+commelinaceous
+commem
+commemorable
+commemorate
+commemorated
+commemorates
+commemorating
+commemoration
+commemorational
+commemorations
+commemorative
+commemoratively
+commemorativeness
+commemorator
+commemorators
+commemoratory
+commemorize
+commemorized
+commemorizing
+commence
+commenceable
+commenced
+commencement
+commencements
+commencer
+commences
+commencing
+commend
+commenda
+commendable
+commendableness
+commendably
+commendador
+commendam
+commendatary
+commendation
+commendations
+commendator
+commendatories
+commendatorily
+commendatory
+commended
+commender
+commending
+commendingly
+commendment
+commends
+commensal
+commensalism
+commensalist
+commensalistic
+commensality
+commensally
+commensals
+commensurability
+commensurable
+commensurableness
+commensurably
+commensurate
+commensurated
+commensurately
+commensurateness
+commensurating
+commensuration
+commensurations
+comment
+commentable
+commentarial
+commentarialism
+commentaries
+commentary
+commentate
+commentated
+commentating
+commentation
+commentative
+commentator
+commentatorial
+commentatorially
+commentators
+commentatorship
+commented
+commenter
+commenting
+commentitious
+comments
+Commerce
+commerce
+commerced
+commerceless
+commercer
+commerces
+commercia
+commerciable
+commercial
+commercialisation
+commercialise
+commercialised
+commercialising
+commercialism
+commercialist
+commercialistic
+commercialists
+commerciality
+commercialization
+commercializations
+commercialize
+commercialized
+commercializes
+commercializing
+commercially
+commercialness
+commercials
+commercing
+commercium
+commerge
+commers
+commesso
+commie
+commies
+commigration
+commilitant
+comminate
+comminated
+comminating
+commination
+comminative
+comminator
+comminatory
+Commines
+commingle
+commingled
+comminglement
+commingler
+commingles
+commingling
+comminister
+comminuate
+comminute
+comminuted
+comminuting
+comminution
+comminutor
+Commiphora
+commis
+commisce
+commise
+commiserable
+commiserate
+commiserated
+commiserates
+commiserating
+commiseratingly
+commiseration
+commiserations
+commiserative
+commiseratively
+commiserator
+Commiskey
+commissar
+commissarial
+commissariat
+commissariats
+commissaries
+commissars
+commissary
+commissaryship
+commission
+commissionaire
+commissional
+commissionary
+commissionate
+commissionated
+commissionating
+commissioned
+commissioner
+commissioner-general
+commissioners
+commissionership
+commissionerships
+commissioning
+commissions
+commissionship
+commissive
+commissively
+commissoria
+commissural
+commissure
+commissurotomies
+commissurotomy
+commistion
+commit
+commitment
+commitments
+commits
+committable
+committal
+committals
+committed
+committedly
+committedness
+committee
+committeeism
+committeeman
+committeemen
+committees
+committeeship
+committeewoman
+committeewomen
+committent
+committer
+committible
+committing
+committitur
+committment
+committor
+commix
+commixed
+commixes
+commixing
+commixt
+commixtion
+commixture
+commo
+commodata
+commodatary
+commodate
+commodation
+commodatum
+commode
+commoderate
+commodes
+commodious
+commodiously
+commodiousness
+commoditable
+commodities
+commodity
+commodore
+commodores
+Commodus
+commoigne
+commolition
+common
+commonable
+commonage
+commonalities
+commonality
+commonalties
+commonalty
+commonance
+commoned
+commonefaction
+commoner
+commoners
+commonership
+commonest
+commoney
+commoning
+commonish
+commonition
+commonize
+common-law
+commonly
+commonness
+commonplace
+commonplaceism
+commonplacely
+commonplaceness
+commonplacer
+commonplaces
+common-room
+Commons
+commons
+commonsense
+commonsensible
+commonsensibly
+commonsensical
+commonsensically
+commonty
+common-variety
+commonweal
+commonweals
+Commonwealth
+commonwealth
+commonwealthism
+commonwealths
+commorancies
+commorancy
+commorant
+commorient
+commorse
+commorth
+commos
+commot
+commote
+commotion
+commotional
+commotions
+commotive
+commove
+commoved
+commoves
+commoving
+commulation
+commulative
+communa
+communal
+communalisation
+communalise
+communalised
+communaliser
+communalising
+communalism
+communalist
+communalistic
+communality
+communalization
+communalize
+communalized
+communalizer
+communalizing
+communally
+Communard
+communard
+communbus
+Commune
+commune
+communed
+communer
+communes
+communicability
+communicable
+communicableness
+communicably
+communicant
+communicants
+communicate
+communicated
+communicatee
+communicates
+communicating
+communication
+communicational
+communications
+communicative
+communicatively
+communicativeness
+communicator
+communicators
+communicatory
+communing
+Communion
+communion
+communionable
+communional
+communionist
+communions
+communiqu
+communique
+communiques
+communis
+communisation
+communise
+communised
+communising
+communism
+Communist
+communist
+communisteries
+communistery
+communistic
+communistical
+communistically
+communists
+communital
+communitarian
+communitarianism
+communitary
+communities
+communitive
+communitorium
+community
+communitywide
+communization
+communize
+communized
+communizing
+commutability
+commutable
+commutableness
+commutant
+commutate
+commutated
+commutating
+commutation
+commutations
+commutative
+commutatively
+commutativity
+commutator
+commutators
+commute
+commuted
+commuter
+commuters
+commutes
+commuting
+commutual
+commutuality
+commy
+Comnenian
+Comnenus
+Como
+comodato
+comodo
+comoedia
+comoedus
+comoid
+comolecule
+comonomer
+comonte
+comoquer
+comorado
+Comorin
+comortgagee
+comose
+comourn
+comourner
+comournful
+comous
+Comox
+comp
+comp.
+compaa
+COMPACT
+compact
+compactability
+compactable
+compacted
+compactedly
+compactedness
+compacter
+compactest
+compactible
+compactification
+compactify
+compactile
+compacting
+compaction
+compactions
+compactly
+compactness
+compactnesses
+compactor
+compactors
+compacts
+compacture
+compadre
+compadres
+compage
+compages
+compaginate
+compagination
+Compagnie
+compagnie
+compagnies
+companable
+companage
+companator
+compander
+companero
+companeros
+compania
+companiable
+companias
+companied
+companies
+companion
+companionability
+companionable
+companionableness
+companionably
+companionage
+companionate
+companioned
+companioning
+companionize
+companionized
+companionizing
+companionless
+companions
+companionship
+companionships
+companionway
+companionways
+company
+companying
+companyless
+compar
+compar.
+comparability
+comparable
+comparableness
+comparably
+comparascope
+comparate
+comparatist
+comparatival
+comparative
+comparatively
+comparativeness
+comparatives
+comparativist
+comparator
+comparators
+comparcioner
+compare
+compared
+comparer
+comparers
+compares
+comparing
+comparison
+comparisons
+comparition
+comparograph
+comparsa
+compart
+comparted
+compartimenti
+compartimento
+comparting
+compartition
+compartment
+compartmental
+compartmentalization
+compartmentalize
+compartmentalized
+compartmentalizes
+compartmentalizing
+compartmentally
+compartmentation
+compartmented
+compartmentize
+compartments
+compartner
+comparts
+compass
+compassability
+compassable
+compassed
+compasser
+Compasses
+compasses
+compass-headed
+compassing
+compassion
+compassionable
+compassionate
+compassionated
+compassionately
+compassionateness
+compassionating
+compassionless
+compassions
+compassive
+compassivity
+compassless
+compassment
+compatability
+compatable
+compaternity
+compathy
+compatibilities
+compatibility
+compatible
+compatibleness
+compatibles
+compatibly
+compatience
+compatient
+compatriot
+compatriotic
+compatriotism
+compatriots
+Compazine
+compd
+compear
+compearance
+compearant
+comped
+compeer
+compeered
+compeering
+compeers
+compel
+compellability
+compellable
+compellably
+compellation
+compellative
+compelled
+compellent
+compeller
+compellers
+compelling
+compellingly
+compels
+compend
+compendency
+compendent
+compendia
+compendiary
+compendiate
+compendious
+compendiously
+compendiousness
+compendium
+compendiums
+compends
+compenetrate
+compenetration
+compensability
+compensable
+compensate
+compensated
+compensates
+compensating
+compensatingly
+compensation
+compensational
+compensations
+compensative
+compensatively
+compensativeness
+compensator
+compensators
+compensatory
+compense
+compenser
+compere
+compered
+comperes
+compering
+compert
+compesce
+compester
+compete
+competed
+competence
+competences
+competencies
+competency
+competent
+competently
+competentness
+competer
+competes
+competible
+competing
+competingly
+competition
+competitioner
+competitions
+competitive
+competitively
+competitiveness
+competitor
+competitors
+competitorship
+competitory
+competitress
+competitrix
+Compi
+Compiegne
+compilable
+compilation
+compilations
+compilator
+compilatory
+compile
+compileable
+compiled
+compilement
+compiler
+compilers
+compiles
+compiling
+comping
+compinge
+compital
+Compitalia
+compitum
+complacence
+complacences
+complacencies
+complacency
+complacent
+complacential
+complacentially
+complacently
+complain
+complainable
+complainant
+complainants
+complained
+complainer
+complainers
+complaining
+complainingly
+complainingness
+complains
+complaint
+complaintful
+complaintive
+complaintiveness
+complaints
+complaisance
+complaisant
+complaisantly
+complaisantness
+complanar
+complanate
+complanation
+complant
+compleat
+compleated
+complect
+complected
+complecting
+complection
+complects
+complement
+complemental
+complementally
+complementalness
+complementaries
+complementarily
+complementariness
+complementarism
+complementarity
+complementary
+complementation
+complementative
+complement-binding
+complemented
+complementer
+complementers
+complement-fixing
+complementing
+complementizer
+complementoid
+complements
+completable
+complete
+completed
+completedness
+completely
+completement
+completeness
+completenesses
+completer
+completers
+completes
+completest
+completing
+completion
+completions
+completive
+completively
+completories
+completory
+complex
+complexation
+complexed
+complexedness
+complexer
+complexes
+complexest
+complexification
+complexify
+complexing
+complexion
+complexionably
+complexional
+complexionally
+complexionary
+complexioned
+complexionist
+complexionless
+complexions
+complexities
+complexity
+complexive
+complexively
+complexly
+complexness
+complexometric
+complexometry
+complexus
+compliable
+compliableness
+compliably
+compliance
+compliances
+compliancies
+compliancy
+compliant
+compliantly
+complicacies
+complicacy
+complicant
+complicate
+complicated
+complicatedly
+complicatedness
+complicates
+complicating
+complication
+complications
+complicative
+complicator
+complicators
+complice
+complices
+complicities
+complicitous
+complicity
+complied
+complier
+compliers
+complies
+compliment
+complimentable
+complimental
+complimentally
+complimentalness
+complimentarily
+complimentariness
+complimentarity
+complimentary
+complimentation
+complimentative
+complimented
+complimenter
+complimenters
+complimenting
+complimentingly
+compliments
+complin
+compline
+complines
+complins
+complish
+complot
+complotment
+complots
+complotted
+complotter
+complotting
+Complutensian
+complutensian
+compluvia
+compluvium
+comply
+complying
+compo
+Compoboard
+compoed
+compoer
+compoing
+compole
+compone
+componed
+componency
+componendo
+component
+componental
+componented
+componential
+componentry
+components
+componentwise
+compony
+comport
+comportable
+comportance
+comported
+comporting
+comportment
+comportments
+comports
+compos
+composable
+composal
+Composaline
+composant
+compose
+composed
+composedly
+composedness
+composer
+composers
+composes
+composing
+composit
+composita
+Compositae
+compositae
+composite
+composite-built
+composited
+compositely
+compositeness
+composites
+compositing
+composition
+compositional
+compositionally
+compositions
+compositive
+compositively
+compositor
+compositorial
+compositors
+compositous
+compositure
+composograph
+compossibility
+compossible
+compost
+composted
+Compostela
+composting
+composts
+composture
+composure
+compot
+compotation
+compotationship
+compotator
+compotatory
+compote
+compotes
+compotier
+compotiers
+compotor
+compound
+compoundable
+compound-complex
+compounded
+compoundedness
+compounder
+compounders
+compounding
+compoundness
+compounds
+compound-wound
+comprachico
+comprachicos
+comprador
+compradore
+comprecation
+compreg
+compregnate
+comprehend
+comprehended
+comprehender
+comprehendible
+comprehending
+comprehendingly
+comprehends
+comprehense
+comprehensibility
+comprehensible
+comprehensibleness
+comprehensibly
+comprehension
+comprehensions
+comprehensive
+comprehensively
+comprehensiveness
+comprehensivenesses
+comprehensives
+comprehensor
+comprend
+compresbyter
+compresbyterial
+compresence
+compresent
+compress
+compressed
+compressedly
+compresses
+compressibilities
+compressibility
+compressible
+compressibleness
+compressibly
+compressing
+compressingly
+compression
+compressional
+compression-ignition
+compressions
+compressive
+compressively
+compressometer
+compressor
+compressors
+compressure
+comprest
+compriest
+comprint
+comprisable
+comprisal
+comprise
+comprised
+comprises
+comprising
+comprizable
+comprizal
+comprize
+comprized
+comprizes
+comprizing
+comprobate
+comprobation
+comproduce
+compromis
+compromisable
+compromise
+compromised
+compromiser
+compromisers
+compromises
+compromising
+compromisingly
+compromissary
+compromission
+compromissorial
+compromit
+compromitment
+compromitted
+compromitting
+comprovincial
+comps
+Compsilura
+Compsoa
+Compsognathus
+compsognathus
+Compsothlypidae
+compt
+Comptche
+Compte
+compte
+Comptean
+compted
+COMPTEL
+compter
+comptible
+comptie
+compting
+comptly
+comptness
+comptoir
+Comptom
+Comptometer
+comptometer
+Compton
+Compton-Burnett
+Comptonia
+comptonite
+comptrol
+comptroller
+comptrollers
+comptrollership
+compts
+compulsative
+compulsatively
+compulsatorily
+compulsatory
+compulse
+compulsed
+compulsion
+compulsions
+compulsitor
+compulsive
+compulsively
+compulsiveness
+compulsives
+compulsivity
+compulsorily
+compulsoriness
+compulsory
+compunct
+compunction
+compunctionary
+compunctionless
+compunctions
+compunctious
+compunctiously
+compunctive
+compupil
+compurgation
+compurgator
+compurgatorial
+compurgatory
+compursion
+computability
+computable
+computably
+computate
+computation
+computational
+computationally
+computations
+computative
+computatively
+computativeness
+compute
+computed
+computer
+computerese
+computerise
+computerite
+computerizable
+computerization
+computerize
+computerized
+computerizes
+computerizing
+computerlike
+computernik
+computers
+computes
+computing
+computist
+computus
+Comr
+Comr.
+comr
+comrade
+comrade-in-arms
+comradeliness
+comradely
+comradery
+comrades
+comradeship
+comradeships
+comrado
+Comras
+comrogue
+COMS
+coms
+COMSAT
+Comsat
+comsat
+Comsomol
+Comstock
+comstock
+comstockeries
+comstockery
+comsymp
+comsymps
+Comte
+comte
+comtemplate
+comtemplated
+comtemplates
+comtemplating
+comtes
+Comtesse
+comtesse
+comtesses
+Comtian
+comtian
+Comtism
+Comtist
+comunidad
+comurmurer
+Comus
+comus
+comvia
+Comyns
+Con
+Con.
+con
+con-
+con.
+conable
+conacaste
+conacre
+Conah
+Conakry
+Conal
+conal
+conalbumin
+Conall
+conamarin
+conamed
+Conan
+conand
+Conant
+Conard
+conarial
+conario-
+conarium
+Conasauga
+conation
+conational
+conationalistic
+conations
+conative
+conatural
+conatus
+Conaway
+conaxial
+conbinas
+conc
+conc.
+concactenated
+concamerate
+concamerated
+concameration
+Concan
+concanavalin
+concannon
+concaptive
+concarnation
+Concarneau
+concassation
+concatenary
+concatenate
+concatenated
+concatenates
+concatenating
+concatenation
+concatenations
+concatenator
+concatervate
+concaulescence
+concausal
+concause
+concavation
+concave
+concaved
+concavely
+concaveness
+concaver
+concaves
+concaving
+concavities
+concavity
+concavo
+concavo-
+concavo-concave
+concavo-convex
+conceal
+concealable
+concealed
+concealedly
+concealedness
+concealer
+concealers
+concealing
+concealingly
+concealment
+concealments
+conceals
+concede
+conceded
+concededly
+conceder
+conceders
+concedes
+conceding
+conceit
+conceited
+conceitedly
+conceitedness
+conceiting
+conceitless
+conceits
+conceity
+conceivability
+conceivable
+conceivableness
+conceivably
+conceive
+conceived
+conceiver
+conceivers
+conceives
+conceiving
+concelebrate
+concelebrated
+concelebrates
+concelebrating
+concelebration
+concelebrations
+concent
+concenter
+concentered
+concentering
+concentive
+concento
+concentralization
+concentralize
+concentrate
+concentrated
+concentrates
+concentrating
+concentration
+concentrations
+concentrative
+concentrativeness
+concentrator
+concentrators
+concentre
+concentred
+concentric
+concentrical
+concentrically
+concentricate
+concentricity
+concentring
+concents
+concentual
+concentus
+Concepci
+Concepcion
+concept
+conceptacle
+conceptacular
+conceptaculum
+conceptible
+conception
+conceptional
+conceptionist
+conceptions
+conceptism
+conceptive
+conceptiveness
+concepts
+conceptual
+conceptualisation
+conceptualise
+conceptualised
+conceptualising
+conceptualism
+conceptualist
+conceptualistic
+conceptualistically
+conceptualists
+conceptuality
+conceptualization
+conceptualizations
+conceptualize
+conceptualized
+conceptualizer
+conceptualizes
+conceptualizing
+conceptually
+conceptus
+concern
+concernancy
+concerned
+concernedly
+concernedness
+concerning
+concerningly
+concerningness
+concernment
+concerns
+concert
+concertante
+concertantes
+concertanti
+concertanto
+concertati
+concertation
+concertato
+concertatos
+concerted
+concertedly
+concertedness
+Concertgebouw
+concertgoer
+concerti
+concertina
+concertinas
+concerting
+concertini
+concertinist
+concertino
+concertinos
+concertion
+concertise
+concertised
+concertiser
+concertising
+concertist
+concertize
+concertized
+concertizer
+concertizes
+concertizing
+concertmaster
+concertmasters
+concertmeister
+concertment
+concerto
+concertos
+concerts
+concertstck
+concertstuck
+Concesio
+concessible
+concession
+concessionaire
+concessionaires
+concessional
+concessionaries
+concessionary
+concessioner
+concessionist
+concessions
+concessit
+concessive
+concessively
+concessiveness
+concessor
+concessory
+concetti
+Concettina
+concettism
+concettist
+concetto
+conch
+conch-
+Concha
+concha
+conchae
+conchal
+conchate
+conche
+conched
+concher
+conches
+conchfish
+conchfishes
+conchie
+conchies
+Conchifera
+conchiferous
+conchiform
+conchinin
+conchinine
+conchiolin
+Conchita
+conchite
+conchitic
+conchitis
+Concho
+concho
+Conchobar
+Conchobor
+conchoid
+conchoidal
+conchoidally
+conchoids
+conchol
+conchological
+conchologically
+conchologist
+conchologize
+conchology
+conchometer
+conchometry
+conchospiral
+Conchostraca
+conchotome
+conchs
+Conchubar
+Conchucu
+conchuela
+conchy
+conchyle
+conchylia
+conchyliated
+conchyliferous
+conchylium
+conciator
+concierge
+concierges
+concile
+conciliable
+conciliabule
+conciliabulum
+conciliar
+conciliarism
+conciliarly
+conciliate
+conciliated
+conciliates
+conciliating
+conciliatingly
+conciliation
+conciliationist
+conciliations
+conciliative
+conciliator
+conciliatorily
+conciliatoriness
+conciliators
+conciliatory
+concilium
+concinnate
+concinnated
+concinnating
+concinnities
+concinnity
+concinnous
+concinnously
+concio
+concion
+concional
+concionary
+concionate
+concionator
+concionatory
+conciousness
+concipiency
+concipient
+concise
+concisely
+conciseness
+concisenesses
+conciser
+concisest
+concision
+concitation
+concite
+concitizen
+conclamant
+conclamation
+conclave
+conclaves
+conclavist
+concludable
+conclude
+concluded
+concludence
+concludency
+concludendi
+concludent
+concludently
+concluder
+concluders
+concludes
+concludible
+concluding
+concludingly
+conclusible
+conclusion
+conclusional
+conclusionally
+conclusions
+conclusive
+conclusively
+conclusiveness
+conclusory
+conclusum
+concn
+concoagulate
+concoagulation
+concoct
+concocted
+concocter
+concocting
+concoction
+concoctions
+concoctive
+concoctor
+concocts
+Concoff
+concolor
+concolorous
+concolour
+concomitance
+concomitancy
+concomitant
+concomitantly
+concomitants
+concomitate
+concommitant
+concommitantly
+conconscious
+Conconully
+Concord
+concord
+concordable
+concordably
+concordal
+concordance
+concordancer
+concordances
+concordancy
+concordant
+concordantial
+concordantly
+concordat
+concordatory
+concordats
+concordatum
+Concorde
+concorder
+Concordia
+concordial
+concordist
+concordity
+concordly
+concords
+Concordville
+concorporate
+concorporated
+concorporating
+concorporation
+Concorrezanes
+concours
+concourse
+concourses
+concreate
+concredit
+concremation
+concrement
+concresce
+concrescence
+concrescences
+concrescent
+concrescible
+concrescive
+concrete
+concreted
+concretely
+concreteness
+concreter
+concretes
+concreting
+concretion
+concretional
+concretionary
+concretions
+concretism
+concretist
+concretive
+concretively
+concretization
+concretize
+concretized
+concretizing
+concretor
+concrew
+concrfsce
+concubinage
+concubinal
+concubinarian
+concubinaries
+concubinary
+concubinate
+concubine
+concubinehood
+concubines
+concubitancy
+concubitant
+concubitous
+concubitus
+conculcate
+conculcation
+concumbency
+concupiscence
+concupiscent
+concupiscible
+concupiscibleness
+concupy
+concur
+concurbit
+concurred
+concurrence
+concurrences
+concurrencies
+concurrency
+concurrent
+concurrently
+concurrentness
+concurring
+concurringly
+concurs
+concursion
+concurso
+concursus
+concuss
+concussant
+concussation
+concussed
+concusses
+concussing
+concussion
+concussional
+concussions
+concussive
+concussively
+concutient
+concyclic
+concyclically
+Cond
+cond
+Conda
+Condalia
+Condamine
+Conde
+condecent
+condemn
+condemnable
+condemnably
+condemnate
+condemnation
+condemnations
+condemnatory
+condemned
+condemner
+condemners
+condemning
+condemningly
+condemnor
+condemns
+condensability
+condensable
+condensance
+condensaries
+condensary
+condensate
+condensates
+condensation
+condensational
+condensations
+condensative
+condensator
+condense
+condensed
+condensedly
+condensedness
+condenser
+condenseries
+condensers
+condensery
+condenses
+condensible
+condensing
+condensity
+conder
+condescend
+condescended
+condescendence
+condescendent
+condescender
+condescending
+condescendingly
+condescendingness
+condescends
+condescension
+condescensions
+condescensive
+condescensively
+condescensiveness
+condescent
+condiction
+condictious
+condiddle
+condiddled
+condiddlement
+condiddling
+condign
+condigness
+condignity
+condignly
+condignness
+Condillac
+condiment
+condimental
+condimentary
+condiments
+condisciple
+condistillation
+Condit
+condite
+condition
+conditionable
+conditional
+conditionalism
+conditionalist
+conditionalities
+conditionality
+conditionalize
+conditionally
+conditionals
+conditionate
+conditione
+conditioned
+conditioner
+conditioners
+conditioning
+conditions
+condititivia
+conditivia
+conditivium
+conditoria
+conditorium
+conditory
+conditotoria
+condivision
+condo
+condoes
+condog
+condolatory
+condole
+condoled
+condolement
+condolence
+condolences
+condolent
+condoler
+condolers
+condoles
+condoling
+condolingly
+condom
+condominate
+condominial
+condominiia
+condominiiums
+condominium
+condominiums
+condoms
+Condon
+condonable
+condonance
+condonation
+condonations
+condonative
+condone
+condoned
+condonement
+condoner
+condoners
+condones
+condoning
+condor
+Condorcet
+condores
+condors
+condos
+condottiere
+condottieri
+conduce
+conduceability
+conduced
+conducement
+conducent
+conducer
+conducers
+conduces
+conducible
+conducibleness
+conducibly
+conducing
+conducingly
+conducive
+conduciveness
+conduct
+conducta
+conductance
+conductances
+conducted
+conductibility
+conductible
+conductility
+conductimeter
+conductimetric
+conducting
+conductio
+conduction
+conductional
+conductions
+conductitious
+conductive
+conductively
+conductivities
+conductivity
+conduct-money
+conductometer
+conductometric
+conductor
+conductorial
+conductorless
+conductors
+conductorship
+conductory
+conductress
+conducts
+conductus
+condue
+conduit
+conduits
+conduplicate
+conduplicated
+conduplication
+condurangin
+condurango
+condurrite
+condylar
+condylarth
+Condylarthra
+condylarthrosis
+condylarthrous
+condyle
+condylectomy
+condyles
+condylion
+condyloid
+condyloma
+condylomas
+condylomata
+condylomatous
+condylome
+condylopod
+Condylopoda
+condylopodous
+condylos
+condylotomy
+Condylura
+condylura
+condylure
+cone
+cone-billed
+coned
+coneen
+coneflower
+Conehatta
+conehead
+cone-headed
+coneighboring
+cone-in-cone
+coneine
+Conejos
+conelet
+conelike
+Conelrad
+conelrad
+conelrads
+conemaker
+conemaking
+Conemaugh
+conenchyma
+cone-nose
+conenose
+conenoses
+conepate
+conepates
+conepatl
+conepatls
+coner
+cones
+cone-shaped
+conessine
+Conestee
+Conestoga
+conestoga
+Conesus
+Conesville
+Conetoe
+Coney
+coney
+coneys
+conf
+conf.
+confab
+confabbed
+confabbing
+confabs
+confabular
+confabulate
+confabulated
+confabulates
+confabulating
+confabulation
+confabulations
+confabulator
+confabulatory
+confact
+confarreate
+confarreated
+confarreation
+confated
+confect
+confected
+confecting
+confection
+confectionaries
+confectionary
+confectioner
+confectioneries
+confectioners
+confectionery
+confectiones
+confections
+confectory
+confects
+confecture
+Confed
+confeder
+confederacies
+Confederacy
+confederacy
+confederal
+confederalist
+Confederate
+confederate
+confederated
+confederater
+confederates
+confederating
+confederatio
+Confederation
+confederation
+confederationism
+confederationist
+confederations
+confederatism
+confederative
+confederatize
+confederator
+confelicity
+confer
+conferee
+conferees
+conference
+conferences
+conferencing
+conferential
+conferment
+conferrable
+conferral
+conferred
+conferree
+conferrence
+conferrer
+conferrers
+conferring
+conferruminate
+confers
+conferted
+Conferva
+conferva
+Confervaceae
+confervaceous
+confervae
+conferval
+Confervales
+confervalike
+confervas
+confervoid
+Confervoideae
+confervous
+confess
+confessable
+confessant
+confessarius
+confessary
+confessed
+confessedly
+confesser
+confesses
+confessing
+confessingly
+confession
+confessional
+confessionalian
+confessionalism
+confessionalist
+confessionally
+confessionals
+confessionaries
+confessionary
+confessionist
+confessions
+confessor
+confessors
+confessorship
+confessory
+confest
+confetti
+confetto
+conficient
+confidant
+confidante
+confidantes
+confidants
+confide
+confided
+confidence
+confidences
+confidency
+confident
+confidente
+confidential
+confidentiality
+confidentially
+confidentialness
+confidentiary
+confidently
+confidentness
+confider
+confiders
+confides
+confiding
+confidingly
+confidingness
+configurable
+configural
+configurate
+configurated
+configurating
+configuration
+configurational
+configurationally
+configurationism
+configurationist
+configurations
+configurative
+configure
+configured
+configures
+configuring
+confinable
+confine
+confineable
+confined
+confinedly
+confinedness
+confineless
+confinement
+confinements
+confiner
+confiners
+confines
+confining
+confinity
+confirm
+confirmability
+confirmable
+confirmand
+confirmation
+confirmational
+confirmations
+confirmative
+confirmatively
+confirmatorily
+confirmatory
+confirmed
+confirmedly
+confirmedness
+confirmee
+confirmer
+confirming
+confirmingly
+confirmity
+confirmment
+confirmor
+confirms
+confiscable
+confiscatable
+confiscate
+confiscated
+confiscates
+confiscating
+confiscation
+confiscations
+confiscator
+confiscators
+confiscatory
+confiserie
+confisk
+confisticating
+confit
+confitent
+Confiteor
+confiteor
+confiture
+confix
+confixed
+confixing
+conflab
+conflagrant
+conflagrate
+conflagrated
+conflagrating
+conflagration
+conflagrations
+conflagrative
+conflagrator
+conflagratory
+conflate
+conflated
+conflates
+conflating
+conflation
+conflexure
+conflict
+conflicted
+conflictful
+conflicting
+conflictingly
+confliction
+conflictive
+conflictless
+conflictory
+conflicts
+conflictual
+conflow
+Confluence
+confluence
+confluences
+confluent
+confluently
+conflux
+confluxes
+confluxibility
+confluxible
+confluxibleness
+confocal
+confocally
+conforbably
+conform
+conformability
+conformable
+conformableness
+conformably
+conformal
+conformance
+conformant
+conformate
+conformation
+conformational
+conformationally
+conformations
+conformator
+conformed
+conformer
+conformers
+conforming
+conformingly
+conformism
+conformist
+conformists
+conformities
+conformity
+conforms
+confort
+confound
+confoundable
+confounded
+confoundedly
+confoundedness
+confounder
+confounders
+confounding
+confoundingly
+confoundment
+confounds
+confr
+confract
+confraction
+confragose
+confrater
+confraternal
+confraternities
+confraternity
+confraternization
+confrere
+confreres
+confrerie
+confriar
+confricamenta
+confricamentum
+confrication
+confront
+confrontal
+confrontation
+confrontational
+confrontationism
+confrontationist
+confrontations
+confronte
+confronted
+confronter
+confronters
+confronting
+confrontment
+confronts
+Confucian
+confucian
+Confucianism
+confucianism
+Confucianist
+confucians
+Confucius
+confucius
+confusability
+confusable
+confusably
+confuse
+confused
+confusedly
+confusedness
+confuser
+confusers
+confuses
+confusing
+confusingly
+confusion
+confusional
+confusions
+confusive
+confusticate
+confustication
+confutability
+confutable
+confutation
+confutations
+confutative
+confutator
+confute
+confuted
+confuter
+confuters
+confutes
+confuting
+Cong
+Cong.
+cong
+cong.
+conga
+congaed
+congaing
+congas
+Congdon
+conge
+congeable
+congeal
+congealability
+congealable
+congealableness
+congealed
+congealedness
+congealer
+congealing
+congealment
+congeals
+conged
+congee
+congeed
+congeeing
+congees
+congeing
+congelation
+congelative
+congelifract
+congelifraction
+congeliturbate
+congeliturbation
+congenator
+congener
+congeneracy
+congeneric
+congenerical
+congenerous
+congenerousness
+congeners
+congenetic
+congenial
+congenialities
+congeniality
+congenialize
+congenially
+congenialness
+congenital
+congenitally
+congenitalness
+congenite
+congeon
+Conger
+conger
+congeree
+conger-eel
+congerie
+congeries
+Congers
+congers
+Congerville
+congery
+conges
+congession
+congest
+congested
+congestedness
+congestible
+congesting
+congestion
+congestions
+congestive
+congests
+congestus
+congiaries
+congiary
+congii
+congius
+conglaciate
+conglobate
+conglobated
+conglobately
+conglobating
+conglobation
+conglobe
+conglobed
+conglobes
+conglobing
+conglobulate
+conglomerate
+conglomerated
+conglomerates
+conglomeratic
+conglomerating
+conglomeration
+conglomerations
+conglomerative
+conglomerator
+conglomeritic
+conglutin
+conglutinant
+conglutinate
+conglutinated
+conglutinating
+conglutination
+conglutinative
+conglution
+Congo
+congo
+congoes
+Congoese
+Congolese
+congolese
+Congoleum
+Congonhas
+congoni
+congos
+congou
+congous
+congrats
+congratulable
+congratulant
+congratulate
+congratulated
+congratulates
+congratulating
+congratulation
+congratulational
+congratulations
+congratulator
+congratulatory
+congredient
+congree
+congreet
+congregable
+congreganist
+congregant
+congregants
+congregate
+congregated
+congregates
+congregating
+congregation
+congregational
+Congregationalism
+congregationalism
+Congregationalist
+congregationalist
+congregationalists
+congregationalize
+congregationally
+Congregationer
+congregationist
+congregations
+congregative
+congregativeness
+congregator
+congresional
+Congreso
+Congress
+congress
+congressed
+congresser
+congresses
+congressing
+congressional
+congressionalist
+congressionally
+congressionist
+congressist
+congressive
+Congressman
+congressman
+congressman-at-large
+congressmen
+congressmen-at-large
+Congresso
+congresswoman
+congresswomen
+Congreve
+congreve
+congrid
+Congridae
+congrio
+congroid
+congrue
+congruence
+congruences
+congruencies
+congruency
+congruent
+congruential
+congruently
+congruism
+congruist
+congruistic
+congruities
+congruity
+congruous
+congruously
+congruousness
+congustable
+conhydrin
+conhydrine
+coni
+conia
+Coniacian
+Coniah
+Conias
+conic
+conical
+conicality
+conically
+conicalness
+conical-shaped
+conicein
+coniceine
+conichalcite
+conicine
+conicities
+conicity
+conicle
+conico-
+conico-cylindrical
+conico-elongate
+conico-hemispherical
+conicoid
+conico-ovate
+conico-ovoid
+conicopoly
+conico-subhemispherical
+conico-subulate
+conics
+Conidae
+conidia
+conidial
+conidian
+conidiiferous
+conidioid
+conidiophore
+conidiophorous
+conidiospore
+conidium
+conies
+conifer
+Coniferae
+coniferin
+coniferophyte
+coniferous
+conifers
+conification
+coniform
+coniine
+coniines
+Conilurus
+conima
+conimene
+conin
+conine
+conines
+coning
+coninidia
+conins
+Coniogramme
+coniology
+coniomycetes
+Coniophora
+Coniopterygidae
+Conioselinum
+conioses
+coniosis
+coniospermous
+Coniothyrium
+coniroster
+conirostral
+Conirostres
+conisance
+conite
+Conium
+conium
+coniums
+conj
+conj.
+conject
+conjective
+conjecturable
+conjecturableness
+conjecturably
+conjectural
+conjecturalist
+conjecturality
+conjecturally
+conjecture
+conjectured
+conjecturer
+conjectures
+conjecturing
+conjee
+conjegates
+conjobble
+conjoin
+conjoined
+conjoinedly
+conjoiner
+conjoining
+conjoins
+conjoint
+conjointly
+conjointment
+conjointness
+conjoints
+conjon
+conjubilant
+conjuctiva
+conjugable
+conjugably
+conjugacy
+conjugal
+Conjugales
+conjugality
+conjugally
+conjugant
+conjugata
+Conjugatae
+conjugate
+conjugated
+conjugately
+conjugateness
+conjugates
+conjugating
+conjugation
+conjugational
+conjugationally
+conjugations
+conjugative
+conjugato-
+conjugato-palmate
+conjugato-pinnate
+conjugator
+conjugators
+conjugial
+conjugium
+conjunct
+conjuncted
+conjunction
+conjunctional
+conjunctionally
+conjunction-reduction
+conjunctions
+conjunctiva
+conjunctivae
+conjunctival
+conjunctivas
+conjunctive
+conjunctively
+conjunctiveness
+conjunctives
+conjunctivitis
+conjunctly
+conjuncts
+conjunctur
+conjunctural
+conjuncture
+conjunctures
+conjuration
+conjurations
+conjurator
+conjure
+conjured
+conjurement
+conjurer
+conjurers
+conjurership
+conjures
+conjuring
+conjurison
+conjuror
+conjurors
+conjury
+conk
+conkanee
+conked
+conker
+conkers
+conking
+Conklin
+conks
+conky
+Conlan
+Conlee
+Conlen
+Conley
+conli
+Conlin
+Conlon
+CONN
+Conn
+Conn.
+conn
+connach
+Connacht
+connaisseur
+Connally
+Connaraceae
+connaraceous
+connarite
+Connarus
+connascency
+connascent
+connatal
+connate
+connately
+connateness
+connate-perfoliate
+connation
+connatural
+connaturality
+connaturalize
+connaturally
+connaturalness
+connature
+Connaught
+connaught
+Conneaut
+Conneautville
+connect
+connectable
+connectant
+connected
+connectedly
+connectedness
+connecter
+connecters
+connectibility
+connectible
+connectibly
+Connecticut
+connecticut
+connecting
+connection
+connectional
+connectionism
+connectionless
+connections
+connectival
+connective
+connectively
+connectives
+connectivity
+connector
+connectors
+connects
+conned
+Connee
+Connel
+Connell
+Connelley
+connellite
+Connellsville
+Connelly
+Connemara
+Conner
+conner
+Conners
+conners
+Connersville
+Connerville
+Connett
+connex
+connexes
+connexion
+connexional
+connexionalism
+connexities
+connexity
+connexiva
+connexive
+connexivum
+connexure
+connexus
+Conney
+Conni
+Connie
+connie
+connies
+conning
+conniption
+conniptions
+connivance
+connivances
+connivancy
+connivant
+connivantly
+connive
+connived
+connivence
+connivent
+connivently
+conniver
+connivers
+connivery
+connives
+conniving
+connivingly
+connixation
+Connochaetes
+connoissance
+connoisseur
+connoisseurs
+connoisseurship
+Connolly
+Connor
+Connors
+connotate
+connotation
+connotational
+connotations
+connotative
+connotatively
+connote
+connoted
+connotes
+connoting
+connotive
+connotively
+conns
+connu
+connubial
+connubialism
+connubiality
+connubially
+connubiate
+connubium
+connumerate
+connumeration
+connusable
+Conny
+conny
+conocarp
+Conocarpus
+Conocephalum
+Conocephalus
+conoclinium
+conocuneus
+conodont
+conodonts
+conoid
+conoidal
+conoidally
+conoidic
+conoidical
+conoidically
+conoido-hemispherical
+conoido-rotundate
+conoids
+Conolophus
+co-nominee
+conominee
+Conon
+cononintelligent
+Conopholis
+conopid
+Conopidae
+conoplain
+conopodium
+Conopophaga
+Conopophagidae
+Conor
+Conorhinus
+conormal
+conoscente
+conoscenti
+conoscope
+conoscopic
+conourish
+Conover
+Conowingo
+Conoy
+conphaseolin
+conplane
+conquassate
+conquedle
+conquer
+conquerable
+conquerableness
+conquered
+conquerer
+conquerers
+conqueress
+conquering
+conqueringly
+conquerment
+Conqueror
+conqueror
+conquerors
+conquers
+Conquest
+conquest
+conquests
+conquian
+conquians
+conquinamine
+conquinine
+conquisition
+conquistador
+conquistadores
+conquistadors
+Conrad
+Conrade
+Conrado
+Conrail
+conrail
+Conral
+Conran
+Conrath
+conrector
+conrectorship
+conred
+conrey
+Conringia
+Conroe
+Conroy
+CONS
+Cons
+Cons.
+cons
+cons.
+consacre
+Consalve
+consanguine
+consanguineal
+consanguinean
+consanguineous
+consanguineously
+consanguinities
+consanguinity
+consarcinate
+consarn
+consarned
+conscience
+conscienceless
+consciencelessly
+consciencelessness
+conscience-proof
+consciences
+conscience-smitten
+conscience-stricken
+conscience-striken
+consciencewise
+conscient
+conscientious
+conscientiously
+conscientiousness
+conscionable
+conscionableness
+conscionably
+conscious
+consciously
+consciousness
+consciousnesses
+consciousness-expanding
+consciousness-expansion
+conscive
+conscribe
+conscribed
+conscribing
+conscript
+conscripted
+conscripting
+conscription
+conscriptional
+conscriptionist
+conscriptions
+conscriptive
+conscripts
+conscripttion
+consderations
+consecrate
+consecrated
+consecratedness
+consecrater
+consecrates
+consecrating
+Consecration
+consecration
+consecrations
+consecrative
+consecrator
+consecratory
+consectary
+consecute
+consecution
+consecutive
+consecutively
+consecutiveness
+consecutives
+consence
+consenescence
+consenescency
+consension
+consensual
+consensually
+consensus
+consensuses
+consent
+consentable
+consentaneity
+consentaneous
+consentaneously
+consentaneousness
+consentant
+consented
+consenter
+consenters
+consentful
+consentfully
+consentience
+consentient
+consentiently
+consenting
+consentingly
+consentingness
+consentive
+consentively
+consentment
+consents
+consequence
+consequences
+consequency
+consequent
+consequential
+consequentialities
+consequentiality
+consequentially
+consequentialness
+consequently
+consequents
+consertal
+consertion
+conservable
+conservacy
+conservancies
+conservancy
+conservant
+conservate
+conservation
+conservational
+conservationism
+conservationist
+conservationists
+conservations
+Conservatism
+conservatism
+conservatisms
+conservatist
+Conservative
+conservative
+conservatively
+conservativeness
+conservatives
+conservatize
+conservatoire
+conservatoires
+conservator
+conservatorial
+conservatories
+conservatorio
+conservatorium
+conservators
+conservatorship
+conservatory
+conservatrix
+conserve
+conserved
+conserver
+conservers
+conserves
+conserving
+Consett
+Conshohocken
+consider
+considerability
+considerable
+considerableness
+considerably
+considerance
+considerate
+considerately
+considerateness
+consideratenesses
+consideration
+considerations
+considerative
+consideratively
+considerativeness
+considerator
+considered
+considerer
+considering
+consideringly
+considers
+consign
+consignable
+consignataries
+consignatary
+consignation
+consignatory
+consigne
+consigned
+consignee
+consignees
+consigneeship
+consigner
+consignificant
+consignificate
+consignification
+consignificative
+consignificator
+consignified
+consignify
+consignifying
+consigning
+consignment
+consignments
+consignor
+consignors
+consigns
+consiliary
+consilience
+consilient
+consimilar
+consimilarity
+consimilate
+consimilated
+consimilating
+consimile
+consisently
+consist
+consisted
+consistence
+consistences
+consistencies
+consistency
+consistent
+consistently
+consistible
+consisting
+consistorial
+consistorian
+consistories
+consistory
+consists
+consition
+consitutional
+consociate
+consociated
+consociating
+consociation
+consociational
+consociationism
+consociative
+consocies
+consol
+consolable
+consolableness
+consolably
+Consolamentum
+consolan
+Consolata
+consolate
+consolation
+consolations
+Consolato
+consolator
+consolatorily
+consolatoriness
+consolatory
+consolatrix
+console
+consoled
+consolement
+consoler
+consolers
+consoles
+consolette
+consolidant
+consolidate
+consolidated
+consolidates
+consolidating
+consolidation
+consolidationist
+consolidations
+consolidative
+consolidator
+consolidators
+consoling
+consolingly
+consolitorily
+consolitoriness
+consols
+consolute
+consomm
+consomme
+consommes
+consonance
+consonances
+consonancy
+consonant
+consonantal
+consonantalize
+consonantalized
+consonantalizing
+consonantally
+consonantic
+consonantise
+consonantised
+consonantising
+consonantism
+consonantize
+consonantized
+consonantizing
+consonantly
+consonantness
+consonants
+consonate
+consonous
+consopite
+consort
+consortable
+consorted
+consorter
+consortia
+consortial
+consorting
+consortion
+consortism
+consortitia
+consortium
+consortiums
+consorts
+consortship
+consoude
+consound
+conspecies
+conspecific
+conspecifics
+conspect
+conspection
+conspectuity
+conspectus
+conspectuses
+consperg
+consperse
+conspersion
+conspicuity
+conspicuous
+conspicuously
+conspicuousness
+conspiracies
+conspiracy
+conspirant
+conspiration
+conspirational
+conspirative
+conspirator
+conspiratorial
+conspiratorially
+conspirators
+conspiratory
+conspiratress
+conspire
+conspired
+conspirer
+conspirers
+conspires
+conspiring
+conspiringly
+conspissate
+conspue
+conspurcate
+Const
+const
+Constable
+constable
+constablery
+constables
+constableship
+constabless
+Constableville
+constablewick
+constabular
+constabularies
+constabulary
+Constance
+constance
+constances
+Constancia
+constancies
+Constancy
+constancy
+Constant
+constant
+Constanta
+constantan
+Constantia
+Constantin
+Constantina
+Constantine
+Constantinian
+constantinian
+Constantino
+Constantinople
+constantinople
+Constantinopolitan
+constantinopolitan
+constantly
+constantness
+constants
+constat
+constatation
+constatations
+constate
+constative
+constatory
+constellate
+constellated
+constellating
+constellation
+constellations
+constellatory
+conster
+consternate
+consternated
+consternating
+consternation
+consternations
+constipate
+constipated
+constipates
+constipating
+constipation
+constipations
+constituencies
+constituency
+constituent
+constituently
+constituents
+constitute
+constituted
+constituter
+constitutes
+constituting
+constitution
+constitutional
+constitutionalism
+constitutionalist
+constitutionality
+constitutionalization
+constitutionalize
+constitutionally
+constitutionals
+constitutionary
+constitutioner
+constitutionist
+constitutionless
+constitutions
+constitutive
+constitutively
+constitutiveness
+constitutor
+constr
+constr.
+constrain
+constrainable
+constrained
+constrainedly
+constrainedness
+constrainer
+constrainers
+constraining
+constrainingly
+constrainment
+constrains
+constraint
+constraints
+constrict
+constricted
+constricting
+constriction
+constrictions
+constrictive
+constrictor
+constrictors
+constricts
+constringe
+constringed
+constringency
+constringent
+constringing
+construability
+construable
+construal
+construct
+constructable
+constructed
+constructer
+constructibility
+constructible
+constructing
+construction
+constructional
+constructionally
+constructionism
+constructionist
+constructionists
+constructions
+constructive
+constructively
+constructiveness
+Constructivism
+constructivism
+Constructivist
+constructivist
+constructor
+constructors
+constructorship
+constructs
+constructure
+construe
+construed
+construer
+construers
+construes
+construing
+constuctor
+constuprate
+constupration
+consubsist
+consubsistency
+consubstantial
+consubstantialism
+consubstantialist
+consubstantiality
+consubstantially
+consubstantiate
+consubstantiated
+consubstantiating
+consubstantiation
+consubstantiationist
+consubstantive
+Consuela
+Consuelo
+consuete
+consuetitude
+consuetude
+consuetudinal
+consuetudinary
+consul
+consulage
+consular
+consularity
+consulary
+consulate
+consulated
+consulates
+consulating
+consuls
+consulship
+consulships
+consult
+consulta
+consultable
+consultancy
+consultant
+consultants
+consultantship
+consultary
+consultation
+consultations
+consultative
+consultatively
+consultatory
+consulted
+consultee
+consulter
+consulting
+consultive
+consultively
+consulto
+consultor
+consultory
+consults
+consumable
+consumables
+consumate
+consumated
+consumating
+consumation
+consume
+consumed
+consumedly
+consumeless
+consumer
+consumerism
+consumerist
+consumers
+consumership
+consumes
+consuming
+consumingly
+consumingness
+consummate
+consummated
+consummately
+consummates
+consummating
+consummation
+consummations
+consummative
+consummatively
+consummativeness
+consummator
+consummatory
+consumo
+consumpt
+consumpted
+consumptible
+consumption
+consumptional
+consumptions
+consumptive
+consumptively
+consumptiveness
+consumptives
+consumptivity
+Consus
+consute
+consy
+Cont
+cont
+cont.
+contabescence
+contabescent
+CONTAC
+contact
+contactant
+contacted
+contactile
+contacting
+contaction
+contactor
+contacts
+contactual
+contactually
+contadino
+contaggia
+contagia
+contagion
+contagioned
+contagionist
+contagions
+contagiosity
+contagious
+contagiously
+contagiousness
+contagium
+contain
+containable
+contained
+containedly
+container
+containerboard
+containerization
+containerize
+containerized
+containerizes
+containerizing
+containerport
+containers
+containership
+containerships
+containing
+containment
+containments
+contains
+contakia
+contakion
+contakionkia
+contam
+contaminable
+contaminant
+contaminants
+contaminate
+contaminated
+contaminates
+contaminating
+contamination
+contaminations
+contaminative
+contaminator
+contaminous
+contangential
+contango
+contangoes
+contangos
+contchar
+contd
+contd.
+Conte
+conte
+conteck
+conte-crayon
+contect
+contection
+contek
+conteke
+contemn
+contemned
+contemner
+contemnible
+contemnibly
+contemning
+contemningly
+contemnor
+contemns
+contemp
+contemp.
+contemper
+contemperate
+contemperature
+contemplable
+contemplamen
+contemplance
+contemplant
+contemplate
+contemplated
+contemplatedly
+contemplates
+contemplating
+contemplatingly
+contemplation
+contemplations
+contemplatist
+contemplative
+contemplatively
+contemplativeness
+contemplator
+contemplators
+contemplature
+contemple
+contemporanean
+contemporaneity
+contemporaneous
+contemporaneously
+contemporaneousness
+contemporaries
+contemporarily
+contemporariness
+contemporary
+contemporise
+contemporised
+contemporising
+contemporize
+contemporized
+contemporizing
+contempt
+contemptful
+contemptibility
+contemptible
+contemptibleness
+contemptibly
+contempts
+contemptuous
+contemptuously
+contemptuousness
+contend
+contended
+contendent
+contender
+contendere
+contenders
+contending
+contendingly
+contendress
+contends
+contenement
+content
+contentable
+contentation
+contented
+contentedly
+contentedness
+contentednesses
+contentful
+contenting
+contention
+contentional
+contentions
+contentious
+contentiously
+contentiousness
+contentless
+contently
+contentment
+contentments
+contentness
+contents
+contenu
+conter
+conterminable
+conterminal
+conterminant
+conterminate
+contermine
+conterminous
+conterminously
+conterminousness
+conterraneous
+contes
+contessa
+contesseration
+contest
+contestability
+contestable
+contestableness
+contestably
+contestant
+contestants
+contestate
+contestation
+contested
+contestee
+contester
+contesters
+contesting
+contestingly
+contestless
+contests
+conteur
+contex
+context
+contextive
+contexts
+contextual
+contextualize
+contextually
+contextural
+contexture
+contextured
+contg
+Conti
+conticent
+contignate
+contignation
+contiguate
+contiguities
+contiguity
+contiguous
+contiguously
+contiguousness
+contin
+continence
+continences
+continency
+Continent
+continent
+Continental
+continental
+Continentaler
+continentalism
+continentalist
+continentality
+Continentalize
+continentally
+continentals
+continently
+continents
+continent-wide
+contineu
+contingence
+contingencies
+contingency
+contingent
+contingential
+contingentialness
+contingentiam
+contingently
+contingentness
+contingents
+continua
+continuable
+continual
+continuality
+continually
+continualness
+continuance
+continuances
+continuancy
+continuando
+continuant
+continuantly
+continuate
+continuately
+continuateness
+continuation
+continuations
+continuative
+continuatively
+continuativeness
+continuator
+continue
+continued
+continuedly
+continuedness
+continuer
+continuers
+continues
+continuing
+continuingly
+continuist
+continuities
+continuity
+continuo
+continuos
+continuous
+continuousities
+continuousity
+continuously
+continuousness
+continuua
+continuum
+continuums
+contise
+cont-line
+contline
+conto
+contoid
+contoise
+Contoocook
+contorniate
+contorniates
+contorno
+contorsion
+contorsive
+contort
+contorta
+Contortae
+contorted
+contortedly
+contortedness
+contorting
+contortion
+contortional
+contortionate
+contortioned
+contortionist
+contortionistic
+contortionists
+contortions
+contortive
+contortively
+contorts
+contortuplicate
+contos
+contour
+contoured
+contouring
+contourne
+contours
+contr
+contr.
+contra
+contra-
+contra-acting
+contra-approach
+contraband
+contrabandage
+contrabandery
+contrabandism
+contrabandist
+contrabandista
+contrabands
+contrabass
+contrabassist
+contrabasso
+contrabassoon
+contrabassoonist
+contracapitalist
+contraception
+contraceptionist
+contraceptions
+contraceptive
+contraceptives
+contracivil
+contraclockwise
+contract
+contractable
+contractant
+contractation
+contracted
+contractedly
+contractedness
+contractee
+contracter
+contractibility
+contractible
+contractibleness
+contractibly
+contractile
+contractility
+contracting
+contraction
+contractional
+contractionist
+contractions
+contractive
+contractively
+contractiveness
+contractly
+contractor
+contractors
+contracts
+contractu
+contractual
+contractually
+contracture
+contractured
+contractus
+contracyclical
+contrada
+contra-dance
+contradance
+contrade
+contradebt
+contradict
+contradictable
+contradicted
+contradictedness
+contradicter
+contradicting
+contradiction
+contradictional
+contradictions
+contradictious
+contradictiously
+contradictiousness
+contradictive
+contradictively
+contradictiveness
+contradictor
+contradictories
+contradictorily
+contradictoriness
+contradictory
+contradicts
+contradiscriminate
+contradistinct
+contradistinction
+contradistinctions
+contradistinctive
+contradistinctively
+contradistinctly
+contradistinguish
+contradivide
+contrafacture
+contrafagotto
+contrafissura
+contrafissure
+contraflexure
+contraflow
+contrafocal
+contragredience
+contragredient
+contrahent
+contrail
+contrails
+contra-indicant
+contraindicant
+contra-indicate
+contraindicate
+contraindicated
+contraindicates
+contraindicating
+contra-indication
+contraindication
+contraindications
+contraindicative
+contra-ion
+contrair
+contraire
+contralateral
+contra-lode
+contralti
+contralto
+contraltos
+contramarque
+contramure
+contranatural
+contrantiscion
+contraoctave
+contraorbital
+contraorbitally
+contraparallelogram
+contrapletal
+contraplete
+contraplex
+contrapolarization
+contrapone
+contraponend
+Contraposaune
+contrapose
+contraposed
+contraposing
+contraposit
+contraposita
+contraposition
+contrapositive
+contrapositives
+contrapposto
+contrappostos
+contraprogressist
+contraprop
+contraproposal
+contraprops
+contraprovectant
+contraption
+contraptions
+contraptious
+contrapuntal
+contrapuntalist
+contrapuntally
+contrapuntist
+contrapunto
+contrarational
+contraregular
+contraregularity
+contra-related
+contraremonstrance
+contra-remonstrant
+contraremonstrant
+contrarevolutionary
+contrariant
+contrariantly
+contraries
+contrarieties
+contrariety
+contrarily
+contrariness
+contrarious
+contrariously
+contrariousness
+contrariwise
+contra-rotation
+contrarotation
+contrary
+contrary-minded
+contras
+contrascriptural
+contrast
+contrastable
+contrastably
+contraste
+contrasted
+contrastedly
+contraster
+contrasters
+contrastimulant
+contrastimulation
+contrastimulus
+contrasting
+contrastingly
+contrastive
+contrastively
+contrastiveness
+contrastment
+contrasts
+contrasty
+contrasuggestible
+contratabular
+contrate
+contratempo
+contratenor
+contratulations
+contravalence
+contravallation
+contravariant
+contravene
+contravened
+contravener
+contravenes
+contravening
+contravention
+contraversion
+contravindicate
+contravindication
+contrawise
+contrayerva
+contre-
+contrecoup
+contrectation
+contre-dance
+contredanse
+contredanses
+contreface
+contrefort
+contre-partie
+contrepartie
+contretemps
+contrib
+contrib.
+contributable
+contributary
+contribute
+contributed
+contributes
+contributing
+contribution
+contributional
+contributions
+contributive
+contributively
+contributiveness
+contributor
+contributorial
+contributories
+contributorily
+contributors
+contributorship
+contributory
+contrist
+contrite
+contritely
+contriteness
+contrition
+contritions
+contriturate
+contrivable
+contrivance
+contrivances
+contrivancy
+contrive
+contrived
+contrivedly
+contrivement
+contriver
+contrivers
+contrives
+contriving
+control
+controled
+controling
+controllability
+controllable
+controllableness
+controllable-pitch
+controllably
+controlled
+controller
+controllers
+controllership
+controlless
+controlling
+controllingly
+controlment
+controls
+controversal
+controverse
+controversed
+controversial
+controversialism
+controversialist
+controversialists
+controversialize
+controversially
+controversies
+controversion
+controversional
+controversionalism
+controversionalist
+controversy
+controvert
+controverted
+controverter
+controvertibility
+controvertible
+controvertibly
+controverting
+controvertist
+controverts
+contrude
+conttinua
+contubernal
+contubernial
+contubernium
+contumaceous
+contumacies
+contumacious
+contumaciously
+contumaciousness
+contumacities
+contumacity
+contumacy
+contumax
+contumelies
+contumelious
+contumeliously
+contumeliousness
+contumely
+contund
+contune
+conturb
+conturbation
+contuse
+contused
+contuses
+contusing
+contusion
+contusioned
+contusions
+contusive
+conubium
+Conularia
+conule
+conumerary
+conumerous
+conundrum
+conundrumize
+conundrums
+conurbation
+conurbations
+conure
+Conuropsis
+Conurus
+CONUS
+conus
+conusable
+conusance
+conusant
+conusee
+conuses
+conusor
+conutrition
+conuzee
+conuzor
+conv
+Convair
+convalesce
+convalesced
+convalescence
+convalescences
+convalescency
+convalescent
+convalescently
+convalescents
+convalesces
+convalescing
+convallamarin
+Convallaria
+Convallariaceae
+convallariaceous
+convallarin
+convally
+convect
+convected
+convecting
+convection
+convectional
+convections
+convective
+convectively
+convector
+convects
+convell
+convenable
+convenably
+convenance
+convenances
+convene
+convened
+convenee
+convener
+conveneries
+conveners
+convenership
+convenery
+convenes
+convenience
+convenienced
+conveniences
+conveniencies
+conveniency
+conveniens
+convenient
+conveniently
+convenientness
+convening
+convenor
+convent
+convented
+conventical
+conventically
+conventicle
+conventicler
+conventicles
+conventicular
+conventing
+convention
+conventional
+conventionalisation
+conventionalise
+conventionalised
+conventionalising
+conventionalism
+conventionalist
+conventionalities
+conventionality
+conventionalization
+conventionalize
+conventionalized
+conventionalizes
+conventionalizing
+conventionally
+conventionary
+conventioneer
+conventioneers
+conventioner
+conventionism
+conventionist
+conventionize
+conventions
+convento
+convents
+Conventual
+conventual
+conventually
+converge
+converged
+convergement
+convergence
+convergences
+convergencies
+convergency
+convergent
+convergently
+converges
+convergescence
+converginerved
+converging
+conversable
+conversableness
+conversably
+conversance
+conversancy
+conversant
+conversantly
+conversation
+conversationable
+conversational
+conversationalism
+conversationalist
+conversationalists
+conversationally
+conversationism
+conversationist
+conversationize
+conversations
+conversative
+conversazione
+conversaziones
+conversazioni
+Converse
+converse
+conversed
+conversely
+converser
+converses
+conversi
+conversibility
+conversible
+conversing
+conversion
+conversional
+conversionary
+conversionism
+conversionist
+conversions
+conversive
+converso
+conversus
+conversusi
+convert
+convertable
+convertaplane
+converted
+convertend
+converter
+converters
+convertibility
+convertible
+convertibleness
+convertibles
+convertibly
+converting
+convertingness
+convertiplane
+convertise
+convertism
+convertite
+convertive
+convertoplane
+convertor
+convertors
+converts
+Convery
+conveth
+convex
+convex-concave
+convexed
+convexedly
+convexedness
+convexes
+convexities
+convexity
+convexly
+convexness
+convexo
+convexo-
+convexo-concave
+convexoconcave
+convexo-convex
+convexo-plane
+convey
+conveyability
+conveyable
+conveyal
+conveyance
+conveyancer
+conveyances
+conveyancing
+conveyed
+conveyer
+conveyers
+conveying
+conveyor
+conveyorization
+conveyorize
+conveyorized
+conveyorizer
+conveyorizing
+conveyors
+conveys
+conviciate
+convicinity
+convict
+convictable
+convicted
+convictfish
+convictfishes
+convictible
+convicting
+conviction
+convictional
+convictions
+convictism
+convictive
+convictively
+convictiveness
+convictment
+convictor
+convicts
+convince
+convinced
+convincedly
+convincedness
+convincement
+convincer
+convincers
+convinces
+convincibility
+convincible
+convincing
+convincingly
+convincingness
+convite
+convito
+convival
+convive
+convives
+convivial
+convivialist
+convivialities
+conviviality
+convivialize
+convivially
+convivio
+convocant
+convocate
+convocated
+convocating
+convocation
+convocational
+convocationally
+convocationist
+convocations
+convocative
+convocator
+convoke
+convoked
+convoker
+convokers
+convokes
+convoking
+Convoluta
+convolute
+convoluted
+convolutedly
+convolutedness
+convolutely
+convoluting
+convolution
+convolutional
+convolutionary
+convolutions
+convolutive
+convolve
+convolved
+convolvement
+convolves
+convolving
+Convolvulaceae
+convolvulaceous
+convolvulad
+convolvuli
+convolvulic
+convolvulin
+convolvulinic
+convolvulinolic
+Convolvulus
+convolvulus
+convolvuluses
+convoy
+convoyed
+convoying
+convoys
+convulsant
+convulse
+convulsed
+convulsedly
+convulses
+convulsibility
+convulsible
+convulsing
+convulsion
+convulsional
+convulsionaries
+convulsionary
+convulsionism
+convulsionist
+convulsions
+convulsive
+convulsively
+convulsiveness
+Conway
+Cony
+cony
+cony-catch
+conycatcher
+Conyers
+conyger
+conylene
+conynge
+Conyngham
+conyrin
+conyrine
+conyza
+COO
+Coo
+coo
+cooba
+coobah
+co-obligant
+co-oblige
+co-obligor
+cooboo
+cooboos
+co-occupant
+co-occupy
+co-occurrence
+cooch
+cooches
+coo-coo
+coocoo
+coodle
+Cooe
+cooed
+cooee
+cooeed
+cooeeing
+cooees
+cooer
+cooers
+cooey
+cooeyed
+cooeying
+cooeys
+coof
+coofs
+cooghneiorvlt
+Coohee
+cooing
+cooingly
+cooja
+Cook
+cook
+cookable
+cookbook
+cookbooks
+cookdom
+Cooke
+cooked
+cooked-up
+cookee
+cookeite
+cooker
+cookeries
+cookers
+cookery
+Cookeville
+cookey
+cookeys
+cook-general
+cookhouse
+cookhouses
+Cookie
+cookie
+cookies
+cooking
+cooking-range
+cookings
+cookish
+cookishly
+cookless
+cookmaid
+cook-out
+cookout
+cookouts
+cookroom
+Cooks
+cooks
+Cooksburg
+cooks-general
+cookshack
+cookshop
+cookshops
+Cookson
+cookstove
+Cookstown
+Cooksville
+Cookville
+cookware
+cookwares
+Cooky
+cooky
+cool
+coolabah
+coolaman
+coolamon
+coolant
+coolants
+cooled
+Cooleemee
+coolen
+cooler
+coolerman
+coolers
+coolest
+Cooley
+cooley
+cool-headed
+coolheaded
+cool-headedly
+coolheadedly
+cool-headedness
+coolheadedness
+coolhouse
+coolibah
+Coolidge
+coolidge
+coolie
+coolies
+cooliman
+Coolin
+cooling
+cooling-card
+coolingly
+coolingness
+cooling-off
+coolish
+coolly
+coolness
+coolnesses
+cools
+coolth
+coolths
+coolung
+Coolville
+coolweed
+coolwort
+cooly
+coom
+coomb
+coombe
+coombes
+Coombs
+coombs
+coom-ceiled
+co-omnipotent
+co-omniscient
+coomy
+coon
+Coonan
+cooncan
+cooncans
+cooner
+coonhound
+coonhounds
+coonier
+cooniest
+coonily
+cooniness
+coonjine
+coonroot
+coons
+coonskin
+coonskins
+coontah
+coontail
+coontie
+coonties
+coony
+Coop
+co-op
+coop
+coop.
+cooped
+cooped-in
+coopee
+Cooper
+cooper
+co-operable
+cooperage
+co-operancy
+cooperancy
+co-operant
+cooperant
+co-operate
+cooperate
+cooperated
+cooperates
+cooperating
+cooperatingly
+co-operation
+cooperation
+co-operationist
+cooperationist
+cooperations
+co-operative
+cooperative
+co-operatively
+cooperatively
+co-operativeness
+cooperativeness
+cooperatives
+co-operator
+cooperator
+cooperators
+co-operculum
+coopered
+Cooperia
+cooperies
+coopering
+cooperite
+Cooperman
+coopers
+Coopersburg
+Coopersmith
+Cooperstein
+Cooperstown
+Coopersville
+cooper's-wood
+coopery
+cooping
+coops
+co-opt
+coopt
+co-optate
+cooptate
+co-optation
+cooptation
+co-optative
+cooptative
+coopted
+coopting
+co-option
+cooption
+cooptions
+co-optive
+cooptive
+coopts
+co-ordain
+coordain
+co-ordainer
+co-order
+co-ordinacy
+co-ordinal
+coordinal
+co-ordinance
+co-ordinancy
+co-ordinate
+coordinate
+coordinated
+co-ordinately
+coordinately
+co-ordinateness
+coordinateness
+coordinates
+coordinating
+co-ordination
+coordination
+coordinations
+co-ordinative
+coordinative
+co-ordinator
+coordinator
+coordinators
+co-ordinatory
+coordinatory
+cooree
+Coorg
+co-organize
+coorie
+cooried
+coorieing
+coories
+co-origin
+co-original
+co-originality
+Coors
+co-orthogonal
+co-orthotomic
+cooruptibly
+Coos
+coos
+Coosa
+Coosada
+cooser
+coosers
+coosify
+co-ossification
+co-ossify
+coost
+Coosuc
+coot
+cootch
+Cooter
+cooter
+cootfoot
+coot-footed
+cooth
+coothay
+cootie
+cooties
+coots
+cooty
+co-owner
+co-ownership
+COP
+Cop
+cop
+copa
+copable
+copacetic
+copaene
+copaiba
+copaibas
+copaibic
+Copaifera
+copain
+Copaiva
+copaiva
+copaivic
+copaiye
+Copake
+copal
+copalche
+copalchi
+copalcocote
+copaliferous
+copaline
+copalite
+copaljocote
+copalm
+copalms
+copals
+Copan
+coparallel
+coparcenar
+coparcenary
+coparcener
+coparceny
+coparenary
+coparent
+coparents
+copart
+copartaker
+copartiment
+copartner
+copartners
+copartnership
+copartnerships
+copartnery
+coparty
+copasetic
+copassionate
+copastor
+copastorate
+copastors
+copatain
+copataine
+copatentee
+co-patriot
+copatriot
+copatron
+copatroness
+copatrons
+Cope
+cope
+copeck
+copecks
+coped
+Copehan
+copei
+copeia
+Copeland
+Copelata
+Copelatae
+copelate
+copelidine
+copellidine
+copeman
+copemate
+copemates
+Copemish
+copen
+copending
+copenetrate
+Copenhagen
+copenhagen
+copens
+Copeognatha
+copepod
+Copepoda
+copepodan
+copepodous
+copepods
+coper
+coperception
+coperiodic
+Copernican
+copernican
+Copernicanism
+copernicans
+Copernicia
+Copernicus
+copernicus
+coperose
+copers
+coperta
+copes
+copesetic
+copesettic
+copesman
+copesmate
+cope-stone
+copestone
+copetitioner
+Copeville
+cophasal
+Cophetua
+cophosis
+cophouse
+Copht
+copia
+copiability
+copiable
+Copiague
+copiapite
+Copiapo
+copied
+copier
+copiers
+copies
+copihue
+copihues
+copilot
+copilots
+coping
+copings
+copingstone
+copintank
+copiopia
+copiopsia
+copiosity
+copious
+copiously
+copiousness
+copiousnesses
+copis
+copist
+copita
+coplaintiff
+coplanar
+coplanarities
+coplanarity
+coplanation
+Copland
+Coplay
+copleased
+Copley
+Coplin
+coplot
+coplots
+coplotted
+coplotter
+coplotting
+coploughing
+coplowing
+copolar
+copolymer
+copolymeric
+copolymerism
+copolymerization
+copolymerizations
+copolymerize
+copolymerized
+copolymerizing
+copolymerous
+copolymers
+copopoda
+copopsia
+coportion
+cop-out
+copout
+copouts
+Copp
+coppa
+coppaelite
+Coppard
+coppas
+copped
+Coppelia
+Coppell
+copper
+copperah
+copperahs
+copper-alloyed
+copperas
+copperases
+copper-bearing
+copper-bellied
+copper-belly
+copperbottom
+copper-bottomed
+copper-coated
+copper-colored
+copper-covered
+coppered
+copperer
+copper-faced
+copper-fastened
+Copperfield
+copperhead
+copper-headed
+Copperheadism
+copperheadism
+copperheads
+coppering
+copperish
+copperization
+copperize
+copper-leaf
+copperleaf
+copper-leaves
+copper-lined
+copper-melting
+Coppermine
+coppernose
+coppernosed
+Copperopolis
+copper-plate
+copperplate
+copperplated
+copperproof
+copper-red
+coppers
+coppersidesman
+copperskin
+copper-skinned
+copper-smelting
+copper-smith
+coppersmith
+coppersmithing
+copper-toed
+copperware
+copperwing
+copperworks
+copper-worm
+coppery
+coppery-tailed
+copperytailed
+coppet
+coppice
+coppiced
+coppice-feathered
+coppices
+coppice-topped
+coppicing
+coppin
+copping
+Coppinger
+Coppins
+copple
+copple-crown
+copplecrown
+copple-crowned
+coppled
+copple-stone
+coppling
+Coppock
+Coppola
+coppra
+coppras
+copps
+coppy
+copr
+copr-
+copra
+copraemia
+copraemic
+coprah
+coprahs
+copras
+coprecipitate
+coprecipitated
+coprecipitating
+coprecipitation
+copremia
+copremias
+copremic
+copresbyter
+co-presence
+copresence
+copresent
+copresident
+copresidents
+Copreus
+Coprides
+Coprinae
+coprince
+coprincipal
+coprincipals
+coprincipate
+Coprinus
+coprinus
+coprisoner
+coprisoners
+copro-
+coprocessing
+coprocessor
+coprocessors
+coprodaeum
+coproduce
+coproduced
+coproducer
+coproducers
+coproduces
+coproducing
+coproduct
+coproduction
+coproductions
+coproite
+coprojector
+coprolagnia
+coprolagnist
+coprolalia
+coprolaliac
+coprolite
+coprolith
+coprolitic
+coprology
+copromisor
+copromote
+copromoted
+copromoter
+copromoters
+copromotes
+copromoting
+coprophagan
+coprophagia
+coprophagist
+coprophagous
+coprophagy
+coprophilia
+coprophiliac
+coprophilic
+coprophilism
+coprophilous
+coprophobia
+coprophobic
+coprophyte
+coproprietor
+coproprietors
+coproprietorship
+coproprietorships
+cop-rose
+coprose
+Coprosma
+coprosma
+coprostanol
+coprostasia
+coprostasis
+coprostasophobia
+coprosterol
+coprozoic
+COPS
+cops
+copse
+copse-clad
+copse-covered
+copses
+copsewood
+copsewooded
+copsing
+copsole
+copsy
+Copt
+copt
+copter
+copters
+Coptic
+coptic
+coptine
+Coptis
+copublish
+copublished
+copublisher
+copublishers
+copublishes
+copublishing
+copula
+copulable
+copulae
+copular
+copularium
+copulas
+copulate
+copulated
+copulates
+copulating
+copulation
+copulations
+copulative
+copulatively
+copulatives
+copulatory
+copunctal
+copurchaser
+copurify
+copus
+copy
+copybook
+copybooks
+copyboy
+copyboys
+copycat
+copycats
+copycatted
+copycatting
+copycutter
+copydesk
+copydesks
+copy-edit
+copyedit
+copyfitter
+copyfitting
+copygraph
+copygraphed
+copyhold
+copyholder
+copyholders
+copyholding
+copyholds
+copying
+copyism
+copyist
+copyists
+copyman
+copyread
+copyreader
+copyreaders
+copyreading
+copyright
+copyrightable
+copyrighted
+copyrighter
+copyrighting
+copyrights
+copywise
+copywriter
+copywriters
+copywriting
+COQ
+coque
+coquecigrue
+coquelicot
+Coquelin
+coqueluche
+coquet
+coquetoon
+coquetries
+coquetry
+coquets
+coquette
+coquetted
+coquettes
+coquetting
+coquettish
+coquettishly
+coquettishness
+coquicken
+Coquilhatville
+coquilla
+coquillage
+Coquille
+coquille
+coquilles
+coquimbite
+Coquimbo
+coquin
+coquina
+coquinas
+coquita
+Coquitlam
+coquito
+coquitos
+Cor
+Cor.
+cor
+cor-
+cor.
+Cora
+cora
+Corabeca
+Corabecan
+Corabel
+Corabella
+Corabelle
+corach
+Coraciae
+coracial
+Coracias
+Coracii
+Coraciidae
+coraciiform
+Coraciiformes
+coracine
+coracle
+coracler
+coracles
+coraco-
+coracoacromial
+coracobrachial
+coracobrachialis
+coracoclavicular
+coracocostal
+coracohumeral
+coracohyoid
+coracoid
+coracoidal
+coracoids
+coracomandibular
+coracomorph
+Coracomorphae
+coracomorphic
+coracopectoral
+coracoprocoracoid
+coracoradialis
+coracoscapular
+coracosteon
+coracovertebral
+coradical
+co-radicate
+coradicate
+corage
+coraggio
+coragio
+corah
+coraise
+coraji
+Coral
+coral
+coral-beaded
+coralbells
+coralberries
+coralberry
+coral-bound
+coral-built
+coralbush
+coral-buttoned
+coral-colored
+coraled
+coralene
+coral-fishing
+coralflower
+coral-girt
+Coralie
+Coraline
+coralist
+coralita
+coralla
+corallet
+Corallian
+corallic
+Corallidae
+corallidomous
+coralliferous
+coralliform
+Coralligena
+coralligenous
+coralligerous
+corallike
+corallin
+Corallina
+Corallinaceae
+corallinaceous
+coralline
+corallita
+corallite
+Corallium
+coralloid
+coralloidal
+Corallorhiza
+corallum
+Corallus
+coral-making
+coral-plant
+coral-producing
+coral-red
+coralroot
+coral-rooted
+corals
+coral-secreting
+coral-snake
+coral-tree
+Coralville
+coral-wood
+coralwort
+Coralye
+Coralyn
+Coram
+coram
+Corambis
+Coramine
+coran
+corance
+coranoch
+Corantijn
+coranto
+corantoes
+corantos
+Coraopolis
+Corapeake
+coraveca
+Coray
+corban
+corbans
+corbe
+corbeau
+corbed
+Corbeil
+corbeil
+corbeille
+corbeilles
+corbeils
+corbel
+corbeled
+corbeling
+corbelled
+corbelling
+corbels
+Corbet
+corbet
+Corbett
+Corbettsville
+corbicula
+corbiculae
+corbiculate
+corbiculum
+Corbie
+corbie
+corbies
+corbie-step
+corbiestep
+Corbin
+corbina
+corbinas
+corbleu
+corblimey
+corblimy
+corbovinum
+corbula
+Corbusier
+Corby
+corby
+corcass
+corchat
+Corchorus
+corchorus
+corcir
+corcle
+corcopali
+Corcoran
+Corcovado
+Corcyra
+Corcyraean
+Cord
+cord
+cordage
+cordages
+Cordaitaceae
+cordaitaceous
+cordaitalean
+Cordaitales
+cordaitean
+Cordaites
+cordal
+Cordalia
+cordant
+cordate
+cordate-amplexicaul
+cordate-lanceolate
+cordately
+cordate-oblong
+cordate-sagittate
+cordax
+Corday
+Cordeau
+corded
+Cordeelia
+cordel
+Cordele
+Cordelia
+Cordelie
+Cordelier
+cordelier
+cordeliere
+Cordeliers
+Cordell
+cordelle
+cordelled
+cordelling
+Corder
+corder
+corders
+Cordery
+Cordesville
+cordewane
+Cordey
+Cordi
+Cordia
+cordia
+cordial
+cordialities
+cordiality
+cordialize
+cordially
+cordialness
+cordials
+cordiceps
+cordicole
+Cordie
+Cordier
+cordierite
+cordies
+cordiform
+cordigeri
+cordillera
+Cordilleran
+cordilleran
+Cordilleras
+cordilleras
+cordinar
+cordiner
+cording
+cordings
+cordis
+cordite
+cordites
+corditis
+Cordle
+cordleaf
+cordless
+cordlessly
+cordlike
+cordmaker
+Cordoba
+cordoba
+cordoban
+cordobas
+cordon
+cordonazo
+cordonazos
+cordoned
+cordoning
+cordonnet
+cordons
+Cordova
+Cordovan
+cordovan
+cordovans
+cords
+Cordula
+corduroy
+corduroyed
+corduroying
+corduroys
+cordwain
+cordwainer
+cordwainery
+cordwains
+cordwood
+cordwoods
+Cordy
+cordy
+cordycepin
+Cordyceps
+cordyl
+Cordylanthus
+Cordyline
+cordyline
+CORE
+Core
+core
+core-
+Corea
+core-baking
+corebel
+corebox
+coreceiver
+corecipient
+corecipients
+coreciprocal
+corectome
+corectomy
+corector
+core-cutting
+cored
+coredeem
+coredeemed
+coredeemer
+coredeeming
+coredeems
+coredemptress
+core-drying
+coreductase
+Coree
+Coreen
+coreflexed
+coregence
+coregency
+co-regent
+coregent
+coregnancy
+coregnant
+coregonid
+Coregonidae
+coregonine
+coregonoid
+Coregonus
+coreid
+Coreidae
+coreign
+coreigner
+coreigns
+core-jarring
+corejoice
+Corel
+corelate
+corelated
+corelates
+corelating
+co-relation
+corelation
+corelational
+corelative
+corelatively
+coreless
+co-religionist
+coreligionist
+Corell
+Corella
+corella
+Corelli
+corelysis
+Corema
+coremaker
+coremaking
+coremia
+coremium
+coremiumia
+coremorphosis
+Corena
+Corenda
+Corene
+corenounce
+coreometer
+Coreopsis
+coreopsis
+coreplastic
+coreplasty
+corepressor
+corequisite
+corer
+corers
+cores
+coresidence
+coresident
+coresidents
+coresidual
+coresign
+coresonant
+coresort
+corespect
+corespondency
+co-respondent
+corespondent
+corespondents
+Coresus
+coretomy
+Coretta
+Corette
+coreveler
+coreveller
+corevolve
+Corey
+corf
+Corfam
+Corfiote
+Corflambo
+Corfu
+corge
+corgi
+corgis
+Cori
+coria
+coriaceous
+corial
+coriamyrtin
+coriander
+corianders
+coriandrol
+Coriandrum
+Coriaria
+Coriariaceae
+coriariaceous
+coriaus
+Coricidin
+Coridon
+Corie
+coriin
+Corilla
+Corimelaena
+Corimelaenidae
+Corin
+Corina
+corindon
+Corine
+Corineus
+coring
+Corinna
+Corinne
+corinne
+Corinth
+corinth
+corinthes
+corinthiac
+Corinthian
+corinthian
+Corinthianesque
+Corinthianism
+Corinthianize
+Corinthians
+corinthians
+Corinthus
+Coriolanus
+coriparian
+Coriss
+Corissa
+corita
+corium
+co-rival
+Corixa
+Corixidae
+Cork
+cork
+corkage
+corkages
+cork-barked
+cork-bearing
+corkboard
+cork-boring
+cork-cutting
+corke
+corked
+corker
+corkers
+cork-forming
+cork-grinding
+cork-heeled
+Corkhill
+corkier
+corkiest
+corkiness
+corking
+corking-pin
+corkir
+corkish
+corkite
+corklike
+corkline
+cork-lined
+corkmaker
+corkmaking
+corks
+corkscrew
+corkscrewed
+corkscrewing
+corkscrews
+corkscrewy
+cork-tipped
+corkwing
+corkwood
+corkwoods
+corky
+corky-headed
+corky-winged
+Corley
+Corliss
+Corly
+corm
+Cormac
+Cormack
+cormel
+cormels
+Cormick
+cormidium
+Cormier
+cormlike
+cormo-
+cormogen
+cormoid
+Cormophyta
+cormophyte
+cormophytic
+cormorant
+cormorants
+cormous
+corms
+cormus
+CORN
+Corn
+corn
+Cornaceae
+cornaceous
+cornada
+cornage
+Cornall
+cornamute
+cornball
+cornballs
+corn-beads
+cornbell
+cornberry
+cornbin
+cornbind
+cornbinks
+cornbird
+cornbole
+cornbottle
+cornbrash
+cornbread
+corncake
+corncakes
+corn-cob
+corncob
+corncobs
+corncockle
+corn-colored
+corn-cracker
+corncracker
+corn-crake
+corncrake
+corncrib
+corncribs
+corncrusher
+corncutter
+corncutting
+corn-devouring
+corndodger
+cornea
+corneagen
+corneal
+corneas
+corn-eater
+corned
+Corneille
+cornein
+corneine
+corneitis
+Cornel
+cornel
+Cornela
+Cornelia
+cornelian
+Cornelie
+Cornelis
+Cornelius
+Cornell
+cornell
+Cornelle
+cornels
+cornemuse
+corneo-
+corneocalcareous
+corneosclerotic
+corneosiliceous
+corneous
+Corner
+corner
+cornerback
+cornerbind
+cornercap
+cornered
+cornerer
+cornering
+corner-man
+cornerman
+cornerpiece
+corners
+corner-stone
+cornerstone
+cornerstones
+Cornersville
+cornerways
+cornerwise
+CORNET
+cornet
+cornet-a-pistons
+cornetcies
+cornetcy
+corneter
+cornetfish
+cornetfishes
+cornetist
+cornetists
+cornets
+cornett
+cornette
+cornetter
+cornetti
+cornettino
+cornettist
+cornetto
+Cornettsville
+corneule
+corneum
+Cornew
+corn-exporting
+Corney
+cornfactor
+corn-fed
+cornfed
+corn-feeding
+cornfield
+cornfields
+corn-flag
+cornflag
+cornflakes
+cornfloor
+corn-flour
+cornflour
+corn-flower
+cornflower
+cornflowers
+corngrower
+corn-growing
+cornhole
+cornhouse
+corn-husk
+cornhusk
+cornhusker
+cornhusking
+cornhusks
+Cornia
+cornic
+cornice
+corniced
+cornices
+corniche
+corniches
+Cornichon
+cornichon
+cornicing
+cornicle
+cornicles
+cornicular
+corniculate
+corniculer
+corniculum
+Cornie
+cornier
+corniest
+Corniferous
+corniferous
+cornific
+cornification
+cornified
+corniform
+cornify
+cornigeous
+cornigerous
+cornily
+cornin
+corniness
+Corning
+corning
+corniplume
+Cornish
+cornish
+Cornishman
+cornishman
+Cornishmen
+cornix
+Cornland
+cornland
+corn-law
+Cornlea
+cornless
+cornloft
+corn-master
+cornmaster
+cornmeal
+cornmeals
+cornmonger
+cornmuse
+Corno
+corno
+cornopean
+Cornopion
+corn-picker
+cornpipe
+corn-planting
+corn-producing
+corn-rent
+cornrick
+cornroot
+cornrow
+cornrows
+corns
+cornsack
+corn-salad
+corn-snake
+Cornstalk
+corn-stalk
+cornstalk
+cornstalks
+cornstarch
+cornstarches
+cornstone
+cornstook
+cornu
+cornua
+cornual
+cornuate
+cornuated
+cornubianite
+cornucopia
+Cornucopiae
+cornucopian
+cornucopias
+cornucopiate
+cornule
+cornulite
+Cornulites
+cornupete
+Cornus
+cornus
+cornuses
+cornute
+cornuted
+cornutin
+cornutine
+cornuting
+cornuto
+cornutos
+cornutus
+Cornville
+Cornwall
+cornwall
+Cornwallis
+cornwallis
+cornwallises
+cornwallite
+Cornwallville
+Cornwell
+Corny
+corny
+Coro
+coro-
+coroa
+Coroado
+corocleisis
+corodiary
+corodiastasis
+corodiastole
+corodies
+corody
+Coroebus
+corojo
+corol
+corolitic
+coroll
+Corolla
+corolla
+corollaceous
+corollarial
+corollarially
+corollaries
+corollary
+corollas
+corollate
+corollated
+corollet
+corolliferous
+corollifloral
+corolliform
+corollike
+corolline
+corollitic
+coromandel
+coromell
+corometer
+corona
+coronach
+coronachs
+coronad
+coronadite
+Coronado
+coronado
+coronados
+coronae
+coronagraph
+coronagraphic
+coronal
+coronale
+coronaled
+coronalled
+coronally
+coronals
+coronamen
+coronaries
+coronary
+coronas
+coronate
+coronated
+coronation
+coronations
+coronatorial
+coronavirus
+corone
+Coronel
+coronel
+coronels
+coronene
+coroner
+coroners
+coronership
+coronet
+coroneted
+coronetlike
+coronets
+coronetted
+coronettee
+coronetty
+coroniform
+Coronilla
+coronillin
+coronillo
+coronion
+Coronis
+coronis
+coronitis
+coronium
+coronize
+coronobasilar
+coronofacial
+coronofrontal
+coronograph
+coronographic
+coronoid
+Coronopus
+coronule
+Coronus
+coroparelcysis
+coroplast
+coroplasta
+coroplastae
+coroplastic
+coroplasty
+Coropo
+coroscopy
+corosif
+Corot
+corotate
+corotated
+corotates
+corotating
+corotation
+corotomy
+Corotto
+coroun
+coroutine
+coroutines
+Corozal
+corozo
+corozos
+Corp
+corp
+corp.
+Corpl
+corpl
+corpn
+corpora
+corporacies
+corporacy
+Corporal
+corporal
+corporalcy
+corporale
+corporales
+corporalism
+corporalities
+corporality
+corporally
+corporals
+corporalship
+corporas
+corporate
+corporately
+corporateness
+corporation
+corporational
+corporationer
+corporationism
+corporations
+corporatism
+corporatist
+corporative
+corporatively
+corporativism
+corporator
+corporature
+corpore
+corporeal
+corporealist
+corporeality
+corporealization
+corporealize
+corporeally
+corporealness
+corporeals
+corporeity
+corporeous
+corporification
+corporify
+corporosity
+corposant
+corps
+corpsbruder
+corpse
+corpse-candle
+corpselike
+corpselikeness
+corpses
+corpsman
+corpsmen
+corpsy
+corpulence
+corpulences
+corpulencies
+corpulency
+corpulent
+corpulently
+corpulentness
+corpus
+corpuscle
+corpuscles
+corpuscular
+corpuscularian
+corpuscularity
+corpusculated
+corpuscule
+corpusculous
+corpusculum
+Corr
+corr
+corr.
+corrade
+corraded
+corrades
+corradial
+corradiate
+corradiated
+corradiating
+corradiation
+corrading
+Corrado
+corral
+Corrales
+corralled
+corralling
+corrals
+corrasion
+corrasive
+Correa
+correal
+correality
+correct
+correctable
+correctant
+corrected
+correctedness
+correcter
+correctest
+correctible
+correctify
+correcting
+correctingly
+correction
+correctional
+correctionalist
+correctioner
+corrections
+Correctionville
+correctitude
+corrective
+correctively
+correctiveness
+correctives
+correctly
+correctness
+correctnesses
+corrector
+correctorship
+correctory
+correctress
+correctrice
+corrects
+Correggio
+Corregidor
+corregidor
+corregidores
+corregidors
+corregimiento
+corregimientos
+correl
+correl.
+correlatable
+correlate
+correlated
+correlates
+correlating
+correlation
+correlational
+correlations
+correlative
+correlatively
+correlativeness
+correlatives
+correlativism
+correlativity
+correligionist
+Correll
+correllated
+correllation
+correllations
+Correna
+corrente
+correo
+correption
+corresol
+corresp
+correspond
+corresponded
+correspondence
+correspondences
+correspondencies
+correspondency
+correspondent
+correspondential
+correspondentially
+correspondently
+correspondents
+correspondentship
+corresponder
+corresponding
+correspondingly
+corresponds
+corresponsion
+corresponsive
+corresponsively
+Correy
+Correze
+Corri
+Corrianne
+corrida
+corridas
+corrido
+corridor
+corridored
+corridors
+Corrie
+corrie
+Corriedale
+corriedale
+Corrientes
+corries
+Corrigan
+Corriganville
+corrige
+corrigenda
+corrigendum
+corrigent
+corrigibility
+corrigible
+corrigibleness
+corrigibly
+Corrigiola
+Corrigiolaceae
+Corrina
+Corrine
+Corrinne
+corrival
+corrivality
+corrivalry
+corrivals
+corrivalship
+corrivate
+corrivation
+corrive
+corrobboree
+corrober
+corroborant
+corroborate
+corroborated
+corroborates
+corroborating
+corroboration
+corroborations
+corroborative
+corroboratively
+corroborator
+corroboratorily
+corroborators
+corroboratory
+corroboree
+corroboreed
+corroboreeing
+corroborees
+corrobori
+corrodant
+corrode
+corroded
+corrodent
+Corrodentia
+corroder
+corroders
+corrodes
+corrodiary
+corrodibility
+corrodible
+corrodier
+corrodies
+corroding
+corrodingly
+corrody
+Corron
+corrosibility
+corrosible
+corrosibleness
+corrosion
+corrosional
+corrosionproof
+corrosions
+corrosive
+corrosived
+corrosively
+corrosiveness
+corrosives
+corrosiving
+corrosivity
+corrugant
+corrugate
+corrugated
+corrugates
+corrugating
+corrugation
+corrugations
+corrugator
+corrugators
+corrugent
+corrump
+corrumpable
+corrup
+corrupable
+corrupt
+corrupted
+corruptedly
+corruptedness
+corrupter
+corruptest
+corruptful
+corruptibilities
+corruptibility
+corruptible
+corruptibleness
+corruptibly
+corrupting
+corruptingly
+corruption
+corruptionist
+corruptions
+corruptious
+corruptive
+corruptively
+corruptless
+corruptly
+corruptness
+corruptor
+corruptress
+corrupts
+Corry
+Corryton
+corsac
+corsacs
+corsage
+corsages
+corsaint
+corsair
+corsairs
+corsak
+Corse
+corse
+corselet
+corseleted
+corseleting
+corselets
+corselette
+corsepresent
+corseque
+corser
+corses
+corsesque
+corset
+corseted
+corsetier
+corsetiere
+corseting
+corsetless
+corsetry
+corsets
+Corsetti
+Corsica
+Corsican
+Corsicana
+corsie
+Corsiglia
+corsite
+corslet
+corslets
+corsned
+Corso
+corso
+Corson
+corsos
+corsy
+Cort
+cort
+corta
+Cortaderia
+Cortaillod
+Cortaro
+cortaro
+cortege
+corteges
+corteise
+Cortelyou
+Cortemadera
+Cortes
+cortes
+Cortese
+cortex
+cortexes
+Cortez
+cortez
+Corti
+cortian
+cortical
+cortically
+corticate
+corticated
+corticating
+cortication
+cortices
+corticiferous
+corticiform
+corticifugal
+corticifugally
+corticin
+corticine
+corticipetal
+corticipetally
+Corticium
+cortico-
+corticoafferent
+corticoefferent
+corticoid
+corticole
+corticoline
+corticolous
+corticopeduncular
+corticose
+corticospinal
+corticosteroid
+corticosteroids
+corticosterone
+corticostriate
+corticotrophin
+corticotropin
+corticous
+Cortie
+cortile
+cortin
+cortina
+cortinae
+cortinarious
+Cortinarius
+cortinate
+cortine
+cortins
+cortisol
+cortisols
+cortisone
+cortisones
+Cortland
+cortlandtite
+Cortney
+Corton
+Cortona
+Cortot
+Corty
+coruco
+coruler
+Corum
+Corumba
+Coruminacan
+Coruna
+corundophilite
+corundum
+corundums
+Corunna
+corupay
+coruscant
+coruscate
+coruscated
+coruscates
+coruscating
+coruscation
+coruscations
+coruscative
+corv
+Corvallis
+corve
+corved
+corvee
+corvees
+corven
+corver
+corves
+Corvese
+corvet
+corvets
+corvette
+corvettes
+corvetto
+Corvi
+Corvidae
+corviform
+corvillosum
+Corvin
+corvina
+Corvinae
+corvinas
+corvine
+corviser
+corvisor
+corvktte
+Corvo
+corvo
+corvoid
+corvorant
+Corvus
+corvus
+Corwin
+Corwith
+Corwun
+Cory
+cory
+Coryat
+Coryate
+Corybant
+corybant
+Corybantes
+Corybantian
+corybantiasm
+Corybantic
+corybantic
+Corybantine
+corybantish
+Corybants
+corybulbin
+corybulbine
+corycavamine
+corycavidin
+corycavidine
+corycavine
+Corycia
+Corycian
+corydalin
+corydaline
+Corydalis
+corydalis
+Coryden
+corydine
+Corydon
+corydon
+corydora
+Coryell
+coryl
+Corylaceae
+corylaceous
+corylet
+corylin
+Corylopsis
+Corylus
+corymb
+corymbed
+corymbiate
+corymbiated
+corymbiferous
+corymbiform
+corymblike
+corymbose
+corymbosely
+corymbous
+corymbs
+corynebacteria
+corynebacterial
+Corynebacterium
+corynebacterium
+coryneform
+Corynetes
+Coryneum
+corynid
+corynine
+corynite
+Corynne
+Corynocarpaceae
+corynocarpaceous
+Corynocarpus
+corynteria
+coryph
+Corypha
+Coryphaea
+coryphaei
+Coryphaena
+coryphaenid
+Coryphaenidae
+coryphaenoid
+Coryphaenoididae
+coryphaeus
+Coryphasia
+coryphee
+coryphees
+coryphene
+Coryphodon
+coryphodon
+coryphodont
+coryphylly
+corypphaei
+corystoid
+Corythus
+corytuberine
+coryza
+coryzal
+coryzas
+COS
+Cos
+cos
+cosalite
+cosaque
+cosavior
+Cosby
+coscet
+Coscinodiscaceae
+Coscinodiscus
+coscinomancy
+Coscob
+coscoroba
+coscript
+cose
+coseasonal
+coseat
+cosec
+cosecant
+cosecants
+cosech
+cosecs
+cosectarian
+cosectional
+cosed
+cosegment
+coseier
+coseiest
+coseism
+coseismal
+coseismic
+cosen
+cosenator
+cosentiency
+co-sentient
+cosentient
+Cosenza
+coservant
+coses
+cosession
+coset
+cosets
+Cosetta
+Cosette
+cosettler
+cosey
+coseys
+Cosgrave
+Cosgrove
+cosh
+cosharer
+cosheath
+coshed
+cosher
+coshered
+cosherer
+cosheries
+coshering
+coshers
+coshery
+coshes
+coshing
+Coshocton
+Coshow
+cosie
+cosied
+cosier
+cosies
+cosiest
+cosign
+cosignatories
+co-signatory
+cosignatory
+cosigned
+co-signer
+cosigner
+cosigners
+cosignificative
+cosigning
+cosignitary
+cosigns
+cosily
+Cosimo
+cosin
+cosinage
+COSINE
+cosine
+cosines
+cosiness
+cosinesses
+cosing
+cosingular
+cosins
+cosinusoid
+Cosma
+Cosmati
+Cosme
+cosmecology
+cosmesis
+Cosmetas
+cosmete
+cosmetic
+cosmetical
+cosmetically
+cosmetician
+cosmeticize
+cosmetics
+cosmetiste
+cosmetological
+cosmetologist
+cosmetologists
+cosmetology
+COSMIC
+cosmic
+cosmical
+cosmicality
+cosmically
+cosmico-natural
+cosmine
+cosmism
+cosmisms
+cosmist
+cosmists
+Cosmo
+cosmo
+cosmo-
+cosmochemical
+cosmochemistry
+cosmocracy
+cosmocrat
+cosmocratic
+cosmodrome
+cosmogenesis
+cosmogenetic
+cosmogenic
+cosmogeny
+cosmognosis
+cosmogonal
+cosmogoner
+cosmogonic
+cosmogonical
+cosmogonies
+cosmogonist
+cosmogonists
+cosmogonize
+cosmogony
+cosmographer
+cosmographic
+cosmographical
+cosmographically
+cosmographies
+cosmographist
+cosmography
+cosmoid
+cosmolabe
+cosmolatry
+cosmoline
+cosmolined
+cosmolining
+cosmologic
+cosmological
+cosmologically
+cosmologies
+cosmologist
+cosmologists
+cosmology
+cosmologygy
+cosmometry
+cosmonaut
+cosmonautic
+cosmonautical
+cosmonautically
+cosmonautics
+cosmonauts
+cosmopathic
+cosmoplastic
+cosmopoietic
+cosmopolicy
+Cosmopolis
+cosmopolis
+cosmopolises
+cosmopolitan
+cosmopolitanisation
+cosmopolitanise
+cosmopolitanised
+cosmopolitanising
+cosmopolitanism
+cosmopolitanization
+cosmopolitanize
+cosmopolitanized
+cosmopolitanizing
+cosmopolitanly
+cosmopolitans
+cosmopolite
+cosmopolitic
+cosmopolitical
+cosmopolitics
+cosmopolitism
+cosmorama
+cosmoramic
+cosmorganic
+COSMOS
+Cosmos
+cosmos
+cosmoscope
+cosmoses
+cosmosophy
+cosmosphere
+cosmotellurian
+cosmotheism
+cosmotheist
+cosmotheistic
+cosmothetic
+Cosmotron
+cosmotron
+cosmozoan
+cosmozoans
+cosmozoic
+cosmozoism
+cosonant
+cosounding
+co-sovereign
+cosovereign
+cosovereignty
+COSPAR
+cospecies
+cospecific
+cosphered
+cosplendor
+cosplendour
+cosponsor
+cosponsored
+cosponsoring
+cosponsors
+cosponsorship
+cosponsorships
+coss
+Cossack
+cossack
+cossacks
+Cossaean
+cossas
+Cossayuna
+cosse
+cosset
+cosseted
+cosseting
+cossets
+cossette
+cossetted
+cossetting
+cosshen
+cossic
+cossid
+Cossidae
+cossie
+cossnent
+cossyrite
+Cost
+cost
+Costa
+costa
+cost-account
+costae
+Costaea
+costage
+Costain
+costal
+costalgia
+costally
+costal-nerved
+costander
+Costanoan
+Costanza
+Costanzia
+COSTAR
+co-star
+costar
+costard
+costard-monger
+costards
+co-starred
+costarred
+co-starring
+costarring
+costars
+Costata
+costate
+costated
+costean
+costeaning
+costectomies
+costectomy
+costed
+costeen
+cost-effective
+Coste-Floret
+costellate
+Costello
+Costen
+Coster
+coster
+costerdom
+Costermansville
+costermonger
+costers
+cost-free
+costful
+costicartilage
+costicartilaginous
+costicervical
+costiferous
+costiform
+Costigan
+Costilla
+Costin
+costing
+costing-out
+costious
+costipulator
+costispinal
+costive
+costively
+costiveness
+costless
+costlessly
+costlessness
+costlew
+costlier
+costliest
+costliness
+costlinesses
+costly
+costmaries
+costmary
+costo-
+costoabdominal
+costoapical
+costocentral
+costochondral
+costoclavicular
+costocolic
+costocoracoid
+costodiaphragmatic
+costogenic
+costoinferior
+costophrenic
+costopleural
+costopneumopexy
+costopulmonary
+costoscapular
+costosternal
+costosuperior
+costothoracic
+costotome
+costotomies
+costotomy
+costotrachelian
+costotransversal
+costotransverse
+costovertebral
+costoxiphoid
+cost-plus
+costraight
+costrel
+costrels
+costs
+costula
+costulation
+costume
+costumed
+costumer
+costumers
+costumery
+costumes
+costumey
+costumic
+costumier
+costumiere
+costumiers
+costuming
+costumire
+costumist
+costusroot
+cosubject
+co-subordinate
+cosubordinate
+cosuffer
+cosufferer
+cosuggestion
+cosuitor
+co-supreme
+co-sureties
+co-surety
+cosurety
+cosuretyship
+cosustain
+coswearer
+cosy
+cosying
+cosymmedian
+Cosyra
+COT
+Cot
+cot
+Cotabato
+cotabulate
+cotan
+cotangent
+cotangential
+cotangents
+cotans
+cotarius
+cotarnin
+cotarnine
+Cotati
+cotbetty
+cotch
+Cote
+cote
+Coteau
+coteau
+coteaux
+coted
+coteen
+coteful
+cote-hardie
+cotehardie
+cotele
+coteline
+coteller
+cotemporane
+cotemporanean
+cotemporaneous
+cotemporaneously
+cotemporaries
+cotemporarily
+cotemporary
+cotenancy
+co-tenant
+cotenant
+cotenants
+cotenure
+coterell
+coterie
+coteries
+coterminal
+coterminous
+coterminously
+coterminousness
+cotery
+cotes
+Cotesfield
+Cotesian
+cotesian
+coth
+cotham
+cothamore
+cothe
+cotheorist
+Cotherstone
+cothish
+cothon
+cothouse
+cothurn
+cothurnal
+cothurnate
+cothurned
+cothurni
+cothurnian
+cothurnni
+cothurns
+cothurnus
+cothy
+cotice
+coticed
+coticing
+coticular
+co-tidal
+cotidal
+cotillage
+cotillion
+cotillions
+cotillon
+cotillons
+coting
+Cotinga
+cotinga
+cotingid
+Cotingidae
+cotingoid
+Cotinus
+cotise
+cotised
+cotising
+cotitular
+cotland
+Cotman
+cotman
+coto
+cotoin
+Cotolaurel
+Cotonam
+Cotoneaster
+cotoneaster
+cotonia
+cotonier
+Cotonou
+Cotopaxi
+cotorment
+cotoro
+cotoros
+cotorture
+Cotoxo
+cotquean
+cotqueans
+cotraitor
+cotransduction
+cotransfuse
+cotranslator
+cotranspire
+cotransubstantiate
+cotrespasser
+cotrine
+cotripper
+co-trustee
+cotrustee
+COTS
+cots
+Cotsen
+cotset
+cotsetla
+cotsetland
+cotsetle
+Cotswold
+cotswold
+Cotswolds
+Cott
+cott
+cotta
+cottabus
+cottae
+cottage
+cottaged
+cottager
+cottagers
+cottages
+Cottageville
+cottagey
+cottar
+cottars
+cottas
+Cottbus
+cotte
+cotted
+Cottekill
+Cottenham
+Cotter
+cotter
+cottered
+cotterel
+Cotterell
+cottering
+cotterite
+cotters
+cotterway
+cottid
+Cottidae
+cottier
+cottierism
+cottiers
+cottiest
+cottiform
+cottise
+Cottle
+Cottleville
+cottoid
+Cotton
+cotton
+cottonade
+cotton-backed
+cotton-baling
+cotton-bleaching
+cottonbush
+cotton-clad
+cotton-covered
+Cottondale
+cotton-dyeing
+cottoned
+cottonee
+cottoneer
+cottoner
+cotton-ginning
+cotton-growing
+Cottonian
+cottoning
+cottonization
+cottonize
+cotton-knitting
+cottonless
+cottonmouth
+cottonmouths
+cottonocracy
+Cottonopolis
+cottonopolis
+cottonpickin'
+cotton-picking
+cottonpicking
+cotton-planting
+Cottonport
+cotton-printing
+cotton-producing
+cottons
+cotton-sampling
+cottonseed
+cottonseeds
+cotton-sick
+cotton-spinning
+cottontail
+cottontails
+Cottonton
+cottontop
+Cottontown
+cotton-weaving
+cottonweed
+cottonwick
+cotton-wicked
+cottonwood
+cottonwoods
+cottony
+cottrel
+Cottrell
+Cottus
+cotty
+Cotuit
+cotuit
+cotula
+Cotulla
+cotunnite
+Coturnix
+cotutor
+cotwal
+cotwin
+cotwinned
+cotwist
+Coty
+-cotyl
+cotyl-
+cotyla
+cotylar
+cotyle
+cotyledon
+cotyledonal
+cotyledonar
+cotyledonary
+cotyledonoid
+cotyledonous
+cotyledons
+Cotyleus
+cotyliform
+cotyligerous
+cotyliscus
+cotyloid
+cotyloidal
+Cotylophora
+cotylophorous
+cotylopubic
+cotylosacral
+cotylosaur
+Cotylosauria
+cotylosaurian
+cotype
+cotypes
+Cotys
+Cotyttia
+couac
+coucal
+couch
+couchancy
+couchant
+couchantly
+couche
+couched
+couchee
+Coucher
+coucher
+couchers
+couches
+couchette
+couching
+couchings
+couchmaker
+couchmaking
+Couchman
+couchmate
+couchy
+cou-cou
+coud
+coude
+coudee
+Couderay
+Coudersport
+Coue
+coue
+Coueism
+coueism
+cougar
+cougars
+cough
+coughed
+cougher
+coughers
+coughing
+Coughlin
+coughroot
+coughs
+coughweed
+coughwort
+cougnar
+couhage
+coul
+coulage
+could
+couldest
+couldn
+couldna
+couldn't
+couldnt
+couldron
+couldst
+coulee
+coulees
+couleur
+coulibiaca
+coulie
+coulier
+coulis
+coulisse
+coulisses
+couloir
+couloirs
+Coulomb
+coulomb
+Coulombe
+coulombic
+coulombmeter
+coulombs
+coulometer
+coulometric
+coulometrically
+coulometry
+Coulommiers
+Coulson
+Coulter
+coulter
+coulterneb
+Coulters
+coulters
+Coulterville
+coulthard
+coulure
+couma
+coumalic
+coumalin
+coumaphos
+coumara
+coumaran
+coumarane
+coumarate
+coumaric
+coumarilic
+coumarin
+coumarinic
+coumarins
+coumarone
+coumarone-indene
+coumarou
+Coumarouna
+coumarous
+Coumas
+coumbite
+Counce
+council
+councilist
+councillary
+councillor
+councillors
+councillorship
+councilman
+councilmanic
+councilmen
+councilor
+councilors
+councilorship
+councils
+councilwoman
+councilwomen
+counderstand
+co-une
+co-unite
+counite
+couniversal
+counsel
+counselable
+counseled
+counselee
+counselful
+counseling
+counsel-keeper
+counsellable
+counselled
+counselling
+counsellor
+counsellors
+counsellorship
+counselor
+counselor-at-law
+counselors
+counselors-at-law
+counselorship
+counsels
+counsinhood
+Count
+count
+countability
+countable
+countableness
+countably
+countdom
+countdown
+countdowns
+counted
+Countee
+countenance
+countenanced
+countenancer
+countenances
+countenancing
+counter
+counter-
+counterabut
+counteraccusation
+counteraccusations
+counter-acquittance
+counteracquittance
+counteract
+counteractant
+counteracted
+counteracter
+counteracting
+counteractingly
+counteraction
+counteractions
+counteractive
+counteractively
+counteractivity
+counteractor
+counteracts
+counteraddress
+counteradvance
+counteradvantage
+counteradvice
+counteradvise
+counteraffirm
+counteraffirmation
+counter-agency
+counteragency
+counteragent
+counteraggression
+counteraggressions
+counteragitate
+counteragitation
+counteralliance
+counterambush
+counterannouncement
+counteranswer
+counterappeal
+counterappellant
+counter-approach
+counterapproach
+counterapse
+counter-arch
+counterarch
+counterargue
+counterargued
+counterargues
+counterarguing
+counterargument
+counterartillery
+counterassault
+counterassaults
+counterassertion
+counterassociation
+counterassurance
+counterattack
+counterattacked
+counterattacker
+counterattacking
+counterattacks
+counterattestation
+counterattired
+counter-attraction
+counterattraction
+counterattractive
+counterattractively
+counteraverment
+counteravouch
+counteravouchment
+counterbalance
+counterbalanced
+counterbalances
+counterbalancing
+counterband
+counterbarrage
+counter-barry
+counterbase
+counter-battery
+counterbattery
+counter-beam
+counterbeating
+counterbend
+counterbewitch
+counterbid
+counterbids
+counter-bill
+counterblast
+counterblockade
+counterblockades
+counterblow
+counterblows
+counterbond
+counterborder
+counter-bore
+counterbore
+counterbored
+counterborer
+counterboring
+counter-boulle
+counterboulle
+counterboycott
+counter-brace
+counterbrace
+counterbracing
+counterbranch
+counterbrand
+counterbreastwork
+counterbuff
+counterbuilding
+countercampaign
+countercampaigns
+counter-carte
+countercarte
+counter-cast
+counter-caster
+countercathexis
+countercause
+counterchallenge
+counterchallenges
+counterchange
+counterchanged
+counterchanging
+countercharge
+countercharged
+countercharges
+countercharging
+countercharm
+countercheck
+countercheer
+counter-chevroned
+counter-claim
+counterclaim
+counterclaimant
+counterclaimed
+counterclaiming
+counterclaims
+counterclassification
+counterclassifications
+counter-clockwise
+counterclockwise
+countercolored
+counter-coloured
+countercommand
+counter-company
+countercompany
+countercompetition
+countercomplaint
+countercomplaints
+countercompony
+countercondemnation
+counterconditioning
+counterconquest
+counterconversion
+counter-couchant
+countercouchant
+countercoup
+countercoupe
+countercoups
+countercourant
+countercraft
+countercriticism
+countercriticisms
+countercross
+countercry
+countercultural
+counter-culture
+counterculture
+countercultures
+counterculturist
+counter-current
+countercurrent
+countercurrently
+countercurrentwise
+counterdance
+counterdash
+counterdecision
+counterdeclaration
+counterdecree
+counter-deed
+counterdefender
+counterdemand
+counterdemands
+counterdemonstrate
+counterdemonstration
+counterdemonstrations
+counterdemonstrator
+counterdemonstrators
+counterdeputation
+counterdesire
+counterdevelopment
+counterdifficulty
+counterdigged
+counterdike
+counterdiscipline
+counter-disengage
+counterdisengage
+counterdisengagement
+counterdistinct
+counterdistinction
+counterdistinguish
+counterdoctrine
+counterdogmatism
+counterdraft
+counter-drain
+counterdrain
+counter-draw
+counterdrive
+counter-earth
+counterearth
+countered
+countereffect
+countereffects
+counterefficiency
+countereffort
+counterefforts
+counterembargo
+counterembargos
+counter-embattled
+counterembattled
+counter-embowed
+counterembowed
+counterenamel
+counterend
+counterenergy
+counterengagement
+counterengine
+counterenthusiasm
+counterentry
+counterequivalent
+counter-ermine
+counterermine
+counterespionage
+counterestablishment
+counter-evidence
+counterevidence
+counterevidences
+counterexaggeration
+counterexample
+counterexamples
+counterexcitement
+counterexcommunication
+counterexercise
+counterexplanation
+counterexposition
+counterexpostulation
+counterextend
+counter-extension
+counterextension
+counter-faced
+counterfact
+counterfactual
+counterfactually
+counterfallacy
+counter-faller
+counterfaller
+counterfeisance
+counterfeit
+counterfeited
+counterfeiter
+counterfeiters
+counterfeiting
+counterfeitly
+counterfeitment
+counterfeitness
+counterfeits
+counterferment
+counter-fessed
+counterfessed
+counterfire
+counter-fissure
+counterfix
+counterflange
+counterflashing
+counterfleury
+counterflight
+counterflory
+counterflow
+counterflux
+counterfoil
+counter-force
+counterforce
+counterformula
+counterfort
+counterfugue
+countergabble
+countergabion
+countergage
+countergager
+countergambit
+countergarrison
+counter-gauge
+countergauge
+countergauger
+counter-gear
+countergift
+countergirded
+counterglow
+counter-guard
+counterguard
+counterguerilla
+counterguerrila
+counterguerrilla
+counterhaft
+counterhammering
+counter-hem
+counterhypothesis
+counteridea
+counterideal
+counterimagination
+counterimitate
+counterimitation
+counterimpulse
+counterindentation
+counterindented
+counterindicate
+counter-indication
+counterindication
+counterindoctrinate
+counterindoctrination
+counterinflationary
+counter-influence
+counterinfluence
+counterinfluences
+countering
+counterinsult
+counterinsurgencies
+counterinsurgency
+counterinsurgent
+counterinsurgents
+counterintelligence
+counterinterest
+counterinterpretation
+counterintrigue
+counterintrigues
+counterintuitive
+counterinvective
+counterinvestment
+counter-ion
+counterion
+counter-irritant
+counterirritant
+counterirritate
+counterirritation
+counterjudging
+counter-jumper
+counterjumper
+counter-lath
+counterlath
+counterlathed
+counterlathing
+counterlatration
+counterlaw
+counterleague
+counterlegislation
+counter-letter
+counterlife
+counterlight
+counterlighted
+counterlighting
+counterlilit
+counterlit
+counterlocking
+counter-lode
+counterlode
+counterlove
+counterly
+countermachination
+countermaid
+counterman
+countermand
+countermandable
+countermanded
+countermanding
+countermands
+countermaneuver
+countermanifesto
+countermanifestoes
+countermarch
+countermarching
+countermark
+counter-marque
+countermarriage
+countermeasure
+countermeasures
+countermeet
+countermen
+countermessage
+countermigration
+countermine
+countermined
+countermining
+countermissile
+countermission
+counter-motion
+countermotion
+countermount
+counter-move
+countermove
+countermoved
+countermovement
+countermovements
+countermoves
+countermoving
+countermure
+countermutiny
+counter-naiant
+counternaiant
+counternarrative
+counternatural
+counter-nebule
+counternecromancy
+counternoise
+counternotice
+counterobjection
+counterobligation
+counter-off
+counteroffensive
+counteroffensives
+counteroffer
+counteroffers
+counter-opening
+counteropening
+counteropponent
+counteropposite
+counterorator
+counterorder
+counterorganization
+counterpace
+counter-paled
+counterpaled
+counterpaly
+counterpane
+counterpaned
+counterpanes
+counter-parade
+counterparadox
+counterparallel
+counter-parole
+counterparole
+counterparry
+counterpart
+counterparts
+counter-party
+counter-passant
+counterpassant
+counterpassion
+counter-pawn
+counter-penalty
+counterpenalty
+counterpendent
+counterpetition
+counterpetitions
+counterphobic
+counterpicture
+counterpillar
+counterplan
+counterplay
+counterplayer
+counterplea
+counterplead
+counterpleading
+counterplease
+counterplot
+counterplotted
+counterplotter
+counterplotting
+counterploy
+counterploys
+counterpoint
+counterpointe
+counterpointed
+counterpointing
+counterpoints
+counterpoise
+counterpoised
+counterpoises
+counterpoising
+counterpoison
+counter-pole
+counterpole
+counterpoles
+counterponderate
+counterpose
+counterposition
+counterposting
+counterpotence
+counterpotency
+counter-potent
+counterpotent
+counterpower
+counterpowers
+counterpractice
+counterpray
+counterpreach
+counterpreparation
+counter-pressure
+counterpressure
+counterpressures
+counter-price
+counterprick
+counterprinciple
+counterprocess
+counterproductive
+counterproductively
+counterproductiveness
+counterproductivity
+counterprogramming
+counterproject
+counterpronunciamento
+counter-proof
+counterproof
+counterpropaganda
+counterpropagandize
+counterpropagation
+counterpropagations
+counterprophet
+counterproposal
+counterproposals
+counterproposition
+counterprotection
+counterprotest
+counterprotests
+counterprove
+counterpull
+counterpunch
+counterpuncher
+counterpuncture
+counterpush
+counter-quartered
+counterquartered
+counterquarterly
+counterquery
+counterquestion
+counterquestions
+counterquip
+counterradiation
+counter-raguled
+counterraid
+counterraids
+counterraising
+counterrallies
+counterrally
+counter-rampant
+counterrampant
+counterrate
+counterreaction
+counterreason
+counterrebuttal
+counterrebuttals
+counterreckoning
+counterrecoil
+counterreconnaissance
+counterrefer
+counterreflected
+counterreform
+Counter-Reformation
+counter-reformation
+counterreformation
+counterreforms
+counterreligion
+counterremonstrant
+counterreplied
+counterreplies
+counterreply
+counterreplying
+counterreprisal
+counterresolution
+counterresponse
+counterresponses
+counterrestoration
+counterretaliation
+counterretaliations
+counterretreat
+counter-revolution
+counterrevolution
+counterrevolutionaries
+counter-revolutionary
+counterrevolutionary
+counterrevolutionist
+counterrevolutionize
+counterrevolutions
+counter-riposte
+counterriposte
+counter-roll
+counterroll
+counterrotating
+counter-round
+counterround
+counterruin
+counters
+countersale
+counter-salient
+countersalient
+countersank
+counter-scale
+counterscale
+counterscalloped
+counterscarp
+counterscoff
+countersconce
+counterscrutiny
+counter-scuffle
+counter-sea
+countersea
+counter-seal
+counterseal
+counter-secure
+countersecure
+countersecurity
+counterselection
+countersense
+counterservice
+countershade
+countershading
+countershaft
+countershafting
+countershear
+countershine
+countershock
+countershout
+counterside
+countersiege
+countersign
+countersignal
+countersignature
+countersignatures
+countersigned
+countersigning
+countersigns
+countersink
+countersinking
+countersinks
+countersleight
+counterslope
+countersmile
+countersnarl
+counter-spell
+counterspies
+counterspy
+counterspying
+counterstain
+counterstamp
+counterstand
+counterstatant
+counter-statement
+counterstatement
+counterstatute
+counter-step
+counterstep
+counterstimulate
+counterstimulation
+counterstimulus
+counterstock
+counterstratagem
+counterstrategies
+counterstrategy
+counterstream
+counterstrike
+counterstroke
+counterstruggle
+counterstyle
+counterstyles
+countersubject
+countersue
+countersued
+countersues
+countersuggestion
+countersuggestions
+countersuing
+countersuit
+countersuits
+countersun
+countersunk
+countersunken
+countersurprise
+countersway
+counterswing
+countersworn
+countersympathy
+countersynod
+countertack
+countertail
+countertally
+counter-taste
+countertaste
+countertechnicality
+countertendencies
+counter-tendency
+countertendency
+counter-tenor
+countertenor
+countertenors
+counterterm
+counterterror
+counterterrorism
+counterterrorisms
+counterterrorist
+counterterrorists
+counterterrors
+countertheme
+countertheory
+counterthought
+counterthreat
+counterthreats
+counterthrust
+counterthrusts
+counterthwarting
+counter-tide
+counter-tierce
+countertierce
+counter-time
+countertime
+countertouch
+countertraction
+countertrades
+countertransference
+countertranslation
+countertraverse
+countertreason
+countertree
+counter-trench
+countertrench
+countertrend
+countertrends
+countertrespass
+countertrippant
+counter-tripping
+countertripping
+countertruth
+countertug
+counter-turn
+counterturn
+counterturned
+countertype
+countervail
+countervailed
+countervailing
+countervails
+countervair
+countervairy
+countervallation
+countervalue
+countervaunt
+countervene
+countervengeance
+countervenom
+countervibration
+counterview
+countervindication
+countervolition
+countervolley
+counter-vote
+countervote
+counterwager
+counter-wait
+counter-wall
+counterwall
+counterwarmth
+counterwave
+counterweigh
+counterweighed
+counterweighing
+counter-weight
+counterweight
+counterweighted
+counterweights
+counterwheel
+counterwill
+counterwilling
+counterwind
+counterwitness
+counterword
+counterwork
+counter-worker
+counterworker
+counterworking
+counterwrite
+Countess
+countess
+countesses
+countfish
+countian
+countians
+counties
+counting
+countinghouse
+countless
+countlessly
+countlessness
+countor
+countour
+countre-
+countree
+countreeman
+countrie
+countrieman
+countries
+countrification
+countrified
+countrifiedness
+countrify
+country
+country-and-western
+country-born
+country-bred
+country-dance
+country-fashion
+countryfied
+countryfiedness
+countryfolk
+countryish
+country-made
+countryman
+countrymen
+countrypeople
+countryseat
+countryside
+countrysides
+country-style
+countryward
+country-wide
+countrywide
+countrywoman
+countrywomen
+counts
+countship
+county
+countys
+county-wide
+countywide
+coup
+coupage
+coup-cart
+coupe
+couped
+coupee
+coupe-gorge
+coupelet
+couper
+Couperin
+Couperus
+coupes
+Coupeville
+couping
+Coupland
+couple
+couple-beggar
+couple-close
+coupled
+couplement
+coupler
+coupleress
+couplers
+couples
+couplet
+coupleteer
+couplets
+coupling
+couplings
+coupon
+couponed
+couponless
+coupons
+coups
+coupstick
+coupure
+courage
+courageous
+courageously
+courageousness
+courager
+courages
+courant
+courante
+courantes
+couranto
+courantoes
+courantos
+courants
+Courantyne
+courap
+couratari
+courb
+courbache
+courbaril
+courbash
+courbe
+Courbet
+courbette
+courbettes
+Courbevoie
+courche
+Courcy
+courge
+courgette
+courida
+courie
+Courier
+courier
+couriers
+couril
+courlan
+Courland
+courlans
+Cournand
+couronne
+Cours
+course
+coursed
+courser
+coursers
+courses
+coursey
+coursing
+coursings
+coursy
+Court
+court
+courtage
+courtal
+court-baron
+court-bouillon
+courtbred
+courtby
+courtcraft
+court-cupboard
+court-customary
+court-dress
+courted
+Courtelle
+Courtenay
+Courteney
+courteous
+courteously
+courteousness
+courtepy
+courter
+courters
+courtesan
+courtesanry
+courtesans
+courtesanship
+courtesied
+courtesies
+courtesy
+courtesying
+courtezan
+courtezanry
+courtezanship
+court-house
+courthouse
+courthouses
+courtier
+courtierism
+courtierly
+courtiers
+courtiership
+courtiery
+courtin
+courting
+Courtland
+court-leet
+courtless
+courtlet
+courtlier
+courtliest
+courtlike
+courtliness
+courtling
+courtly
+courtman
+court-mantle
+court-martial
+court-martials
+Courtnay
+Courtney
+courtnoll
+court-noue
+Courtois
+court-plaster
+Courtrai
+courtroll
+courtroom
+courtrooms
+courts
+courtship
+courtship-and-matrimony
+courtships
+courtside
+courts-martial
+court-tialed
+court-tialing
+court-tialled
+court-tialling
+Courtund
+courty
+court-yard
+courtyard
+courtyards
+courtzilite
+Cousance-les-Forges
+couscous
+couscouses
+couscousou
+co-use
+couseranite
+Coushatta
+Cousin
+cousin
+cousinage
+cousiness
+cousin-german
+cousinhood
+cousin-in-law
+cousinly
+cousinries
+cousinry
+Cousins
+cousins
+cousins-german
+cousinship
+cousiny
+coussinet
+Coussoule
+Cousteau
+coustumier
+Cousy
+couteau
+couteaux
+coutel
+coutelle
+couter
+couters
+Coutet
+couth
+couthe
+couther
+couthest
+couthie
+couthier
+couthiest
+couthily
+couthiness
+couthless
+couthly
+couths
+couthy
+coutil
+coutille
+coutumier
+Couture
+couture
+coutures
+couturier
+couturiere
+couturieres
+couturiers
+couturire
+couvade
+couvades
+couve
+couvert
+couverte
+couveuse
+couvre-feu
+couxia
+couxio
+covado
+covalence
+covalences
+covalency
+covalent
+covalently
+Covarecan
+Covarecas
+covariable
+covariables
+covariance
+covariant
+covariate
+covariates
+covariation
+Covarrubias
+covary
+covassal
+cove
+coved
+Covel
+Covell
+covelline
+covellite
+Covelo
+coven
+Covena
+covenable
+covenably
+covenance
+Covenant
+covenant
+covenantal
+covenantally
+covenanted
+covenantee
+Covenanter
+covenanter
+covenanting
+Covenant-israel
+covenantor
+covenants
+Coveney
+covens
+covent
+coventrate
+coven-tree
+coventries
+coventrize
+Coventry
+coventry
+cover
+coverable
+coverage
+coverages
+coverall
+coveralled
+coveralls
+coverchief
+covercle
+Coverdale
+covered
+coverer
+coverers
+covering
+coverings
+coverless
+coverlet
+coverlets
+Coverley
+coverlid
+coverlids
+cover-point
+covers
+co-versed
+coversed
+cover-shame
+cover-shoulder
+coverside
+coversine
+coverslip
+cover-slut
+coverslut
+covert
+covert-baron
+covertical
+covertly
+covertness
+coverts
+coverture
+cover-up
+coverup
+coverups
+coves
+Covesville
+covet
+covetable
+coveted
+coveter
+coveters
+coveting
+covetingly
+covetise
+covetiveness
+covetous
+covetously
+covetousness
+covets
+covey
+coveys
+covibrate
+covibration
+covid
+covido
+Coviello
+covillager
+Covillea
+covin
+Covina
+covine
+coving
+covings
+Covington
+covinous
+covinously
+covins
+covin-tree
+covisit
+covisitor
+covite
+covolume
+covotary
+cow
+cowage
+cowages
+cowal
+co-walker
+Cowan
+cowan
+Cowanesque
+Cowansville
+Coward
+coward
+cowardice
+cowardices
+cowardish
+cowardliness
+cowardly
+cowardness
+cowards
+cowardy
+Cowarts
+cow-bane
+cowbane
+cowbanes
+cowbarn
+cowbell
+cowbells
+cowberries
+cowberry
+cowbind
+cowbinds
+cowbird
+cowbirds
+cow-boy
+cowboy
+cowboys
+cowbrute
+cowbyre
+cowcatcher
+cowcatchers
+Cowden
+cowdie
+Cowdrey
+cowed
+cowedly
+coween
+Cowell
+Cowen
+Cower
+cower
+cowered
+cowerer
+cowerers
+cowering
+coweringly
+cowers
+Cowes
+Coweta
+Cowey
+cow-eyed
+cow-fat
+cow-fish
+cowfish
+cowfishes
+cowflap
+cowflaps
+cowflop
+cowflops
+cowgate
+Cowgill
+cowgirl
+cowgirls
+cow-goddess
+cowgram
+cowgrass
+cowhage
+cowhages
+cowhand
+cowhands
+cow-headed
+cowheart
+cowhearted
+cowheel
+cowherb
+cowherbs
+cowherd
+cowherds
+cow-hide
+cowhide
+cowhided
+cowhides
+cowhiding
+cow-hitch
+cow-hocked
+cowhorn
+cowhouse
+Cowichan
+Cowiche
+co-widow
+Cowie
+cowier
+cowiest
+co-wife
+cowing
+co-winner
+cowinner
+cowinners
+cowish
+cowishness
+cow-itch
+cowitch
+cowk
+cowkeeper
+cowkine
+Cowl
+cowl
+cowle
+cowled
+cowleech
+cowleeching
+Cowles
+Cowlesville
+Cowley
+cow-lice
+cowlick
+cowlicks
+cowlike
+cowling
+cowlings
+Cowlitz
+cowls
+cowl-shaped
+cowlstaff
+cowman
+cowmen
+cow-mumble
+Cown
+cow-nosed
+co-work
+co-worker
+coworker
+coworkers
+co-working
+coworking
+co-worship
+cowpat
+cowpath
+cowpats
+cowpea
+cowpeas
+cowpen
+Cowper
+cowper
+Cowperian
+cowperian
+cowperitis
+cowpie
+cowpies
+cowplop
+cowplops
+cowpock
+cowpoke
+cowpokes
+cowpony
+cow-pox
+cowpox
+cowpoxes
+cowpunch
+cowpuncher
+cowpunchers
+cowquake
+cowrie
+cowries
+cowrite
+cowrites
+cowroid
+cowrote
+cowry
+cows
+cowshard
+cowsharn
+cowshed
+cowsheds
+cowshot
+cowshut
+cowskin
+cowskins
+cowslip
+cowslip'd
+cowslipped
+cowslips
+cowson
+cow-stealing
+cowsucker
+cowtail
+cowthwort
+cow-tongue
+cowtongue
+cowtown
+cowweed
+cowwheat
+cowy
+cowyard
+Cox
+cox
+coxa
+coxae
+coxal
+coxalgia
+coxalgias
+coxalgic
+coxalgies
+coxalgy
+coxankylometer
+coxarthritis
+coxarthrocace
+coxarthropathy
+coxbones
+coxcomb
+coxcombess
+coxcombhood
+coxcombic
+coxcombical
+coxcombicality
+coxcombically
+coxcombity
+coxcombries
+coxcombry
+coxcombs
+coxcomby
+coxcomical
+coxcomically
+coxed
+coxendix
+coxes
+Coxey
+coxier
+coxiest
+coxing
+coxite
+coxitis
+coxocerite
+coxoceritic
+coxodynia
+coxo-femoral
+coxofemoral
+coxopodite
+Coxsackie
+coxswain
+coxswained
+coxswaining
+coxswains
+coxwain
+coxwaining
+coxwains
+coxy
+Coxyde
+Coy
+coy
+coyan
+Coyanosa
+coydog
+coydogs
+coyed
+coyer
+coyest
+coying
+coyish
+coyishness
+Coyle
+coyly
+coyn
+coyness
+coynesses
+coynye
+coyo
+coyol
+Coyolxauhqui
+coyos
+coyote
+coyote-brush
+coyote-bush
+Coyotero
+coyotes
+coyotillo
+coyotillos
+coyoting
+coypou
+coypous
+coypu
+coypus
+coys
+Coysevox
+coystrel
+coyure
+Coyville
+coz
+Cozad
+coze
+cozed
+cozeier
+cozeiest
+cozen
+cozenage
+cozenages
+cozened
+cozener
+cozeners
+cozening
+cozeningly
+Cozens
+cozens
+cozes
+cozey
+cozeys
+cozie
+cozied
+cozier
+cozies
+coziest
+cozily
+coziness
+cozinesses
+cozing
+Cozmo
+Cozumel
+cozy
+cozying
+Cozza
+Cozzens
+cozzes
+C.P.
+CP
+c.p.
+cp
+cp.
+CPA
+CPC
+CPCU
+CPD
+cpd
+cpd.
+CPE
+CPFF
+CPH
+CPI
+cpi
+CPIO
+CPL
+Cpl
+cpl
+CPM
+cpm
+CPMP
+CPO
+cpo
+CPP
+CPR
+CPS
+cps
+CPSR
+CPSU
+CPT
+cpt
+CPU
+cpu
+cpus
+cputime
+CPW
+CQ
+cq
+C.R.
+CR
+Cr
+cr
+cr.
+craal
+craaled
+craaling
+craals
+Crab
+crab
+crabapple
+Crabb
+Crabbe
+crabbed
+crabbedly
+crabbedness
+crabber
+crabbers
+crabbery
+crabbier
+crabbiest
+crabbily
+crabbiness
+crabbing
+crabbish
+crabbit
+crabby
+crabcatcher
+crabeater
+crab-eating
+crabeating
+craber
+crab-faced
+crab-fish
+crabfish
+crab-grass
+crabgrass
+crab-harrow
+crabhole
+crabier
+crabit
+crablet
+crablike
+crabman
+crabmeat
+crabmill
+Craborchard
+crab-plover
+crabs
+crab-shed
+crab-sidle
+crabsidle
+crabstick
+Crabtree
+crabut
+crabweed
+crabwise
+crabwood
+Cracca
+craccus
+crachoir
+Cracidae
+Cracinae
+crack
+crack-
+crackability
+crackable
+crackableness
+crackajack
+crackback
+crackbrain
+crackbrained
+crackbrainedness
+crackdown
+crackdowns
+cracked
+crackedness
+cracker
+cracker-barrel
+crackerberries
+crackerberry
+crackerjack
+crackerjacks
+cracker-off
+cracker-on
+cracker-open
+crackers
+crackers-on
+cracket
+crackhemp
+crackiness
+cracking
+crackings
+crackjaw
+crackle
+crackled
+crackles
+crackless
+crackleware
+cracklier
+crackliest
+crackling
+cracklings
+crack-loo
+crackly
+crackmans
+cracknel
+cracknels
+crack-off
+crackpot
+crackpotism
+crackpots
+crackpottedness
+crackrope
+cracks
+crackskull
+cracksman
+cracksmen
+crack-the-whip
+crack-up
+crackup
+crackups
+crack-willow
+cracky
+cracovienne
+Cracow
+cracowe
+-cracy
+Craddock
+Craddockville
+craddy
+cradge
+cradle
+cradleboard
+cradlechild
+cradled
+cradlefellow
+cradleland
+cradlelike
+cradlemaker
+cradlemaking
+cradleman
+cradlemate
+cradlemen
+cradler
+cradlers
+cradles
+cradle-shaped
+cradleside
+cradlesong
+cradlesongs
+cradletime
+cradling
+Cradock
+CRAF
+craft
+crafted
+crafter
+craftier
+craftiest
+craftily
+craftiness
+craftinesses
+crafting
+Craftint
+craftless
+craftly
+craftmanship
+Crafton
+crafts
+Craftsbury
+craftsman
+craftsmanlike
+craftsmanly
+craftsmanship
+craftsmanships
+craftsmaster
+craftsmen
+craftsmenship
+craftsmenships
+craftspeople
+craftsperson
+craftswoman
+craftwork
+craftworker
+crafty
+Craftype
+Crag
+crag
+crag-and-tail
+crag-bound
+crag-built
+crag-carven
+crag-covered
+crag-fast
+Cragford
+craggan
+cragged
+craggedly
+craggedness
+Craggie
+craggier
+craggiest
+craggily
+cragginess
+Craggy
+craggy
+craglike
+crags
+cragsman
+cragsmen
+Cragsmoor
+cragwork
+craichy
+craie
+Craig
+craig
+Craigavon
+craighle
+Craigie
+Craigmont
+craigmontite
+Craigsville
+Craigville
+Craik
+craik
+Crailsheim
+Crain
+crain
+Craiova
+craisey
+craizey
+crajuru
+crake
+craked
+crakefeet
+crake-needles
+craker
+crakes
+craking
+crakow
+Craley
+Cralg
+CRAM
+Cram
+cram
+cramasie
+crambambulee
+crambambuli
+Crambe
+crambe
+cramberry
+crambes
+crambid
+Crambidae
+Crambinae
+cramble
+crambly
+crambo
+cramboes
+crambos
+Crambus
+cramel
+Cramer
+Cramerton
+cram-full
+crammed
+crammel
+crammer
+crammers
+cramming
+crammingly
+cramoisie
+cramoisies
+cramoisy
+cramp
+crampbit
+cramped
+crampedness
+cramper
+crampet
+crampette
+crampfish
+crampfishes
+cramping
+crampingly
+cramp-iron
+crampish
+crampit
+crampits
+crampon
+cramponnee
+crampons
+crampoon
+crampoons
+cramps
+crampy
+crams
+Cran
+cran
+Cranach
+cranage
+Cranaus
+cranberries
+cranberry
+Cranbury
+crance
+crancelin
+cranch
+cranched
+cranches
+cranching
+Crandale
+Crandall
+crandall
+crandallite
+Crandell
+Crandon
+Crane
+crane
+cranebill
+craned
+crane-fly
+cranelike
+cranely
+craneman
+cranemanship
+cranemen
+Craner
+craner
+cranes
+crane's-bill
+cranesbill
+cranesman
+Cranesville
+cranet
+craneway
+craney
+Cranford
+crang
+crani-
+Crania
+crania
+craniacromial
+craniad
+cranial
+cranially
+cranian
+Craniata
+craniata
+craniate
+craniates
+cranic
+craniectomy
+craning
+craninia
+craniniums
+cranio-
+cranio-acromial
+cranio-aural
+craniocele
+craniocerebral
+cranioclasis
+cranioclasm
+cranioclast
+cranioclasty
+craniodidymus
+craniofacial
+craniognomic
+craniognomy
+craniognosy
+craniograph
+craniographer
+craniography
+cranioid
+craniol
+craniological
+craniologically
+craniologist
+craniology
+craniom
+craniomalacia
+craniomaxillary
+craniometer
+craniometric
+craniometrical
+craniometrically
+craniometrist
+craniometry
+craniopagus
+craniopathic
+craniopathy
+craniopharyngeal
+craniopharyngioma
+craniophore
+cranioplasty
+craniopuncture
+craniorhachischisis
+craniosacral
+cranioschisis
+cranioscopical
+cranioscopist
+cranioscopy
+craniospinal
+craniostenosis
+craniostosis
+Craniota
+craniota
+craniotabes
+craniotome
+craniotomies
+craniotomy
+craniotopography
+craniotympanic
+craniovertebral
+cranium
+craniums
+crank
+crankbird
+crankcase
+crankcases
+crankdisk
+crank-driven
+cranked
+cranker
+crankery
+crankest
+crankier
+crankiest
+crankily
+crankiness
+cranking
+crankish
+crankism
+crankle
+crankled
+crankles
+crankless
+crankling
+crankly
+crankman
+crankness
+Cranko
+crankous
+crankpin
+crankpins
+crankplate
+Cranks
+cranks
+crankshaft
+crankshafts
+crank-sided
+crankum
+cranky
+Cranmer
+crannage
+crannel
+crannequin
+crannia
+crannied
+crannies
+crannock
+crannog
+crannoge
+crannoger
+crannoges
+crannogs
+cranny
+crannying
+cranreuch
+cransier
+Cranston
+crantara
+crants
+Cranwell
+crany
+crap
+crapaud
+crapaudine
+crape
+craped
+crape-fish
+crapefish
+crapehanger
+crapelike
+crapes
+crapette
+craping
+Crapo
+crapon
+crapped
+crapper
+crappers
+crappie
+crappier
+crappies
+crappiest
+crappin
+crappiness
+crapping
+crappit-head
+crapple
+crappo
+crappy
+craps
+crapshooter
+crapshooters
+crapshooting
+crapula
+crapulate
+crapulence
+crapulency
+crapulent
+crapulous
+crapulously
+crapulousness
+crapwa
+crapy
+craquelure
+craquelures
+crare
+Crary
+Craryville
+CRAS
+crases
+crash
+Crashaw
+crash-dive
+crash-dived
+crash-diving
+crash-dove
+crashed
+crasher
+crashers
+crashes
+crashing
+crashingly
+crash-land
+crash-landing
+crashproof
+crashworthiness
+crashworthy
+crasis
+craspedal
+craspedodromous
+craspedon
+Craspedota
+craspedotal
+craspedote
+craspedum
+crass
+crassament
+crassamentum
+crasser
+crassest
+crassier
+crassilingual
+Crassina
+crassis
+crassities
+crassitude
+crassly
+crassness
+Crassula
+crassula
+Crassulaceae
+crassulaceous
+Crassus
+-crat
+Crataegus
+Crataeis
+Crataeva
+cratch
+cratchens
+cratches
+cratchins
+crate
+crated
+crateful
+cratemaker
+cratemaking
+crateman
+cratemen
+Crater
+crater
+crateral
+cratered
+Craterellus
+Craterid
+crateriform
+cratering
+Crateris
+crateris
+craterkin
+craterless
+craterlet
+craterlike
+craterous
+craters
+crater-shaped
+crates
+craticular
+Cratinean
+crating
+cratometer
+cratometric
+cratometry
+craton
+cratonic
+cratons
+cratsmanship
+Cratus
+craunch
+craunched
+craunches
+craunching
+craunchingly
+cravat
+cravats
+cravatted
+cravatting
+crave
+craved
+Craven
+craven
+cravened
+Cravenette
+cravenette
+Cravenetted
+Cravenetting
+cravenhearted
+cravening
+cravenly
+cravenness
+cravens
+craver
+cravers
+craves
+craving
+cravingly
+cravingness
+cravings
+cravo
+Craw
+craw
+crawberry
+craw-craw
+crawdad
+crawdads
+crawfish
+crawfished
+crawfishes
+crawfishing
+crawfoot
+crawfoots
+Crawford
+Crawfordsville
+Crawfordville
+crawful
+crawl
+crawl-a-bottom
+crawled
+crawler
+crawlerize
+crawlers
+Crawley
+crawley
+crawleyroot
+crawlie
+crawlier
+crawliest
+crawling
+crawlingly
+crawls
+crawlsome
+crawlspace
+crawl-up
+crawlway
+crawlways
+crawly
+crawm
+craws
+crawtae
+Crawthumper
+Crax
+cray
+craye
+crayer
+crayfish
+crayfishes
+crayfishing
+craylet
+Crayne
+Craynor
+crayon
+crayoned
+crayoning
+crayonist
+crayonists
+crayons
+crayonstone
+craythur
+craze
+crazed
+crazed-headed
+crazedly
+crazedness
+crazes
+crazier
+crazies
+craziest
+crazily
+craziness
+crazinesses
+crazing
+crazingmill
+crazy
+crazycat
+crazy-drunk
+crazy-headed
+crazy-looking
+crazy-mad
+crazy-pate
+crazy-paving
+crazyweed
+crazy-work
+CRB
+CRC
+crc
+crcao
+crche
+Crcy
+CRD
+cre
+crea
+creach
+creachy
+cread
+creagh
+creaght
+creak
+creaked
+creaker
+creakier
+creakiest
+creakily
+creakiness
+creaking
+creakingly
+creaks
+creaky
+cream
+creambush
+creamcake
+cream-cheese
+cream-color
+cream-colored
+creamcup
+creamcups
+creamed
+Creamer
+creamer
+creameries
+creamers
+creamery
+creameryman
+creamerymen
+cream-faced
+cream-flowered
+creamfruit
+creamier
+creamiest
+creamily
+creaminess
+creaming
+creamlaid
+creamless
+creamlike
+creammaker
+creammaking
+creamometer
+creams
+creamsacs
+cream-slice
+creamware
+cream-white
+creamy
+cream-yellow
+Crean
+creance
+creancer
+creant
+crease
+creased
+creaseless
+creaser
+crease-resistant
+creasers
+creases
+creashaks
+creasier
+creasiest
+creasing
+creasol
+creasot
+creasy
+creat
+creatable
+create
+created
+createdness
+creates
+Creath
+creatic
+creatin
+creatine
+creatinephosphoric
+creatines
+creating
+creatinin
+creatinine
+creatininemia
+creatins
+creatinuria
+Creation
+creation
+creational
+creationary
+creationism
+creationist
+creationistic
+creations
+creative
+creatively
+creativeness
+creativities
+creativity
+creatophagous
+Creator
+creator
+creatorhood
+creatorrhea
+creators
+creatorship
+creatotoxism
+creatress
+creatrix
+creatural
+creature
+creaturehood
+creatureless
+creatureliness
+creatureling
+creaturely
+creatures
+creatureship
+creaturize
+creaze
+crebri-
+crebricostate
+crebrisulcate
+crebrity
+crebrous
+creche
+creches
+Crecy
+creda
+credal
+creddock
+credence
+credences
+credencive
+credenciveness
+credenda
+credendum
+credens
+credensive
+credensiveness
+credent
+credential
+credentialed
+credentialism
+credentials
+credently
+credenza
+credenzas
+credere
+credibilities
+credibility
+credible
+credibleness
+credibly
+credit
+creditabilities
+creditability
+creditable
+creditableness
+creditably
+credited
+crediting
+creditive
+creditless
+creditor
+creditors
+creditorship
+creditress
+creditrix
+credits
+crednerite
+Credo
+credo
+credos
+credulities
+credulity
+credulous
+credulously
+credulousness
+Cree
+cree
+creed
+creedal
+creedalism
+creedalist
+creedbound
+Creede
+creeded
+creedist
+creedite
+creedless
+creedlessness
+Creedmoor
+creedmore
+Creedon
+creeds
+creedsman
+Creek
+creek
+creeker
+creekfish
+creekfishes
+Creeks
+creeks
+creekside
+creekstuff
+creeky
+Creel
+creel
+creeled
+creeler
+creeling
+creels
+creem
+creen
+creep
+creepage
+creepages
+creeper
+creepered
+creeperless
+creepers
+creep-fed
+creep-feed
+creep-feeding
+creephole
+creepie
+creepie-peepie
+creepier
+creepies
+creepiest
+creepily
+creepiness
+creeping
+creepingly
+creepmouse
+creepmousy
+creeps
+creepy
+creepy-crawly
+Crees
+crees
+creese
+creeses
+creesh
+creeshed
+creeshes
+creeshie
+creeshing
+creeshy
+Crefeld
+CREG
+Creigh
+Creight
+Creighton
+Creil
+creirgist
+Crelin
+Crellen
+cremaillere
+cremains
+cremant
+cremaster
+cremasterial
+cremasteric
+cremate
+cremated
+cremates
+cremating
+cremation
+cremationism
+cremationist
+cremations
+cremator
+crematoria
+crematorial
+crematories
+crematoriria
+crematoririums
+crematorium
+crematoriums
+cremators
+crematory
+crembalum
+creme
+Cremer
+cremerie
+cremes
+Cremini
+cremnophobia
+cremocarp
+cremometer
+Cremona
+cremona
+cremone
+cremor
+cremorne
+cremosin
+cremule
+CREN
+crena
+crenae
+crenallation
+crenate
+crenated
+crenate-leaved
+crenately
+crenate-toothed
+crenation
+crenato-
+crenature
+crenel
+crenelate
+crenelated
+crenelates
+crenelating
+crenelation
+crenelations
+crenele
+creneled
+crenelee
+crenelet
+creneling
+crenellate
+crenellated
+crenellating
+crenellation
+crenelle
+crenelled
+crenelles
+crenelling
+crenels
+crengle
+crenic
+crenitic
+crenology
+crenotherapy
+Crenothrix
+Crenshaw
+crenula
+crenulate
+crenulated
+crenulation
+creodont
+Creodonta
+creodonts
+Creola
+Creole
+creole
+creole-fish
+creole-fishes
+creoleize
+creoles
+creolian
+Creolin
+creolism
+creolite
+creolization
+creolize
+creolized
+creolizing
+Creon
+creophagia
+creophagism
+creophagist
+creophagous
+creophagy
+creosol
+creosols
+creosote
+creosoted
+creosoter
+creosotes
+creosotic
+creosoting
+crepance
+crepe
+crepe-backed
+creped
+crepehanger
+crepeier
+crepeiest
+crepe-paper
+crepes
+crepey
+crepidoma
+crepidomata
+Crepidula
+crepier
+crepiest
+Crepin
+crepine
+crepiness
+creping
+Crepis
+crepis
+crepitacula
+crepitaculum
+crepitant
+crepitate
+crepitated
+crepitating
+crepitation
+crepitous
+crepitus
+creply
+crepon
+crepons
+crept
+crepuscle
+crepuscular
+crepuscule
+crepusculine
+crepusculum
+Crepy
+crepy
+Cres
+cres
+Cresa
+cresamine
+Cresbard
+cresc
+Crescantia
+Crescas
+Crescen
+crescence
+crescendi
+Crescendo
+crescendo
+crescendoed
+crescendoing
+crescendos
+Crescent
+crescent
+crescentade
+crescentader
+crescented
+crescent-formed
+Crescentia
+crescentic
+crescentiform
+crescenting
+crescentlike
+crescent-lit
+crescentoid
+crescent-pointed
+crescents
+crescent-shaped
+crescentwise
+Crescin
+Crescint
+crescive
+crescively
+Cresco
+crescograph
+crescographic
+cresegol
+Cresida
+Cresius
+cresive
+cresol
+cresolin
+cresoline
+cresols
+cresorcin
+cresorcinol
+cresotate
+cresotic
+cresotinate
+cresotinic
+cresoxid
+cresoxide
+cresoxy
+Cresphontes
+cresphontes
+Crespi
+Crespo
+cress
+cressed
+cresselle
+cresses
+cresset
+cressets
+Cressey
+Cressi
+Cressida
+cressida
+Cressie
+cressier
+cressiest
+Cresskill
+Cressler
+Cresson
+cresson
+Cressona
+cressweed
+cresswort
+Cressy
+cressy
+crest
+crestal
+crested
+crest-fallen
+crestfallen
+crestfallenly
+crestfallenness
+crestfallens
+crestfish
+cresting
+crestings
+crestless
+Crestline
+crestline
+crestmoreite
+Creston
+Crestone
+crests
+Crestview
+Crestwood
+Creswell
+cresyl
+cresylate
+cresylene
+cresylic
+cresylite
+cresyls
+Creta
+creta
+cretaceo-
+Cretaceous
+cretaceous
+cretaceously
+Cretacic
+Cretan
+Crete
+crete
+cretefaction
+Cretheis
+Cretheus
+Cretic
+cretic
+creticism
+cretics
+cretification
+cretify
+cretin
+cretinic
+cretinism
+cretinistic
+cretinization
+cretinize
+cretinized
+cretinizing
+cretinoid
+cretinous
+cretins
+cretion
+cretionary
+Cretism
+cretize
+Creto-mycenaean
+cretonne
+cretonnes
+cretoria
+Creusa
+Creuse
+Creusois
+Creusot
+creutzer
+crevalle
+crevalles
+crevass
+crevasse
+crevassed
+crevasses
+crevassing
+Crevecoeur
+crevet
+crevette
+crevice
+creviced
+crevices
+crevis
+crew
+crew-cropped
+crewcut
+Crewe
+crewe
+crewed
+crewel
+crewelist
+crewellery
+crewels
+crewel-work
+crewelwork
+crewer
+crewet
+crewing
+crewless
+crewman
+crewmanship
+crewmen
+crewneck
+crew-necked
+crews
+Crex
+CRFC
+CRFMP
+CR-glass
+CRI
+criance
+criant
+crib
+cribbage
+cribbages
+cribbed
+cribber
+cribbers
+cribbing
+cribbings
+crib-bit
+crib-bite
+crib-biter
+cribbiter
+crib-biting
+cribbiting
+crib-bitten
+cribble
+cribbled
+cribbling
+cribella
+cribellum
+crible
+cribo
+cribose
+cribral
+cribrate
+cribrately
+cribration
+cribriform
+cribriformity
+cribrose
+cribrosity
+cribrous
+cribs
+cribwork
+cribworks
+cric
+cricetid
+Cricetidae
+cricetids
+cricetine
+Cricetus
+Crichton
+Crick
+crick
+crick-crack
+cricke
+cricked
+cricket
+cricketed
+cricketer
+cricketers
+cricketing
+cricketings
+cricketlike
+crickets
+crickety
+crickey
+cricking
+crickle
+cricks
+crico-
+cricoarytenoid
+cricoid
+cricoidectomy
+cricoids
+cricopharyngeal
+cricothyreoid
+cricothyreotomy
+cricothyroid
+cricothyroidean
+cricotomy
+cricotracheotomy
+Cricotus
+criddle
+Criders
+cried
+crier
+criers
+cries
+criey
+Crifasi
+crig
+crikey
+Crile
+crile
+Crim
+crim
+crim.
+crimble
+crime
+Crimea
+crimea
+Crimean
+crimean
+crimeful
+crimeless
+crimelessness
+crimeproof
+crimes
+criminal
+criminaldom
+criminalese
+criminalism
+criminalist
+criminalistic
+criminalistician
+criminalistics
+criminalities
+criminality
+criminally
+criminalness
+criminaloid
+criminals
+criminate
+criminated
+criminating
+crimination
+criminative
+criminator
+criminatory
+crimine
+crimini
+criminis
+criminogenesis
+criminogenic
+criminol
+criminologic
+criminological
+criminologically
+criminologies
+criminologist
+criminologists
+criminology
+criminosis
+criminous
+criminously
+criminousness
+crimison
+crimmer
+crimmers
+crimmy
+crimogenic
+Crimora
+crimp
+crimpage
+crimped
+crimper
+crimpers
+crimpier
+crimpiest
+crimpiness
+crimping
+crimple
+crimpled
+Crimplene
+crimples
+crimpling
+crimpness
+crimps
+crimpy
+crimpy-haired
+crimson
+crimson-banded
+crimson-barred
+crimson-billed
+crimson-carmine
+crimson-colored
+crimson-dyed
+crimsoned
+crimson-fronted
+crimsoning
+crimson-lined
+crimsonly
+crimsonness
+crimson-petaled
+crimson-purple
+crimsons
+crimson-scarfed
+crimson-spotted
+crimson-tipped
+crimson-veined
+crimson-violet
+crimsony
+CRIN
+Crin
+crin
+crinal
+crinanite
+crinate
+crinated
+crinatory
+crinc-
+crinch
+crine
+crined
+crinel
+crinet
+cringe
+cringed
+cringeling
+cringer
+cringers
+cringes
+cringing
+cringingly
+cringingness
+cringle
+cringle-crangle
+cringles
+crini-
+crinicultural
+criniculture
+crinid
+criniere
+criniferous
+Criniger
+crinigerous
+crinion
+criniparous
+crinital
+crinite
+crinites
+crinitory
+crinivorous
+crink
+crinkle
+crinkle-crankle
+crinkled
+crinkleroot
+crinkles
+crinklier
+crinkliest
+crinkliness
+crinkling
+crinkly
+crinkly-haired
+crinkum
+crinkum-crankum
+crinogenic
+crinoid
+crinoidal
+Crinoidea
+crinoidean
+crinoids
+crinolette
+crinoline
+crinolines
+crinose
+crinosity
+crinula
+Crinum
+crinum
+crinums
+crio-
+criobolium
+crioboly
+criocephalus
+Crioceras
+crioceratite
+crioceratitic
+Crioceris
+criolla
+criollas
+criollo
+criollos
+criophore
+Criophoros
+Criophorus
+criosphinges
+criosphinx
+criosphinxes
+crip
+cripe
+cripes
+Crippen
+crippied
+crippingly
+cripple
+crippled
+crippledom
+crippleness
+crippler
+cripplers
+cripples
+crippling
+cripplingly
+cripply
+Cripps
+crips
+CRIS
+Cris
+cris
+Crises
+crises
+Crisey
+Criseyde
+Crisfield
+crisic
+crisis
+Crisium
+crisle
+CRISP
+crisp
+Crispa
+Crispas
+crispate
+crispated
+crispation
+crispature
+crispbread
+crisped
+crisped-leaved
+Crispen
+crispen
+crispened
+crispening
+crispens
+crisper
+crispers
+crispest
+Crispi
+crispier
+crispiest
+crispily
+Crispin
+crispin
+crispine
+crispiness
+crisping
+Crispinian
+crispins
+crisp-leaved
+crisply
+crispness
+crispnesses
+crisps
+crispy
+criss
+crissa
+crissal
+criss-cross
+crisscross
+crisscrossed
+crisscrosses
+crisscrossing
+crisscross-row
+crisset
+Crissie
+crissum
+Crissy
+Crist
+Crista
+crista
+Cristabel
+cristae
+Cristal
+cristate
+cristated
+Cristatella
+Cristen
+Cristi
+Cristian
+Cristiano
+Cristie
+cristiform
+Cristin
+Cristina
+Cristine
+Cristineaux
+Cristino
+Cristiona
+Cristionna
+Cristispira
+Cristivomer
+Cristobal
+cristobalite
+Cristoforo
+Cristophe
+Cristy
+cristy
+Criswell
+crit
+crit.
+critch
+Critchfield
+critchfield
+criteria
+criteriia
+criteriions
+criteriology
+criterion
+criterional
+criterions
+criterium
+crith
+Crithidia
+crithmene
+crithomancy
+critic
+critical
+criticality
+critically
+criticalness
+criticaster
+criticasterism
+criticastry
+criticisable
+criticise
+criticised
+criticiser
+criticises
+criticising
+criticisingly
+criticism
+criticisms
+criticist
+criticizable
+criticize
+criticized
+criticizer
+criticizers
+criticizes
+criticizing
+criticizingly
+critickin
+critico-
+critico-analytically
+critico-historical
+critico-poetical
+critico-theological
+critics
+criticship
+criticsm
+criticule
+critique
+critiqued
+critiques
+critiquing
+critism
+critize
+critling
+Critta
+Crittenden
+critter
+critteria
+critters
+crittur
+critturs
+Critz
+Crius
+crivetz
+Crivitz
+crizzel
+crizzle
+crizzled
+crizzling
+CRL
+crl
+CRLF
+cro
+croak
+croaked
+Croaker
+croaker
+croakers
+croakier
+croakiest
+croakily
+croakiness
+croaking
+croaks
+croaky
+croape
+Croat
+croat
+Croatan
+Croatia
+Croatian
+croatian
+croc
+Crocanthemum
+crocard
+Croce
+Croceatas
+croceic
+crocein
+croceine
+croceines
+croceins
+croceous
+crocetin
+croceus
+croche
+Crocheron
+crochet
+crocheted
+crocheter
+crocheters
+crocheteur
+crocheting
+crochets
+croci
+crociary
+crociate
+crocidolite
+Crocidura
+crocin
+crocine
+crock
+crockard
+crocked
+Crocker
+crocker
+crockeries
+crockery
+crockeryware
+crocket
+crocketed
+crocketing
+crockets
+Crockett
+Crocketville
+Crockford
+crocking
+crocko
+crocks
+crocky
+crocodile
+crocodilean
+crocodiles
+Crocodilia
+crocodilian
+Crocodilidae
+crocodiline
+crocodilite
+crocodility
+crocodiloid
+Crocodilus
+Crocodylidae
+Crocodylus
+crocoisite
+crocoite
+crocoites
+croconate
+croconic
+Crocosmia
+crocs
+Crocus
+crocus
+crocused
+crocuses
+crocuta
+Croesi
+Croesus
+Croesuses
+Croesusi
+Crofoot
+Croft
+croft
+crofter
+crofterization
+crofterize
+crofters
+crofting
+croftland
+Crofton
+crofts
+Croghan
+croh
+croighle
+croiik
+crois
+croisad
+croisade
+croisard
+croise
+croisee
+croises
+croisette
+croissant
+croissante
+croissants
+Croix
+crojack
+crojik
+crojiks
+croker
+Crokinole
+Crom
+Cro-Magnon
+Cro-magnon
+cro-magnon
+cromaltite
+crombec
+crome
+Cromer
+Cromerian
+cromfordite
+cromlech
+cromlechs
+cromme
+crommel
+Crommelin
+Cromona
+cromorna
+cromorne
+Crompton
+cromster
+Cromwell
+cromwell
+Cromwellian
+cromwellian
+Cronartium
+crone
+croneberry
+cronel
+Croner
+crones
+cronet
+Cronia
+Cronian
+cronian
+CRONIC
+cronie
+cronied
+cronies
+Cronin
+cronish
+cronk
+cronkness
+Cronos
+cronstedtite
+Cronus
+cronus
+crony
+cronying
+cronyism
+cronyisms
+Cronyn
+crooch
+crood
+croodle
+crooisite
+crook
+crookback
+crook-backed
+crookbacked
+crookbill
+crookbilled
+crooked
+crooked-backed
+crookedbacked
+crooked-billed
+crooked-branched
+crooked-clawed
+crookeder
+crookedest
+crooked-eyed
+crooked-foot
+crooked-legged
+crooked-limbed
+crooked-lined
+crooked-lipped
+crookedly
+crookedness
+crookednesses
+crooked-nosed
+crooked-pated
+crooked-shouldered
+crooked-stemmed
+crooked-toothed
+crooked-winged
+crooked-wood
+crooken
+crookeries
+crookery
+Crookes
+crookesite
+crookfingered
+crookheaded
+crooking
+crookkneed
+crookle
+crooklegged
+crookneck
+crooknecked
+crooknecks
+crooknosed
+Crooks
+crooks
+crookshouldered
+crooksided
+crooksterned
+Crookston
+Crooksville
+crooktoothed
+crool
+Croom
+Croomia
+croon
+crooned
+crooner
+crooners
+crooning
+crooningly
+croons
+croose
+crop
+crop-bound
+crop-dust
+crop-duster
+crop-dusting
+crop-ear
+crop-eared
+crop-farming
+crop-full
+crop-haired
+crophead
+crop-headed
+cropland
+croplands
+cropless
+cropman
+crop-nosed
+croppa
+cropped
+cropper
+croppers
+croppie
+croppies
+cropping
+cropplecrown
+crop-producing
+croppy
+crops
+Cropsey
+Cropseyville
+crop-shaped
+cropshin
+crop-sick
+cropsick
+cropsickness
+crop-tailed
+cropweed
+Cropwell
+croquet
+croqueted
+croqueting
+croquets
+croquette
+croquettes
+croquignole
+croquis
+crore
+crores
+crosa
+Crosby
+crosby
+Crosbyton
+crose
+croset
+crosette
+croshabell
+crosier
+crosiered
+crosiers
+croslet
+Crosley
+crosne
+crosnes
+Cross
+cross
+cross-
+crossability
+crossable
+cross-adoring
+cross-aisle
+cross-appeal
+crossarm
+cross-armed
+crossarms
+crossband
+cross-banded
+crossbanded
+cross-banding
+crossbanding
+cross-bar
+crossbar
+crossbarred
+crossbarring
+crossbars
+crossbbred
+cross-beak
+crossbeak
+cross-beam
+crossbeam
+crossbeams
+cross-bearer
+crossbearer
+cross-bearing
+cross-bearings
+cross-bedded
+cross-bedding
+crossbelt
+cross-bench
+crossbench
+cross-benched
+cross-benchedness
+cross-bencher
+crossbencher
+cross-bias
+cross-biased
+cross-biassed
+cross-bill
+crossbill
+cross-bind
+crossbirth
+crossbite
+crossbolt
+crossbolted
+cross-bombard
+cross-bond
+cross-bones
+crossbones
+Crossbow
+cross-bow
+crossbow
+crossbowman
+crossbowmen
+crossbows
+cross-bred
+crossbred
+crossbreds
+cross-breed
+crossbreed
+crossbreeded
+crossbreeding
+crossbreeds
+cross-bridge
+cross-brush
+cross-bun
+cross-buttock
+cross-buttocker
+cross-carve
+cross-channel
+cross-check
+crosscheck
+cross-church
+cross-claim
+cross-cloth
+cross-compound
+cross-connect
+cross-country
+cross-course
+crosscourt
+cross-cousin
+cross-crosslet
+crosscrosslet
+cross-crosslets
+crosscurrent
+crosscurrented
+crosscurrents
+cross-curve
+cross-cut
+crosscut
+crosscuts
+crosscutter
+crosscutting
+cross-datable
+cross-date
+cross-dating
+cross-days
+cross-disciplinary
+cross-division
+cross-drain
+cross-dye
+cross-dyeing
+Crosse
+crosse
+crossed
+crossed-h
+crossed-out
+cross-elbowed
+crosser
+crossers
+crosses
+crossest
+Crossett
+crossette
+cross-examination
+cross-examine
+cross-examined
+cross-examiner
+cross-examining
+cross-eye
+cross-eyed
+cross-eyedness
+cross-eyes
+cross-face
+cross-fade
+cross-faded
+cross-fading
+crossfall
+cross-feed
+cross-ferred
+cross-ferring
+cross-fertile
+cross-fertilizable
+crossfertilizable
+cross-fertilization
+cross-fertilize
+cross-fertilized
+cross-fertilizing
+cross-fiber
+cross-file
+cross-filed
+cross-filing
+cross-finger
+cross-fingered
+cross-fire
+crossfire
+crossfired
+cross-firing
+crossfiring
+cross-fish
+crossfish
+cross-fissured
+cross-fixed
+crossflow
+cross-flower
+crossflower
+cross-folded
+crossfoot
+cross-fox
+cross-fur
+cross-gagged
+cross-garnet
+cross-gartered
+cross-grain
+cross-grained
+cross-grainedly
+cross-grainedness
+crossgrainedness
+crosshackle
+crosshair
+crosshairs
+crosshand
+cross-handed
+cross-handled
+cross-hatch
+crosshatch
+crosshatched
+cross-hatcher
+crosshatcher
+crosshatches
+cross-hatching
+crosshatching
+crosshaul
+crosshauling
+cross-head
+crosshead
+cross-headed
+cross-hilted
+cross-immunity
+cross-immunization
+cross-index
+crossing
+crossing-out
+crossing-over
+crossings
+cross-interrogate
+cross-interrogation
+cross-interrogator
+cross-interrogatory
+cross-invite
+crossite
+cross-jack
+crossjack
+cross-joined
+cross-jostle
+cross-laced
+cross-laminated
+cross-land
+cross-lap
+crosslap
+cross-latticed
+cross-leaved
+cross-legged
+cross-leggedly
+cross-leggedness
+crosslegs
+crosslet
+crossleted
+crosslets
+cross-level
+crossley
+cross-license
+cross-licensed
+cross-licensing
+cross-lift
+cross-light
+crosslight
+crosslighted
+crosslike
+crossline
+cross-link
+crosslink
+cross-locking
+cross-lots
+crossly
+cross-marked
+cross-mate
+cross-mated
+cross-mating
+cross-multiplication
+crossness
+Crossnore
+crossopodia
+crossopt
+crossopterygian
+Crossopterygii
+Crossosoma
+Crossosomataceae
+crossosomataceous
+cross-out
+cross-over
+crossover
+crossovers
+cross-patch
+crosspatch
+crosspatches
+crosspath
+cross-pawl
+cross-peal
+cross-piece
+crosspiece
+crosspieces
+cross-piled
+cross-plough
+cross-plow
+cross-ply
+cross-point
+crosspoint
+crosspoints
+cross-pollen
+cross-pollenize
+cross-pollinate
+cross-pollinated
+cross-pollinating
+cross-pollination
+cross-pollinize
+cross-post
+crosspost
+cross-purpose
+cross-purposes
+cross-question
+cross-questionable
+cross-questioner
+cross-questioning
+crossrail
+cross-ratio
+cross-reaction
+cross-reading
+cross-refer
+cross-reference
+cross-remainder
+cross-road
+crossroad
+crossroading
+Crossroads
+crossroads
+cross-row
+crossrow
+cross-ruff
+crossruff
+cross-sail
+cross-section
+cross-sectional
+cross-shaped
+cross-shave
+cross-slide
+cross-spale
+cross-spall
+cross-springer
+cross-staff
+cross-staffs
+cross-star
+cross-staves
+cross-sterile
+cross-sterility
+cross-stitch
+cross-stitching
+cross-stone
+cross-stratification
+cross-stratified
+cross-striated
+cross-string
+cross-stringed
+cross-stringing
+cross-striped
+cross-strung
+cross-sue
+cross-surge
+cross-tail
+crosstail
+crosstalk
+crosstie
+crosstied
+crossties
+cross-tine
+crosstoes
+cross-town
+crosstown
+crosstrack
+cross-tree
+crosstree
+crosstrees
+cross-validation
+cross-vault
+cross-vaulted
+cross-vaulting
+cross-vein
+cross-veined
+cross-ventilate
+cross-ventilation
+Crossville
+cross-vine
+cross-voting
+crosswalk
+crosswalks
+cross-way
+crossway
+crossways
+crossweb
+crossweed
+Crosswicks
+cross-wind
+crosswind
+crosswise
+crosswiseness
+crossword
+cross-worder
+crossworder
+crosswords
+crosswort
+cross-wrapped
+crost
+crostarie
+Croswell
+crotal
+Crotalaria
+crotalaria
+crotalic
+crotalid
+Crotalidae
+crotaliform
+crotalin
+Crotalinae
+crotaline
+crotalism
+crotalo
+crotaloid
+crotalum
+Crotalus
+crotalus
+crotaphic
+crotaphion
+crotaphite
+crotaphitic
+Crotaphytus
+crotch
+crotched
+crotches
+crotchet
+crotcheted
+crotcheteer
+crotchetiness
+crotcheting
+crotchets
+crotchety
+crotching
+crotchwood
+crotchy
+Croteau
+crotesco
+Crothersville
+Crotia
+crotin
+Croton
+croton
+crotonaldehyde
+crotonate
+croton-bug
+crotonbug
+Crotone
+crotonic
+crotonization
+Croton-on-Hudson
+crotons
+crotonyl
+crotonylene
+Crotophaga
+Crotopus
+crottal
+crottels
+crottle
+Crotty
+Crotus
+crotyl
+crouch
+crouchant
+crouchback
+crouche
+crouched
+croucher
+crouches
+crouchie
+crouching
+crouchingly
+crouchmas
+crouch-ware
+crouke
+crounotherapy
+croup
+croupade
+croupal
+croupe
+crouperbush
+croupes
+croupier
+croupiers
+croupiest
+croupily
+croupiness
+croupon
+croupous
+croups
+croupy
+Crouse
+crouse
+crousely
+Crouseville
+croustade
+crout
+croute
+crouth
+crouton
+croutons
+Crow
+crow
+crowbait
+crow-bar
+crowbar
+crowbars
+crowbell
+crowberries
+crowberry
+crow-bill
+crowbill
+crowboot
+crowd
+crowded
+crowdedly
+crowdedness
+Crowder
+crowder
+crowders
+crowdie
+crowdies
+crowding
+crowdle
+crowds
+crowdweed
+crowdy
+Crowe
+crowed
+Crowell
+crower
+crowers
+crowfeet
+crow-flower
+crowflower
+crowfoot
+crowfooted
+crowfoots
+crow-garlic
+Crowheart
+crowhop
+crowhopper
+crowing
+crowingly
+crowkeeper
+crowl
+crow-leek
+Crowley
+Crown
+crown
+crownal
+crownation
+crownband
+crownbeard
+crowncapping
+crowned
+crowner
+crowners
+crownet
+crownets
+crown-glass
+crowning
+crown-land
+crownland
+crownless
+crownlet
+crownlike
+crownling
+crownmaker
+crownment
+crown-of-jewels
+crown-of-thorns
+crown-paper
+crown-piece
+crownpiece
+crown-post
+Crowns
+crowns
+crown-scab
+crown-shaped
+Crownsville
+crown-wheel
+crown-work
+crownwork
+crownwort
+crow-pheasant
+crow-quill
+crows
+crow's-feet
+crow's-foot
+crowshay
+crow-silk
+crow's-nest
+crow-soap
+crow-step
+crowstep
+crowstepped
+crowsteps
+crowstick
+crow-stone
+crowstone
+crow-toe
+crowtoe
+crow-tread
+crow-victuals
+Crowville
+croy
+croyden
+Croydon
+croydon
+croyl
+croze
+crozed
+crozer
+crozers
+crozes
+Crozet
+Crozier
+crozier
+croziers
+crozing
+crozle
+crozzle
+crozzly
+CRP
+crpe
+CRRES
+CRS
+crs
+CRSAB
+CRT
+CRTC
+crts
+cru
+crub
+crubeen
+Cruce
+cruce
+cruces
+crucethouse
+cruche
+crucial
+cruciality
+crucially
+crucialness
+crucian
+Crucianella
+crucians
+cruciate
+cruciated
+cruciately
+cruciating
+cruciation
+cruciato-
+crucible
+crucibles
+Crucibulum
+crucifer
+Cruciferae
+cruciferous
+crucifers
+crucificial
+crucified
+crucifier
+crucifies
+crucifige
+crucifix
+crucifixes
+Crucifixion
+crucifixion
+crucifixions
+cruciform
+cruciformity
+cruciformly
+crucify
+crucifyfied
+crucifyfying
+crucifying
+crucigerous
+crucilly
+crucily
+Crucis
+crucis
+cruck
+crucks
+crud
+crudded
+Crudden
+cruddier
+crudding
+cruddle
+cruddy
+crude
+crudelity
+crudely
+crudeness
+cruder
+crudes
+crudest
+crudites
+crudities
+crudity
+crudle
+cruds
+crudwort
+crudy
+cruel
+crueler
+cruelest
+cruel-hearted
+cruelhearted
+cruelize
+crueller
+cruellest
+cruelly
+cruelness
+cruels
+cruelties
+cruelty
+cruent
+cruentate
+cruentation
+cruentous
+cruet
+cruets
+cruety
+Cruger
+Cruickshank
+Cruikshank
+cruise
+cruised
+cruiser
+cruisers
+cruiserweight
+cruises
+cruiseway
+cruising
+cruisingly
+cruiskeen
+cruisken
+cruive
+crull
+cruller
+crullers
+Crum
+crum
+crumb
+crumbable
+crumbcloth
+crumbed
+crumber
+crumbers
+crumbier
+crumbiest
+crumbing
+crumble
+crumbled
+crumblement
+crumbles
+crumblet
+crumblier
+crumbliest
+crumbliness
+crumbling
+crumblingness
+crumblings
+crumbly
+crumbs
+crumbum
+crumbums
+crumby
+crumen
+crumena
+crumenal
+crumhorn
+crumlet
+crummable
+crummed
+crummer
+crummie
+crummier
+crummies
+crummiest
+crumminess
+crumming
+crummock
+crummy
+crump
+crumped
+crumper
+crumpet
+crumpets
+crumping
+crumple
+crumpled
+Crumpler
+crumpler
+crumples
+crumpling
+crumply
+crumps
+Crumpton
+crumpy
+Crumrod
+crumster
+crunch
+crunchable
+crunched
+cruncher
+crunchers
+crunches
+crunchier
+crunchiest
+crunchily
+crunchiness
+crunching
+crunchingly
+crunchingness
+crunchweed
+crunchy
+crunk
+crunkle
+crunodal
+crunode
+crunodes
+crunt
+cruor
+cruorin
+cruors
+crup
+cruppen
+crupper
+cruppered
+cruppering
+cruppers
+crura
+crural
+crureus
+crurogenital
+cruroinguinal
+crurotarsal
+crus
+crusade
+crusaded
+crusader
+crusaders
+Crusades
+crusades
+crusading
+crusado
+crusadoes
+crusados
+Crusca
+cruse
+cruses
+cruset
+crusets
+crush
+crushability
+crushable
+crushableness
+crushed
+crusher
+crushers
+crushes
+crushing
+crushingly
+crushproof
+crusie
+crusile
+crusilee
+crusily
+crusily-fitchy
+Crusoe
+crust
+crusta
+Crustacea
+crustacea
+crustaceal
+crustacean
+crustaceans
+crustaceological
+crustaceologist
+crustaceology
+crustaceorubrin
+crustaceous
+crustade
+crustal
+crustalogical
+crustalogist
+crustalogy
+crustate
+crustated
+crustation
+crusted
+crustedly
+cruster
+crust-hunt
+crust-hunter
+crust-hunting
+crustier
+crustiest
+crustific
+crustification
+crustily
+crustiness
+crusting
+crustless
+crustose
+crustosis
+crusts
+crusty
+crut
+crutch
+crutch-cross
+crutched
+Crutcher
+crutcher
+crutches
+crutching
+crutchlike
+crutch-stick
+cruth
+crutter
+Crux
+crux
+cruxes
+Cruyff
+Cruz
+cruzado
+cruzadoes
+cruzados
+cruzeiro
+cruzeiros
+cruziero
+cruzieros
+crwd
+crwth
+crwths
+CRY
+cry
+cry-
+cryable
+cryaesthesia
+cryal
+cryalgesia
+Cryan
+cryanesthesia
+crybabies
+crybaby
+cryesthesia
+crying
+cryingly
+crymoanesthesia
+crymodynia
+crymotherapy
+cryo-
+cryo-aerotherapy
+cryobiological
+cryobiologically
+cryobiologist
+cryobiology
+cryocautery
+cryochore
+cryochoric
+cryoconite
+cryogen
+cryogenic
+cryogenically
+cryogenics
+cryogenies
+cryogens
+cryogeny
+cryohydrate
+cryohydric
+cryolite
+cryolites
+cryological
+cryology
+cryometer
+cryometry
+cryonic
+cryonics
+cryopathy
+cryophile
+cryophilic
+cryophoric
+cryophorus
+cryophyllite
+cryophyte
+cryoplankton
+cryoprobe
+cryoprotective
+cryo-pump
+cryoscope
+cryoscopic
+cryoscopies
+cryoscopy
+cryosel
+cryosphere
+cryospheric
+cryostase
+cryostat
+cryostats
+cryosurgeon
+cryosurgery
+cryosurgical
+cryotherapies
+cryotherapy
+cryotron
+cryotrons
+crypt
+crypt-
+crypta
+cryptaesthesia
+cryptal
+cryptamnesia
+cryptamnesic
+cryptanalysis
+cryptanalyst
+cryptanalytic
+cryptanalytical
+cryptanalytically
+cryptanalytics
+cryptanalyze
+cryptanalyzed
+cryptanalyzing
+cryptarch
+cryptarchy
+crypted
+Crypteronia
+Crypteroniaceae
+cryptesthesia
+cryptesthetic
+cryptic
+cryptical
+cryptically
+crypticness
+crypto
+crypto-
+cryptoagnostic
+cryptoanalysis
+cryptoanalyst
+cryptoanalytic
+cryptoanalytically
+cryptoanalytics
+cryptobatholithic
+cryptobranch
+Cryptobranchia
+Cryptobranchiata
+cryptobranchiate
+Cryptobranchidae
+Cryptobranchus
+Crypto-calvinism
+Crypto-calvinist
+Crypto-calvinistic
+cryptocarp
+cryptocarpic
+cryptocarpous
+Cryptocarya
+Crypto-catholic
+Crypto-catholicism
+Cryptocephala
+cryptocephalous
+Cryptocerata
+cryptocerous
+Crypto-christian
+cryptoclastic
+Cryptocleidus
+cryptoclimate
+cryptoclimatology
+cryptococcal
+cryptococci
+cryptococcic
+cryptococcosis
+Cryptococcus
+cryptococcus
+cryptocommercial
+cryptocrystalline
+cryptocrystallization
+cryptodeist
+Cryptodira
+cryptodiran
+cryptodire
+cryptodirous
+cryptodouble
+cryptodynamic
+Crypto-fenian
+cryptogam
+cryptogame
+Cryptogamia
+cryptogamia
+cryptogamian
+cryptogamic
+cryptogamical
+cryptogamist
+cryptogamous
+cryptogamy
+cryptogenetic
+cryptogenic
+cryptogenous
+Cryptoglaux
+cryptoglioma
+cryptogram
+Cryptogramma
+cryptogrammatic
+cryptogrammatical
+cryptogrammatist
+cryptogrammic
+cryptograms
+cryptograph
+cryptographal
+cryptographer
+cryptographers
+cryptographic
+cryptographical
+cryptographically
+cryptographies
+cryptographist
+cryptography
+cryptoheresy
+cryptoheretic
+cryptoinflationist
+Crypto-jesuit
+Crypto-jew
+Crypto-jewish
+cryptolite
+cryptolith
+cryptologic
+cryptological
+cryptologist
+cryptology
+cryptolunatic
+cryptomere
+Cryptomeria
+cryptomeria
+cryptomerous
+cryptometer
+cryptomnesia
+cryptomnesic
+cryptomonad
+Cryptomonadales
+Cryptomonadina
+cryptonema
+Cryptonemiales
+cryptoneurous
+cryptonym
+cryptonymic
+cryptonymous
+cryptopapist
+cryptoperthite
+Cryptophagidae
+cryptophthalmos
+Cryptophyceae
+cryptophyte
+cryptophytic
+cryptopin
+cryptopine
+cryptoporticus
+Cryptoprocta
+cryptoproselyte
+cryptoproselytism
+Crypto-protestant
+cryptopyic
+cryptopyrrole
+cryptorchid
+cryptorchidism
+cryptorchis
+cryptorchism
+Cryptorhynchus
+Crypto-royalist
+cryptorrhesis
+cryptorrhetic
+cryptos
+cryptoscope
+cryptoscopy
+Crypto-socinian
+cryptosplenetic
+Cryptostegia
+cryptostoma
+Cryptostomata
+cryptostomate
+cryptostome
+Cryptotaenia
+cryptous
+cryptovalence
+cryptovalency
+cryptovolcanic
+cryptovolcanism
+cryptoxanthin
+Cryptozoic
+cryptozoic
+cryptozoite
+cryptozonate
+Cryptozonia
+Cryptozoon
+cryptozygosity
+cryptozygous
+cryptozygy
+crypts
+Crypturi
+Crypturidae
+cryst
+cryst.
+Crysta
+Crystal
+crystal
+crystal-clear
+crystal-clearness
+crystal-dropping
+crystaled
+crystal-flowing
+crystal-gazer
+crystal-girded
+crystaling
+Crystalite
+crystalitic
+crystalize
+crystall
+crystal-leaved
+crystalled
+crystallic
+crystalliferous
+crystalliform
+crystalligerous
+crystallike
+crystallin
+crystalline
+crystalling
+crystallinity
+crystallisability
+crystallisable
+crystallisation
+crystallise
+crystallised
+crystallising
+crystallite
+crystallites
+crystallitic
+crystallitis
+crystallizability
+crystallizable
+crystallization
+crystallizations
+crystallize
+crystallized
+crystallizer
+crystallizes
+crystallizing
+crystallo-
+crystalloblastic
+crystallochemical
+crystallochemistry
+crystallod
+crystallogenesis
+crystallogenetic
+crystallogenic
+crystallogenical
+crystallogeny
+crystallogram
+crystallograph
+crystallographer
+crystallographers
+crystallographic
+crystallographical
+crystallographically
+crystallography
+crystallogy
+crystalloid
+crystalloidal
+crystallology
+crystalloluminescence
+crystallomagnetic
+crystallomancy
+crystallometric
+crystallometry
+crystallophobia
+crystallophyllian
+Crystallose
+crystallose
+crystallurgy
+crystal-producing
+crystals
+crystal-smooth
+crystal-streaming
+crystal-winged
+crystalwort
+cryste
+crystic
+Crystie
+crystograph
+crystoleum
+Crystolon
+crystosphene
+crzette
+C.S.
+CS
+Cs
+cS
+cs
+cs.
+CSA
+CSAB
+CSACC
+CSACS
+CSAR
+csardas
+CSB
+CSC
+csc
+csch
+C-scroll
+CSD
+CSDC
+CSE
+csect
+csects
+Csel
+CSF
+C-shaped
+C-sharp
+CSI
+csi
+CSIRO
+CSIS
+csk
+CSL
+CSM
+CSMA
+CSMACA
+CSMACD
+csmp
+CSN
+CSNET
+csnet
+CSO
+CSOC
+CSP
+csp
+CSPAN
+CSR
+CSRG
+CSRI
+CSRS
+CSS
+CST
+cst
+C-star
+CSTC
+CSU
+csw
+C.T.
+CT
+Ct
+ct
+ct.
+CTA
+CTC
+CTD
+cte
+Cteatus
+ctelette
+Ctenacanthus
+ctene
+ctenidia
+ctenidial
+ctenidium
+cteniform
+ctenii
+cteninidia
+ctenizid
+cteno-
+Ctenocephalus
+ctenocyst
+ctenodactyl
+Ctenodipterini
+ctenodont
+Ctenodontidae
+Ctenodus
+ctenoid
+ctenoidean
+Ctenoidei
+ctenoidian
+ctenolium
+Ctenophora
+ctenophora
+ctenophoral
+ctenophoran
+ctenophore
+ctenophoric
+ctenophorous
+Ctenoplana
+Ctenostomata
+ctenostomatous
+ctenostome
+CTERM
+Ctesiphon
+Ctesippus
+Ctesius
+ctetology
+ctf
+ctg
+ctge
+Cthrine
+ctimo
+CTIO
+CTM
+CTMS
+ctn
+CTNE
+CTO
+cto
+ctr
+ctr.
+ctrl
+CTS
+cts
+cts.
+CTSS
+CTT
+CTTC
+CTTN
+CTV
+CU
+Cu
+cu
+CUA
+cuadra
+cuadrilla
+cuadrillas
+cuadrillero
+Cuailnge
+Cuajone
+cuamuchil
+cuapinole
+cuarenta
+cuarta
+cuartel
+cuarteron
+cuartilla
+cuartillo
+cuartino
+cuarto
+Cub
+cub
+Cuba
+cuba
+Cubage
+cubage
+cubages
+cubalaya
+Cuban
+cuban
+cubane
+cubangle
+cubanite
+Cubanize
+cubans
+cubas
+cubation
+cubatory
+cubature
+cubatures
+cubbies
+cubbing
+cubbish
+cubbishly
+cubbishness
+cubby
+cubbyhole
+cubbyholes
+cubbyhouse
+cubbyu
+cubbyyew
+cubdom
+cub-drawn
+cube
+cubeb
+cubebs
+cubed
+cubehead
+cubelet
+Cubelium
+cuber
+cubera
+Cubero
+cubers
+cubes
+cube-shaped
+cubhood
+cub-hunting
+cubi
+cubi-
+cubic
+cubica
+cubical
+cubically
+cubicalness
+cubicities
+cubicity
+cubicle
+cubicles
+cubicly
+cubicone
+cubicontravariant
+cubicovariant
+cubics
+cubicula
+cubicular
+cubiculary
+cubiculo
+cubiculum
+cubiform
+cubing
+Cubism
+cubism
+cubisms
+cubist
+cubistic
+cubistically
+cubists
+cubit
+cubital
+cubitale
+cubitalia
+cubited
+cubiti
+cubitiere
+cubito
+cubito-
+cubitocarpal
+cubitocutaneous
+cubitodigital
+cubitometacarpal
+cubitopalmar
+cubitoplantar
+cubitoradial
+cubits
+cubitus
+cubla
+cubmaster
+cubo-
+cubocalcaneal
+cuboctahedron
+cubocube
+cubocuneiform
+cubododecahedral
+cuboid
+cuboidal
+cuboides
+cuboids
+cubomancy
+Cubomedusae
+cubomedusan
+cubometatarsal
+cubonavicular
+cubo-octahedral
+cubo-octahedron
+Cu-bop
+Cubrun
+cubs
+cubti
+cuca
+cucaracha
+Cuchan
+cuchia
+Cuchillo
+Cuchulain
+Cuchulainn
+Cuchullain
+cuck
+cuckhold
+cucking
+cucking-stool
+cuckold
+cuckolded
+cuckolding
+cuckoldize
+cuckoldly
+cuckoldom
+cuckoldry
+cuckolds
+cuckoldy
+cuckoo
+cuckoo-babies
+cuckoo-bread
+cuckoo-bud
+cuckoo-button
+cuckooed
+cuckoo-flower
+cuckooflower
+cuckoo-fly
+cuckoo-fool
+cuckooing
+cuckoomaid
+cuckoomaiden
+cuckoomate
+cuckoo-meat
+cuckoo-pint
+cuckoopint
+cuckoo-pintle
+cuckoopintle
+cuckoos
+cuckoo-shrike
+cuckoo-spit
+cuckoo-spittle
+cuckquean
+cuck-stool
+cuckstool
+cucoline
+CUCRIT
+Cucujid
+Cucujidae
+Cucujus
+cucularis
+cucule
+Cuculi
+Cuculidae
+cuculiform
+Cuculiformes
+cuculine
+cuculla
+cucullaris
+cucullate
+cucullated
+cucullately
+cuculle
+cuculliform
+cucullus
+cuculoid
+Cuculus
+Cucumaria
+Cucumariidae
+cucumber
+cucumbers
+cucumiform
+Cucumis
+cucupha
+cucurb
+cucurbit
+Cucurbita
+Cucurbitaceae
+cucurbitaceous
+cucurbital
+cucurbite
+cucurbitine
+cucurbits
+Cucuta
+cucuy
+cucuyo
+cud
+Cuda
+cuda
+Cudahy
+cudava
+cudbear
+cudbears
+cud-chewing
+Cuddebackville
+cudden
+cuddie
+cuddies
+cuddle
+cuddleable
+cuddled
+cuddles
+cuddlesome
+cuddlier
+cuddliest
+cuddling
+cuddly
+Cuddy
+cuddy
+cuddyhole
+cudeigh
+cudgel
+cudgeled
+cudgeler
+cudgelers
+cudgeling
+cudgelled
+cudgeller
+cudgelling
+cudgels
+cudgerie
+Cudlip
+cuds
+cudweed
+cudweeds
+cudwort
+cue
+cueball
+cue-bid
+cue-bidden
+cue-bidding
+cueca
+cuecas
+cued
+cueing
+cueist
+cueman
+cuemanship
+cuemen
+Cuenca
+cue-owl
+cuerda
+Cuernavaca
+Cuero
+cuerpo
+Cuervo
+cues
+cuesta
+cuestas
+Cueva
+cuff
+cuffed
+cuffer
+cuffin
+cuffing
+cuffle
+cuffless
+cufflink
+cufflinks
+cuffs
+cuffy
+cuffyism
+Cufic
+cufic
+cuggermugger
+Cui
+Cuiaba
+cuichunchulli
+Cuicuilco
+cuidado
+cuiejo
+cuiejos
+cuif
+cuifs
+cuinage
+cuinfo
+cuing
+cuir
+cuirass
+cuirassed
+cuirasses
+cuirassier
+cuirassing
+cuir-bouilli
+cuirie
+cuish
+cuishes
+cuisinary
+cuisine
+cuisines
+cuisinier
+cuissard
+cuissart
+cuisse
+cuissen
+cuisses
+cuisten
+cuit
+Cuitlateco
+cuitle
+cuitled
+cuitling
+cuittikin
+cuittle
+cuittled
+cuittles
+cuittling
+cui-ui
+cuj
+Cujam
+cuke
+cukes
+Cukor
+CUL
+cul
+-cula
+culation
+Culavamsa
+Culberson
+Culbert
+culbert
+Culbertson
+culbut
+culbute
+culbuter
+culch
+culches
+Culdee
+culdee
+cul-de-four
+cul-de-lampe
+Culdesac
+cul-de-sac
+-cule
+Culebra
+culebra
+culerage
+culet
+culets
+culett
+culeus
+Culex
+culex
+culgee
+Culhert
+Culiac
+Culiacan
+culices
+culicid
+Culicidae
+culicidal
+culicide
+culicids
+culiciform
+culicifugal
+culicifuge
+Culicinae
+culicine
+culicines
+Culicoides
+culilawan
+culinarian
+culinarily
+culinary
+Culion
+Cull
+cull
+culla
+cullage
+Cullan
+cullas
+cullay
+cullays
+culled
+Cullen
+cullender
+Culleoka
+culler
+cullers
+cullet
+cullets
+Culley
+cullibility
+cullible
+Cullie
+cullied
+cullies
+Cullin
+culling
+cullion
+cullionly
+cullionry
+cullions
+cullis
+cullisance
+cullises
+Culliton
+Cullman
+Culloden
+Cullom
+Cullowhee
+culls
+Cully
+cully
+cullying
+Culm
+culm
+culmed
+culmen
+culmicolous
+culmiferous
+culmigenous
+culminal
+culminant
+culminatation
+culminatations
+culminate
+culminated
+culminates
+culminating
+culmination
+culminations
+culminative
+culming
+culms
+culmy
+Culosio
+culot
+culotte
+culottes
+culottic
+culottism
+culp
+culpa
+culpabilis
+culpability
+culpable
+culpableness
+culpably
+culpae
+culpas
+culpate
+culpatory
+culpeo
+Culpeper
+culpon
+culpose
+culprit
+culprits
+culrage
+culsdesac
+cult
+cultch
+cultches
+cultellation
+cultelli
+cultellus
+culter
+culteranismo
+culti
+cultic
+cultigen
+cultigens
+cultirostral
+Cultirostres
+cultish
+cultism
+cultismo
+cultisms
+cultist
+cultistic
+cultists
+cultivability
+cultivable
+cultivably
+cultivar
+cultivars
+cultivatability
+cultivatable
+cultivatation
+cultivatations
+cultivate
+cultivated
+cultivates
+cultivating
+cultivation
+cultivations
+cultivative
+cultivator
+cultivators
+cultive
+cultrate
+cultrated
+cultriform
+cultrirostral
+Cultrirostres
+cults
+culttelli
+cult-title
+cultual
+culturable
+cultural
+culturalist
+culturally
+cultural-nomadic
+culture
+cultured
+cultureless
+cultures
+culturine
+culturing
+culturist
+culturization
+culturize
+culturological
+culturologically
+culturologist
+culturology
+cultus
+cultus-cod
+cultuses
+-culus
+Culver
+culver
+culverfoot
+culverhouse
+culverin
+culverineer
+culveriner
+culverins
+culverkey
+culverkeys
+culvers
+culvert
+culvertage
+culverts
+culverwort
+cum
+Cumacea
+cumacean
+cumaceous
+Cumae
+Cumaean
+cumal
+cumaldehyde
+Cuman
+Cumana
+Cumanagoto
+cumaphyte
+cumaphytic
+cumaphytism
+Cumar
+cumara
+cumarin
+cumarins
+cumarone
+cumaru
+cumay
+cumbent
+cumber
+cumbered
+cumberer
+cumberers
+cumbering
+Cumberland
+cumberland
+cumberlandite
+cumberless
+cumberment
+Cumbernauld
+cumbers
+cumbersome
+cumbersomely
+cumbersomeness
+cumberworld
+cumbha
+cumble
+cumbly
+Cumbola
+cumbraite
+cumbrance
+cumbre
+Cumbria
+Cumbrian
+cumbrous
+cumbrously
+cumbrousness
+cumbu
+Cumby
+cumene
+cumengite
+cumenyl
+cumflutter
+cumhal
+cumic
+cumidin
+cumidine
+cumin
+cuminal
+Cumine
+Cumings
+cuminic
+cuminoin
+cuminol
+cuminole
+cumins
+cuminseed
+cuminyl
+cumly
+Cummaquid
+cummer
+cummerbund
+cummerbunds
+cummers
+cummin
+Cummine
+Cumming
+Cummings
+Cummington
+cummingtonite
+Cummins
+cummins
+cummock
+cumol
+cump
+cumquat
+cumquats
+cumsha
+cumshaw
+cumshaws
+cumu-cirro-stratus
+cumul-
+cumulant
+cumular
+cumular-spherulite
+cumulate
+cumulated
+cumulately
+cumulates
+cumulating
+cumulation
+cumulatist
+cumulative
+cumulatively
+cumulativeness
+cumulato-
+cumulene
+cumulet
+cumuli
+cumuliform
+cumulite
+cumulo-
+cumulo-cirro-stratus
+cumulo-cirrus
+cumulocirrus
+cumulo-nimbus
+cumulonimbus
+cumulophyric
+cumulose
+cumulo-stratus
+cumulostratus
+cumulous
+cumulo-volcano
+cumulus
+cumyl
+cun
+Cuna
+cunabula
+cunabular
+Cunan
+Cunard
+Cunarder
+Cunas
+Cunaxa
+cunctation
+cunctatious
+cunctative
+cunctator
+cunctatorship
+cunctatory
+cunctatury
+cunctipotent
+cund
+cundeamor
+Cundiff
+cundite
+cundum
+cundums
+cundurango
+cundy
+cunea
+cuneal
+cuneate
+cuneated
+cuneately
+cuneatic
+cuneator
+cunei
+cuneiform
+cuneiformist
+cunenei
+Cuneo
+cuneo-
+cuneocuboid
+cuneonavicular
+cuneoscaphoid
+cunette
+cuneus
+Cuney
+Cung
+cungeboi
+cungevoi
+cunicular
+cuniculi
+cuniculus
+cuniform
+cuniforms
+cunila
+cunili
+Cunina
+cunit
+cunjah
+cunjer
+cunjevoi
+cunner
+cunners
+cunni
+cunnilinctus
+cunnilinguism
+cunnilingus
+cunning
+cunningaire
+cunninger
+cunningest
+Cunningham
+Cunninghamia
+cunningly
+cunningness
+cunnings
+cunny
+Cunonia
+Cunoniaceae
+cunoniaceous
+cunt
+cunts
+CUNY
+cunye
+cunyie
+Cunza
+cunzie
+Cuon
+cuorin
+cup
+Cupania
+Cupavo
+cupay
+cup-bearer
+cupbearer
+cupbearers
+cupboard
+cupboards
+cupcake
+cupcakes
+cupel
+cupeled
+cupeler
+cupelers
+cupeling
+cupellation
+cupelled
+cupeller
+cupellers
+cupelling
+cupels
+Cupertino
+cupflower
+cupful
+cupfulfuls
+cupfuls
+Cuphea
+cuphead
+cup-headed
+cupholder
+Cupid
+cupid
+cupidinous
+cupidities
+cupidity
+cupidon
+cupidone
+cupids
+cupid's-bow
+Cupid's-dart
+cupiuba
+cupless
+cuplike
+cupmaker
+cupmaking
+cupman
+cup-mark
+cup-marked
+cupmate
+cup-moss
+Cupo
+cupola
+cupola-capped
+cupolaed
+cupolaing
+cupolaman
+cupolar
+cupola-roofed
+cupolas
+cupolated
+cuppa
+cuppas
+cupped
+cuppen
+cupper
+cuppers
+cuppier
+cuppiest
+cuppin
+cupping
+cuppings
+cuppy
+cuprammonia
+cuprammonium
+cuprate
+cuprein
+cupreine
+cuprene
+cupreo-
+cupreous
+Cupressaceae
+cupressineous
+Cupressinoxylon
+Cupressus
+cupric
+cupride
+cupriferous
+cuprite
+cuprites
+cupro-
+cuproammonium
+cuprobismutite
+cuprocyanide
+cuprodescloizite
+cuproid
+cuproiodargyrite
+cupromanganese
+cupronickel
+cuproplumbite
+cuproscheelite
+cuprose
+cuprosilicon
+cuproso-
+cuprotungstite
+cuprous
+cuprum
+cuprums
+cups
+cupseed
+cupsful
+cup-shake
+cup-shaped
+cup-shot
+cupstone
+cup-tied
+cup-tossing
+cupula
+cupulae
+cupular
+cupulate
+cupule
+cupules
+Cupuliferae
+cupuliferous
+cupuliform
+cur
+cur.
+cura
+Curaao
+curability
+curable
+curableness
+curably
+Curacao
+curacao
+curacaos
+curace
+curacies
+curacoa
+curacoas
+curacy
+curage
+curagh
+curaghs
+curara
+curaras
+Curare
+curare
+curares
+curari
+curarine
+curarines
+curaris
+curarization
+curarize
+curarized
+curarizes
+curarizing
+curassow
+curassows
+curat
+curatage
+curate
+curatel
+curates
+curateship
+curatess
+curatial
+curatic
+curatical
+curation
+curative
+curatively
+curativeness
+curatives
+curatize
+curatolatry
+curator
+curatorial
+curatorium
+curators
+curatorship
+curatory
+curatrices
+curatrix
+Curavecan
+curb
+curbable
+curbash
+curbed
+curber
+curbers
+curbing
+curbings
+curbless
+curblike
+curbline
+curb-plate
+curb-roof
+curbs
+curb-sending
+curbside
+curb-stone
+curbstone
+curbstoner
+curbstones
+curby
+curcas
+curch
+curchef
+curches
+curchy
+Curcio
+curcuddoch
+Curculio
+curculio
+curculionid
+Curculionidae
+curculionist
+curculios
+Curcuma
+curcuma
+curcumas
+curcumin
+curd
+curded
+curdier
+curdiest
+curdiness
+curding
+curdle
+curdled
+curdler
+curdlers
+curdles
+curdling
+curdly
+curdoo
+curds
+Curdsville
+curdwort
+curdy
+cure
+cure-all
+cured
+cureless
+curelessly
+curelessness
+curemaster
+curer
+curers
+cures
+curet
+Curetes
+curets
+curettage
+curette
+curetted
+curettement
+curettes
+curetting
+curf
+curfew
+curfewed
+curfewing
+curfews
+curfs
+Curhan
+Curia
+curia
+curiae
+curiage
+curial
+curialism
+curialist
+curialistic
+curialities
+curiality
+curiam
+curiara
+curiate
+Curiatii
+curiboca
+Curie
+curie
+curiegram
+curies
+curiescopy
+curiet
+curietherapy
+curin
+curine
+curing
+curio
+curiolofic
+curiologic
+curiological
+curiologically
+curiologics
+curiology
+curiomaniac
+curios
+curiosa
+curiosi
+curiosities
+curiosity
+curioso
+curiosos
+curious
+curiouser
+curiousest
+curiously
+curiousness
+curiousnesses
+curite
+curites
+Curitiba
+Curitis
+Curityba
+curium
+curiums
+Curkell
+curl
+curled
+curled-leaved
+curledly
+curledness
+curler
+curlers
+curlew
+curlewberry
+curlews
+Curley
+curl-flowered
+curlicue
+curlicued
+curlicues
+curlicuing
+curlier
+curliest
+curlie-wurlie
+curliewurlie
+curliewurly
+curlike
+curlily
+curliness
+curling
+curlingly
+curlings
+Curllsville
+curlpaper
+curls
+curly
+curly-coated
+curlycue
+curlycues
+curly-haired
+curlyhead
+curly-headed
+curlyheads
+curly-locked
+curlylocks
+curly-pate
+curly-pated
+curly-polled
+curly-toed
+curmudgeon
+curmudgeonery
+curmudgeonish
+curmudgeonly
+curmudgeons
+curmurging
+curmurring
+curn
+curney
+curneys
+curnie
+curnies
+Curnin
+curnock
+curns
+curpel
+curpin
+curple
+Curr
+curr
+currach
+currachs
+currack
+curragh
+curraghs
+currajong
+Curran
+curran
+currance
+currane
+currans
+currant
+currant-leaf
+currants
+currantworm
+curratow
+currawang
+currawong
+curred
+Curren
+currencies
+currency
+current
+currently
+currentness
+currents
+currentwise
+Currer
+Currey
+curricla
+curricle
+curricled
+curricles
+curricling
+curricula
+curricular
+curricularization
+curricularize
+curriculum
+curriculums
+Currie
+currie
+curried
+Currier
+currier
+currieries
+curriers
+curriery
+curries
+curriing
+currijong
+curring
+currish
+currishly
+currishness
+Currituck
+currock
+currs
+Curry
+curry
+curry-comb
+currycomb
+currycombed
+currycombing
+currycombs
+curry-favel
+curryfavel
+curryfavour
+currying
+Curryville
+curs
+Cursa
+cursal
+cursaro
+curse
+cursed
+curseder
+cursedest
+cursedly
+cursedness
+cursement
+cursen
+curser
+cursers
+curses
+curship
+cursillo
+cursing
+cursitate
+cursitor
+cursive
+cursively
+cursiveness
+cursives
+Curson
+cursor
+cursorary
+Cursores
+cursores
+Cursoria
+cursorial
+Cursoriidae
+cursorily
+cursoriness
+cursorious
+Cursorius
+cursors
+cursory
+curst
+curstful
+curstfully
+curstly
+curstness
+cursus
+Curt
+curt
+curtail
+curtailed
+curtailedly
+curtailer
+curtailing
+curtailment
+curtailments
+curtails
+curtail-step
+curtain
+curtained
+curtaining
+curtainless
+curtain-raiser
+curtains
+curtainwise
+curtal
+curtal-ax
+curtalax
+curtalaxes
+curtals
+Curtana
+curtana
+curtate
+curtation
+curtaxe
+curtays
+curted
+curtein
+curtelace
+curteous
+curter
+curtesies
+curtest
+curtesy
+Curt-hose
+curt-hose
+Curtice
+curtilage
+Curtin
+Curtis
+Curtise
+Curtiss
+Curtisville
+Curtius
+curtlax
+curtly
+curtness
+curtnesses
+curtsey
+curtseyed
+curtseying
+curtseys
+curtsied
+curtsies
+curtsy
+curtsying
+curua
+curuba
+Curucaneca
+Curucanecan
+curucucu
+curucui
+curule
+Curuminaca
+Curuminacan
+curupay
+curupays
+curupey
+Curupira
+cururo
+cururos
+Curuzu-Cuatia
+curvaceous
+curvaceously
+curvaceousness
+curvacious
+curval
+curvant
+curvate
+curvated
+curvation
+curvative
+curvature
+curvatures
+curve
+curve-ball
+curveball
+curve-billed
+curved
+curved-fruited
+curved-horned
+curvedly
+curvedness
+curved-veined
+curve-fruited
+curver
+curves
+curvesome
+curvesomeness
+curvet
+curveted
+curveting
+curvets
+curvette
+curvetted
+curvetting
+curve-veined
+curvey
+curvi-
+curvicaudate
+curvicostate
+curvidentate
+curvier
+curviest
+curvifoliate
+curviform
+curvilinead
+curvilineal
+curvilinear
+curvilinearity
+curvilinearly
+curvimeter
+curvinervate
+curvinerved
+curviness
+curving
+curvirostral
+Curvirostres
+curviserial
+curvital
+curvities
+curvity
+curvle
+curvograph
+curvometer
+curvous
+curvulate
+curvy
+Curwensville
+curwhibble
+curwillet
+cury
+curying
+Curzon
+Cusack
+Cusanus
+Cusco
+cusco-bark
+cuscohygrin
+cuscohygrine
+cusconin
+cusconine
+Cuscus
+cuscus
+cuscuses
+Cuscuta
+Cuscutaceae
+cuscutaceous
+cusec
+cusecs
+cuselite
+Cush
+cush
+cushag
+cushat
+cushats
+cushaw
+cushaws
+cush-cush
+cushew-bird
+cushewbird
+cushie
+cushier
+cushiest
+cushily
+cushiness
+Cushing
+cushing
+cushion
+cushioncraft
+cushioned
+cushionet
+cushionflower
+cushion-footed
+cushioniness
+cushioning
+cushionless
+cushionlike
+cushions
+cushion-shaped
+cushion-tired
+cushiony
+Cushite
+Cushitic
+cushitic
+cushlamochree
+Cushman
+cushy
+Cusick
+cusie
+cusinero
+cusk
+cusk-eel
+cusk-eels
+cusks
+CUSO
+Cusp
+cusp
+cuspal
+cusparia
+cusparidine
+cusparine
+cuspate
+cuspated
+cusped
+cuspid
+cuspidal
+cuspidate
+cuspidated
+cuspidation
+cuspides
+cuspidine
+cuspidor
+cuspidors
+cuspids
+cusping
+cuspis
+cusps
+cusp-shaped
+cuspule
+cuss
+cussed
+cussedly
+cussedness
+cusser
+cussers
+cusses
+Cusseta
+cussing
+cussing-out
+cusso
+cussos
+cussword
+cusswords
+cust
+Custar
+custard
+custard-cups
+custards
+Custer
+custerite
+custode
+custodee
+custodes
+custodia
+custodial
+custodiam
+custodian
+custodians
+custodianship
+custodier
+custodies
+custody
+custom
+customable
+customableness
+customably
+customance
+customaries
+customarily
+customariness
+customary
+custom-built
+custom-cut
+customed
+customer
+customers
+custom-house
+customhouse
+customhouses
+customing
+customizable
+customization
+customizations
+customize
+customized
+customizer
+customizers
+customizes
+customizing
+customly
+custom-made
+customs
+customs-exempt
+customs-house
+customshouse
+custom-tailored
+custos
+custrel
+custron
+custroun
+custumal
+custumals
+Cut
+cut
+cutability
+Cutaiar
+cut-and-cover
+cut-and-dried
+cut-and-dry
+cut-and-try
+cutaneal
+cutaneous
+cutaneously
+cut-away
+cutaway
+cutaways
+cut-back
+cutback
+cutbacks
+Cutbank
+cutbank
+cutbanks
+Cutch
+cutch
+cutcha
+Cutcheon
+cutcher
+cutcheries
+cutcherries
+cutcherry
+cutchery
+cutches
+Cutchogue
+Cutcliffe
+cut-down
+cutdown
+cutdowns
+cute
+cutely
+cuteness
+cutenesses
+cuter
+Cuterebra
+cutes
+cutesie
+cutesier
+cutesiest
+cutest
+cutesy
+cutey
+cuteys
+cut-finger
+cut-glass
+cut-grass
+cutgrass
+cutgrasses
+Cuthbert
+Cuthbertson
+Cuthburt
+cutheal
+cuticle
+cuticles
+cuticolor
+cuticula
+cuticulae
+cuticular
+cuticularization
+cuticularize
+cuticulate
+cutidure
+cutiduris
+cutie
+cuties
+cutification
+cutify
+cutigeral
+cutikin
+cut-in
+cutin
+cutinisation
+cutinise
+cutinised
+cutinises
+cutinising
+cutinization
+cutinize
+cutinized
+cutinizes
+cutinizing
+cutins
+cutireaction
+cutis
+cutisector
+cutises
+Cutiterebra
+cutitis
+cutization
+CUTK
+cutlas
+cutlases
+cutlash
+cutlass
+cutlasses
+cutlassfish
+cutlassfishes
+cut-leaf
+cut-leaved
+Cutler
+cutler
+cutleress
+Cutleria
+Cutleriaceae
+cutleriaceous
+Cutleriales
+cutleries
+Cutlerr
+cutlers
+cutlery
+cutlet
+cutlets
+cutline
+cutlines
+cutling
+cutlings
+Cutlip
+cutlips
+Cutlor
+cutocellulose
+cut-off
+cutoff
+cutoffs
+cutose
+cut-out
+cutout
+cutouts
+cutover
+cutovers
+cut-paper
+cut-price
+cutpurse
+cutpurses
+cut-rate
+CUTS
+cuts
+cutset
+Cutshin
+cuttable
+Cuttack
+cuttage
+cuttages
+cuttail
+cuttanee
+cutted
+Cutter
+cutter
+cutter-built
+cutter-down
+cutter-gig
+cutterhead
+cutterman
+cutter-off
+cutter-out
+cutter-rigged
+cutters
+cutter-up
+cutthroat
+cutthroats
+cut-through
+Cuttie
+cutties
+cuttikin
+cutting
+cuttingly
+cuttingness
+cuttings
+Cuttingsville
+cuttle
+cuttle-bone
+cuttlebone
+cuttlebones
+cuttled
+cuttle-fish
+cuttlefish
+cuttlefishes
+Cuttler
+cuttler
+cuttles
+cuttling
+cuttoe
+cuttoo
+cuttoos
+cut-toothed
+Cutty
+cutty
+Cuttyhunk
+cuttyhunk
+cutty-stool
+cut-under
+Cutuno
+cutup
+cutups
+cutwal
+cutwater
+cutwaters
+cutweed
+cut-work
+cutwork
+cutworks
+cutworm
+cutworms
+cuvage
+cuve
+cuvee
+cuvette
+cuvettes
+Cuvier
+Cuvierian
+cuvies
+cuvy
+Cuxhaven
+cuya
+Cuyab
+Cuyaba
+Cuyama
+Cuyapo
+cuyas
+Cuyler
+Cuyp
+Cuzceno
+cuzceno
+Cuzco
+Cuzzart
+CV
+cv
+CVA
+CVCC
+Cvennes
+C.V.O.
+CVO
+CVR
+CVT
+CW
+CWA
+CWC
+CWI
+cwierc
+Cwikielnik
+Cwlth
+cwm
+Cwmbran
+cwms
+CWO
+c.w.o.
+cwo
+cwrite
+CWRU
+cwt
+cwt.
+CXI
+-cy
+CY
+Cy
+cy
+cya-
+cyaathia
+cyamelid
+cyamelide
+cyamid
+cyamoid
+Cyamus
+cyan
+cyan-
+cyanacetic
+Cyanamid
+cyanamid
+cyanamide
+cyanamids
+cyananthrol
+Cyanastraceae
+Cyanastrum
+cyanate
+cyanates
+cyanaurate
+cyanauric
+cyanbenzyl
+cyan-blue
+cyancarbonic
+Cyane
+Cyanea
+cyanea
+cyanean
+Cyanee
+cyanemia
+cyaneous
+cyanephidrosis
+cyanformate
+cyanformic
+cyanhidrosis
+cyanhydrate
+cyanhydric
+cyanhydrin
+cyanic
+cyanicide
+cyanid
+cyanidation
+cyanide
+cyanided
+cyanides
+cyanidin
+cyanidine
+cyaniding
+cyanidrosis
+cyanids
+cyanimide
+cyanin
+cyanine
+cyanines
+cyanins
+cyanite
+cyanites
+cyanitic
+cyanize
+cyanized
+cyanizing
+cyanmethemoglobin
+cyano
+cyano-
+cyanoacetate
+cyanoacetic
+cyanoacrylate
+cyanoaurate
+cyanoauric
+cyanobenzene
+cyanocarbonic
+cyanochlorous
+cyanochroia
+cyanochroic
+Cyanocitta
+cyanocobalamin
+cyanocobalamine
+cyanocrystallin
+cyanoderma
+cyanoethylate
+cyanoethylation
+cyanogen
+cyanogenamide
+cyanogenesis
+cyanogenetic
+cyanogenic
+cyanogens
+cyanoguanidine
+cyanohermidin
+cyanohydrin
+cyanol
+cyanole
+cyanomaclurin
+cyanometer
+cyanomethaemoglobin
+cyanomethemoglobin
+cyanometric
+cyanometries
+cyanometry
+cyanopathic
+cyanopathy
+cyanophil
+cyanophile
+cyanophilous
+cyanophoric
+cyanophose
+Cyanophyceae
+cyanophycean
+cyanophyceous
+cyanophycin
+cyanopia
+cyanoplastid
+cyanoplatinite
+cyanoplatinous
+cyanopsia
+cyanose
+cyanosed
+cyanoses
+cyanosis
+cyanosite
+Cyanospiza
+cyanotic
+cyanotrichite
+cyanotype
+cyans
+cyanuramide
+cyanurate
+cyanuret
+cyanuric
+cyanurin
+cyanurine
+cyanus
+cyaphenine
+cyath
+Cyathaspis
+Cyathea
+Cyatheaceae
+cyatheaceous
+cyathi
+cyathia
+cyathiform
+cyathium
+cyathoid
+cyatholith
+Cyathophyllidae
+cyathophylline
+cyathophylloid
+Cyathophyllum
+cyathos
+cyathozooid
+cyathus
+Cyb
+Cybebe
+Cybele
+cybele
+cybercultural
+cyberculture
+cybernate
+cybernated
+cybernating
+cybernation
+cybernetic
+cybernetical
+cybernetically
+cybernetician
+cyberneticist
+cyberneticists
+cybernetics
+cybernion
+Cybil
+Cybill
+Cybister
+cyborg
+cyborgs
+cyc
+cycad
+Cycadaceae
+cycadaceous
+Cycadales
+cycadean
+cycadeoid
+Cycadeoidea
+cycadeous
+cycadiform
+cycadite
+cycadlike
+cycadofilicale
+Cycadofilicales
+cycadofilicales
+Cycadofilices
+cycadofilicinean
+Cycadophyta
+cycadophyte
+cycads
+Cycas
+cycas
+cycases
+cycasin
+cycasins
+Cychosz
+Cychreus
+cycl
+cycl-
+Cyclades
+cyclades
+Cycladic
+cyclamate
+cyclamates
+cyclamen
+cyclamens
+cyclamin
+cyclamine
+cyclammonium
+Cyclamycin
+cyclane
+Cyclanthaceae
+cyclanthaceous
+Cyclanthales
+Cyclanthus
+cyclar
+cyclarthrodial
+cyclarthrosis
+cyclarthrsis
+cyclas
+cyclase
+cyclases
+cyclazocine
+cycle
+cyclecar
+cyclecars
+cycled
+cycledom
+cyclene
+cycler
+cyclers
+cyclery
+cycles
+cyclesmith
+Cycliae
+cyclian
+cyclic
+cyclical
+cyclicality
+cyclically
+cyclicalness
+cyclicism
+cyclicity
+cyclicly
+cyclide
+cyclindroid
+cycling
+cyclings
+cyclism
+cyclist
+cyclistic
+cyclists
+cyclitic
+cyclitis
+cyclitol
+cyclitols
+cyclization
+cyclize
+cyclized
+cyclizes
+cyclizing
+cyclo
+cyclo-
+cycloacetylene
+cycloaddition
+cycloaliphatic
+cycloalkane
+Cyclobothra
+cyclobutane
+cyclocephaly
+cyclocoelic
+cyclocoelous
+Cycloconium
+cyclo-cross
+cyclode
+cyclodiene
+cyclodiolefin
+cyclodiolefine
+cycloganoid
+Cycloganoidei
+cyclogenesis
+cyclogram
+cyclograph
+cyclographer
+cycloheptane
+cycloheptanone
+cyclohexadienyl
+cyclohexane
+cyclohexanol
+cyclohexanone
+cyclohexatriene
+cyclohexene
+cycloheximide
+cyclohexyl
+cyclohexylamine
+cycloid
+cycloidal
+cycloidally
+cycloidean
+Cycloidei
+cycloidian
+cycloidotrope
+cycloids
+cyclolith
+Cycloloma
+cyclolysis
+cyclomania
+cyclometer
+cyclometers
+cyclometric
+cyclometrical
+cyclometries
+cyclometry
+Cyclomyaria
+cyclomyarian
+cyclonal
+cyclone
+cyclone-proof
+cyclones
+cyclonic
+cyclonical
+cyclonically
+cyclonist
+cyclonite
+cyclonologist
+cyclonology
+cyclonometer
+cyclonoscope
+cycloolefin
+cycloolefine
+cycloolefinic
+cyclop
+cyclopaedia
+cyclopaedias
+cyclopaedic
+cyclopaedically
+cyclopaedist
+cycloparaffin
+cyclope
+Cyclopean
+cyclopean
+cyclopedia
+cyclopedias
+cyclopedic
+cyclopedical
+cyclopedically
+cyclopedist
+cyclopentadiene
+cyclopentane
+cyclopentanone
+cyclopentene
+Cyclopes
+cyclopes
+cyclophoria
+cyclophoric
+Cyclophorus
+cyclophosphamide
+cyclophosphamides
+cyclophrenia
+cyclopia
+Cyclopic
+cyclopic
+cyclopism
+cyclopite
+cycloplegia
+cycloplegic
+cyclopoid
+cyclopropane
+Cyclops
+cyclops
+Cyclopteridae
+cyclopteroid
+cyclopterous
+cyclopy
+cyclorama
+cycloramas
+cycloramic
+Cyclorrhapha
+cyclorrhaphous
+cyclos
+cycloscope
+cyclose
+cycloserine
+cycloses
+cyclosilicate
+cyclosis
+cyclospermous
+Cyclospondyli
+cyclospondylic
+cyclospondylous
+Cyclosporales
+Cyclosporeae
+Cyclosporinae
+cyclosporous
+Cyclostoma
+Cyclostomata
+cyclostomate
+Cyclostomatidae
+cyclostomatous
+cyclostome
+Cyclostomes
+Cyclostomi
+Cyclostomidae
+cyclostomous
+cyclostrophic
+cyclostylar
+cyclostyle
+Cyclotella
+cyclothem
+cyclothure
+cyclothurine
+Cyclothurus
+cyclothyme
+cyclothymia
+cyclothymiac
+cyclothymic
+cyclotome
+cyclotomic
+cyclotomies
+cyclotomy
+Cyclotosaurus
+cyclotrimethylenetrinitramine
+cyclotron
+cyclotrons
+cyclovertebral
+cyclus
+Cycnus
+Cyd
+cyder
+cyders
+Cydippe
+cydippe
+cydippian
+cydippid
+Cydippida
+Cydnus
+cydon
+Cydonia
+Cydonian
+cydonium
+cyeses
+cyesiology
+cyesis
+cyetic
+cygneous
+Cygnet
+cygnet
+cygnets
+Cygni
+Cygnid
+Cygninae
+cygnine
+Cygnus
+cygnus
+Cykana
+cyke
+cyl
+cyl.
+Cyler
+cylices
+cylinder
+cylinder-bored
+cylinder-boring
+cylinder-dried
+cylindered
+cylinderer
+cylinder-grinding
+cylindering
+cylinderlike
+cylinders
+cylinder-shaped
+cylindraceous
+cylindrarthrosis
+Cylindrella
+cylindrelloid
+cylindrenchema
+cylindrenchyma
+cylindric
+cylindrical
+cylindricality
+cylindrically
+cylindricalness
+cylindric-campanulate
+cylindric-fusiform
+cylindricity
+cylindric-oblong
+cylindric-ovoid
+cylindric-subulate
+cylindricule
+cylindriform
+cylindrite
+cylindro-
+cylindrocellular
+cylindrocephalic
+cylindroconical
+cylindroconoidal
+cylindrocylindric
+cylindrodendrite
+cylindrograph
+cylindroid
+cylindroidal
+cylindroma
+cylindromata
+cylindromatous
+cylindrometric
+cylindroogival
+Cylindrophis
+Cylindrosporium
+cylindruria
+cylix
+Cyllene
+Cyllenian
+Cyllenius
+cylloses
+cyllosis
+Cylvia
+Cym
+Cyma
+cyma
+cymae
+cymagraph
+cymaise
+cymaphen
+cymaphyte
+cymaphytic
+cymaphytism
+cymar
+cymarin
+cymarose
+cymars
+cymas
+cymatia
+cymation
+cymatium
+cymba
+cymbaeform
+cymbal
+Cymbalaria
+cymbaled
+cymbaleer
+cymbaler
+cymbalers
+cymbaline
+cymbalist
+cymbalists
+cymballed
+cymballike
+cymballing
+cymbalo
+cymbalom
+cymbalon
+cymbals
+cymbate
+cymbel
+Cymbeline
+Cymbella
+cymbid
+cymbidia
+cymbidium
+cymbiform
+Cymbium
+cymblin
+cymbling
+cymblings
+cymbocephalic
+cymbocephalous
+cymbocephaly
+Cymbopogon
+Cymbre
+cyme
+cymelet
+cymene
+cymenes
+cymes
+cymiferous
+cymlin
+cymling
+cymlings
+cymlins
+cymobotryose
+Cymodoce
+Cymodoceaceae
+cymogene
+cymogenes
+cymograph
+cymographic
+cymoid
+Cymoidium
+cymol
+cymols
+cymometer
+cymophane
+cymophanous
+cymophenol
+cymophobia
+cymoscope
+cymose
+cymosely
+cymotrichous
+cymotrichy
+cymous
+Cymraeg
+Cymric
+cymric
+cymrite
+Cymry
+cymry
+cymtia
+cymule
+cymulose
+Cyn
+Cyna
+cynanche
+Cynanchum
+cynanthropy
+Cynar
+Cynara
+cynaraceous
+cynarctomachy
+cynareous
+cynaroid
+Cynarra
+Cynde
+Cyndi
+Cyndia
+Cyndie
+Cyndy
+cyne-
+cynebot
+cynegetic
+cynegetics
+cynegild
+Cynera
+Cynewulf
+cynghanedd
+cynhyena
+Cynias
+cyniatria
+cyniatrics
+Cynic
+cynic
+Cynical
+cynical
+cynically
+cynicalness
+Cynicism
+cynicism
+cynicisms
+cynicist
+cynics
+cynipid
+Cynipidae
+cynipidous
+cynipoid
+Cynipoidea
+Cynips
+cynips
+cynism
+cyno-
+cynocephalic
+cynocephalous
+cynocephalus
+cynoclept
+Cynocrambaceae
+cynocrambaceous
+Cynocrambe
+cynodictis
+Cynodon
+cynodon
+cynodont
+Cynodontia
+Cynogale
+cynogenealogist
+cynogenealogy
+Cynoglossum
+Cynognathus
+cynography
+cynoid
+Cynoidea
+cynology
+cynomolgus
+Cynomoriaceae
+cynomoriaceous
+Cynomorium
+Cynomorpha
+cynomorphic
+cynomorphous
+Cynomys
+cynophile
+cynophilic
+cynophilist
+cynophobe
+cynophobia
+Cynopithecidae
+cynopithecoid
+cynopodous
+cynorrhoda
+cynorrhodon
+Cynortes
+Cynosarges
+Cynoscephalae
+Cynoscion
+Cynosura
+cynosural
+cynosure
+cynosures
+Cynosurus
+cynotherapy
+Cynoxylon
+Cynth
+Cynthea
+Cynthia
+cynthia
+Cynthian
+Cynthiana
+Cynthie
+Cynthiidae
+Cynthius
+Cynthla
+Cynthy
+Cynurus
+Cynwulf
+Cynwyd
+CYO
+cyp
+Cyparissia
+Cyparissus
+Cyperaceae
+cyperaceous
+Cyperus
+cyperus
+cyphella
+cyphellae
+cyphellate
+cypher
+cyphered
+cyphering
+cyphers
+Cyphomandra
+cyphonautes
+cyphonism
+cyphosis
+Cypraea
+cypraea
+cypraeid
+Cypraeidae
+cypraeiform
+cypraeoid
+cypre
+cypres
+cypreses
+cypress
+cypressed
+cypresses
+Cypressinn
+cypressroot
+Cypria
+Cyprian
+cyprian
+cyprians
+cyprid
+Cyprididae
+Cypridina
+Cypridinidae
+cypridinoid
+Cyprina
+cyprine
+cyprinid
+Cyprinidae
+cyprinids
+cypriniform
+cyprinin
+cyprinine
+cyprinodont
+Cyprinodontes
+Cyprinodontidae
+cyprinodontoid
+cyprinoid
+Cyprinoidea
+cyprinoidean
+Cyprinus
+Cyprio
+Cypriot
+cypriot
+Cypriote
+cypriote
+cypriotes
+cypriots
+cypripedin
+Cypripedium
+cypripedium
+Cypris
+cypris
+Cypro
+cyproheptadine
+Cypro-Minoan
+Cypro-phoenician
+cyproterone
+Cyprus
+cyprus
+cypruses
+cypsela
+cypselae
+Cypseli
+Cypselid
+Cypselidae
+cypseliform
+Cypseliformes
+cypseline
+cypseloid
+cypselomorph
+Cypselomorphae
+cypselomorphic
+cypselous
+Cypselus
+cyptozoic
+Cyra
+Cyrano
+Cyrena
+Cyrenaic
+cyrenaic
+Cyrenaica
+Cyrenaicism
+Cyrene
+Cyrenian
+Cyrie
+Cyril
+Cyrill
+Cyrilla
+Cyrillaceae
+cyrillaceous
+Cyrille
+Cyrillian
+Cyrillianism
+Cyrillic
+cyrillic
+Cyrillus
+cyriologic
+cyriological
+Cyrtandraceae
+Cyrtidae
+cyrto-
+cyrtoceracone
+Cyrtoceras
+cyrtoceratite
+cyrtoceratitic
+cyrtograph
+cyrtolite
+cyrtometer
+Cyrtomium
+cyrtopia
+cyrtosis
+cyrtostyle
+Cyrus
+cyrus
+Cysatus
+-cyst
+cyst
+cyst-
+cystadenoma
+cystadenosarcoma
+cystal
+cystalgia
+cystamine
+cystaster
+cystathionine
+cystatrophia
+cystatrophy
+cysteamine
+cystectasia
+cystectasy
+cystectomies
+cystectomy
+cysted
+cystein
+cysteine
+cysteines
+cysteinic
+cysteins
+cystelcosis
+cystenchyma
+cystenchymatous
+cystenchyme
+cystencyte
+cysterethism
+cysti-
+cystic
+cysticarpic
+cysticarpium
+cysticercerci
+cysticerci
+cysticercoid
+cysticercoidal
+cysticercosis
+cysticercus
+cysticerus
+cysticle
+cysticolous
+cystid
+Cystidea
+cystidean
+cystidia
+cystidicolous
+cystidium
+cystidiums
+cystiferous
+cystiform
+cystigerous
+Cystignathidae
+cystignathine
+cystin
+cystine
+cystines
+cystinosis
+cystinuria
+cystirrhea
+cystis
+cystitides
+cystitis
+cystitome
+cysto-
+cystoadenoma
+cystocarcinoma
+cystocarp
+cystocarpic
+cystocele
+cystocolostomy
+cystocyte
+cystodynia
+cystoelytroplasty
+cystoenterocele
+cystoepiplocele
+cystoepithelioma
+cystofibroma
+Cystoflagellata
+cystoflagellate
+cystogenesis
+cystogenous
+cystogram
+cystoid
+Cystoidea
+cystoidean
+cystoids
+cystolith
+cystolithectomy
+cystolithiasis
+cystolithic
+cystoma
+cystomas
+cystomata
+cystomatous
+cystometer
+cystomorphous
+cystomyoma
+cystomyxoma
+Cystonectae
+cystonectous
+cystonephrosis
+cystoneuralgia
+cystoparalysis
+Cystophora
+cystophore
+cystophotography
+cystophthisis
+cystoplasty
+cystoplegia
+cystoproctostomy
+Cystopteris
+cystoptosis
+Cystopus
+cystopyelitis
+cystopyelography
+cystopyelonephritis
+cystoradiography
+cystorrhagia
+cystorrhaphy
+cystorrhea
+cystosarcoma
+cystoschisis
+cystoscope
+cystoscopic
+cystoscopies
+cystoscopy
+cystose
+cystospasm
+cystospastic
+cystospore
+cystostomies
+cystostomy
+cystosyrinx
+cystotome
+cystotomies
+cystotomy
+cystotrachelotomy
+cystoureteritis
+cystourethritis
+cystourethrography
+cystous
+cysts
+cyt-
+cytase
+cytasic
+cytaster
+cytasters
+-cyte
+Cythera
+cythera
+Cytherea
+cytherea
+Cytherean
+cytherean
+Cytherella
+Cytherellidae
+cytidine
+cytidines
+Cytinaceae
+cytinaceous
+Cytinus
+cytioderm
+cytioderma
+cytisine
+Cytissorus
+Cytisus
+cytisus
+cytitis
+cyto-
+cytoanalyzer
+cytoarchitectural
+cytoarchitecturally
+cytoarchitecture
+cytoblast
+cytoblastema
+cytoblastemal
+cytoblastematous
+cytoblastemic
+cytoblastemous
+cytocentrum
+cytochalasin
+cytochemical
+cytochemistry
+cytochrome
+cytochylema
+cytocide
+cytoclasis
+cytoclastic
+cytococci
+cytococcus
+cytocyst
+cytode
+cytodendrite
+cytoderm
+cytodiagnosis
+cytodieresis
+cytodieretic
+cytodifferentiation
+cytoecology
+cytogamy
+cytogene
+cytogenesis
+cytogenetic
+cytogenetical
+cytogenetically
+cytogeneticist
+cytogenetics
+cytogenic
+cytogenies
+cytogenous
+cytogeny
+cytoglobin
+cytoglobulin
+cytohyaloplasm
+cytoid
+cytokinesis
+cytokinetic
+cytokinin
+cytol
+cytolist
+cytologic
+cytological
+cytologically
+cytologies
+cytologist
+cytologists
+cytology
+cytolymph
+cytolysin
+cytolysis
+cytolytic
+cytoma
+cytome
+cytomegalic
+cytomegalovirus
+cytomere
+cytometer
+cytomicrosome
+cytomitome
+cytomorphological
+cytomorphology
+cytomorphosis
+cyton
+cytone
+cytons
+cytopahgous
+cytoparaplastin
+cytopathic
+cytopathogenic
+cytopathogenicity
+cytopathologic
+cytopathological
+cytopathologically
+cytopathology
+cytopenia
+Cytophaga
+cytophagic
+cytophagous
+cytophagy
+cytopharynges
+cytopharynx
+cytopharynxes
+cytophil
+cytophilic
+cytophysics
+cytophysiology
+cytoplasm
+cytoplasmic
+cytoplasmically
+cytoplast
+cytoplastic
+cytoproct
+cytopyge
+cytoreticulum
+cytoryctes
+cytosin
+cytosine
+cytosines
+cytosol
+cytosols
+cytosome
+cytospectrophotometry
+Cytospora
+Cytosporina
+cytost
+cytostatic
+cytostatically
+cytostomal
+cytostome
+cytostroma
+cytostromatic
+cytotactic
+cytotaxis
+cytotaxonomic
+cytotaxonomically
+cytotaxonomy
+cytotechnologist
+cytotechnology
+cytotoxic
+cytotoxicity
+cytotoxin
+cytotrophoblast
+cytotrophoblastic
+cytotrophy
+cytotropic
+cytotropism
+cytovirin
+cytozoa
+cytozoic
+cytozoon
+cytozymase
+cytozyme
+cytozzoa
+cytula
+cytulae
+cyul
+cywydd
+Cyzicene
+cyzicene
+Cyzicus
+CZ
+Czajer
+Czanne
+czar
+czardas
+czardases
+czardom
+czardoms
+czarevitch
+czarevna
+czarevnas
+czarian
+czaric
+czarina
+czarinas
+czarinian
+czarish
+czarism
+czarisms
+czarist
+czaristic
+czarists
+czaritza
+czaritzas
+czarowitch
+czarowitz
+Czarra
+czars
+czarship
+Czech
+Czech.
+czech
+Czechic
+Czechish
+Czechization
+Czechosl
+Czecho-Slovak
+Czechoslovak
+czechoslovak
+Czecho-Slovakia
+Czechoslovakia
+czechoslovakia
+Czecho-Slovakian
+Czechoslovakian
+czechoslovakian
+czechoslovakians
+czechoslovaks
+czechs
+Czerniak
+Czerniakov
+Czernowitz
+Czerny
+czigany
+Czstochowa
+Czur
diff --git a/hotspot/test/compiler/7082949/Test7082949.java b/hotspot/test/compiler/7082949/Test7082949.java
new file mode 100644
index 0000000..41b7911
--- /dev/null
+++ b/hotspot/test/compiler/7082949/Test7082949.java
@@ -0,0 +1,54 @@
+/*
+ * 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 7082949
+ * @summary JSR 292: missing ResourceMark in methodOopDesc::make_invoke_method
+ *
+ * @run main Test7082949
+ */
+
+import java.lang.invoke.*;
+import static java.lang.invoke.MethodHandles.*;
+import static java.lang.invoke.MethodType.*;
+
+public class Test7082949 implements Runnable {
+ public static void main(String... args) throws Throwable {
+ new Thread(new Test7082949()).start();
+ }
+
+ public static Test7082949 test() {
+ return null;
+ }
+
+ public void run() {
+ try {
+ MethodHandle m1 = MethodHandles.lookup().findStatic(Test7082949.class, "test", methodType(Test7082949.class));
+ Test7082949 v = (Test7082949)m1.invokeExact();
+ } catch (Throwable t) {
+ t.printStackTrace();
+ }
+ }
+}
diff --git a/hotspot/test/compiler/7088020/Test7088020.java b/hotspot/test/compiler/7088020/Test7088020.java
new file mode 100644
index 0000000..4ea9913
--- /dev/null
+++ b/hotspot/test/compiler/7088020/Test7088020.java
@@ -0,0 +1,80 @@
+/*
+ * 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 7088020
+ * @summary SEGV in JNIHandleBlock::release_block
+ *
+ * @run main Test7088020
+ */
+
+import java.lang.invoke.*;
+
+
+public class Test7088020 {
+ public static boolean test() {
+ return false;
+ }
+
+ public static void main(String... args) throws Throwable {
+ MethodHandle test = MethodHandles.lookup().findStatic(Test7088020.class, "test", MethodType.methodType(Boolean.TYPE));
+
+ // Exercise WMT with different argument alignments
+ int thrown = 0;
+ try {
+ test.invokeExact(0);
+ } catch (WrongMethodTypeException wmt) {
+ thrown++;
+ if (wmt.getStackTrace().length < 1) throw new InternalError("missing stack frames");
+ }
+ try {
+ test.invokeExact(0, 1);
+ } catch (WrongMethodTypeException wmt) {
+ thrown++;
+ if (wmt.getStackTrace().length < 1) throw new InternalError("missing stack frames");
+ }
+ try {
+ test.invokeExact(0, 1, 2);
+ } catch (WrongMethodTypeException wmt) {
+ thrown++;
+ if (wmt.getStackTrace().length < 1) throw new InternalError("missing stack frames");
+ }
+ try {
+ test.invokeExact(0, 1, 2, 3);
+ } catch (WrongMethodTypeException wmt) {
+ thrown++;
+ if (wmt.getStackTrace().length < 1) throw new InternalError("missing stack frames");
+ }
+ try {
+ thrown++;
+ test.invokeExact(0, 1, 2, 3, 4);
+ } catch (WrongMethodTypeException wmt) {
+ if (wmt.getStackTrace().length < 1) throw new InternalError("missing stack frames");
+ }
+ if (thrown != 5) {
+ throw new InternalError("not enough throws");
+ }
+ }
+}
diff --git a/hotspot/test/gc/7072527/TestFullGCCount.java b/hotspot/test/gc/7072527/TestFullGCCount.java
new file mode 100644
index 0000000..14a049a
--- /dev/null
+++ b/hotspot/test/gc/7072527/TestFullGCCount.java
@@ -0,0 +1,95 @@
+/*
+ * 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 TestFullGCount.java
+ * @bug 7072527
+ * @summary CMS: JMM GC counters overcount in some cases
+ * @run main/othervm -XX:+UseConcMarkSweepGC TestFullGCCount
+ *
+ */
+import java.util.*;
+import java.lang.management.*;
+
+public class TestFullGCCount {
+
+ public String collectorName = "ConcurrentMarkSweep";
+
+ public static void main(String [] args) {
+
+ TestFullGCCount t = null;
+ if (args.length==2) {
+ t = new TestFullGCCount(args[0], args[1]);
+ } else {
+ t = new TestFullGCCount();
+ }
+ System.out.println("Monitoring collector: " + t.collectorName);
+ t.run();
+ }
+
+ public TestFullGCCount(String pool, String collector) {
+ collectorName = collector;
+ }
+
+ public TestFullGCCount() {
+ }
+
+ public void run() {
+ int count = 0;
+ int iterations = 20;
+ long counts[] = new long[iterations];
+ boolean diffAlways2 = true; // assume we will fail
+
+ for (int i=0; i<iterations; i++) {
+ System.gc();
+ counts[i] = getCollectionCount();
+ if (i>0) {
+ if (counts[i] - counts[i-1] != 2) {
+ diffAlways2 = false;
+ }
+ }
+ }
+ if (diffAlways2) {
+ throw new RuntimeException("FAILED: System.gc must be incrementing count twice.");
+ }
+ System.out.println("Passed.");
+ }
+
+ private long getCollectionCount() {
+ long count = 0;
+ List<MemoryPoolMXBean> pools = ManagementFactory.getMemoryPoolMXBeans();
+ List<GarbageCollectorMXBean> collectors = ManagementFactory.getGarbageCollectorMXBeans();
+ for (int i=0; i<collectors.size(); i++) {
+ GarbageCollectorMXBean collector = collectors.get(i);
+ String name = collector.getName();
+ if (name.contains(collectorName)) {
+ System.out.println(name + ": collection count = "
+ + collector.getCollectionCount());
+ count = collector.getCollectionCount();
+ }
+ }
+ return count;
+ }
+
+}
+
diff --git a/hotspot/test/jprt.config b/hotspot/test/jprt.config
index 53c33fd..53ffdae 100644
--- a/hotspot/test/jprt.config
+++ b/hotspot/test/jprt.config
@@ -75,8 +75,8 @@ dirMustExist "${slashjava}" ALT_SLASH_JAVA
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
osname=`uname -s`
-if [ "${osname}" = SunOS ] ; then
-
+case "${osname}" in
+ SunOS )
# SOLARIS: Sparc or X86
osarch=`uname -p`
if [ "${osarch}" = sparc ] ; then
@@ -100,9 +100,9 @@ if [ "${osname}" = SunOS ] ; then
# File creation mask
umask 002
+ ;;
-elif [ "${osname}" = Linux ] ; then
-
+ Linux | Darwin )
# Add basic paths
path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
@@ -111,9 +111,31 @@ elif [ "${osname}" = Linux ] ; then
fileMustExist "${make}" make
umask 002
+ ;;
+
+ FreeBSD | OpenBSD )
+ # Add basic paths
+ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
-else
+ # Find GNU make
+ make=/usr/local/bin/gmake
+ fileMustExist "${make}" make
+ umask 002
+ ;;
+
+ NetBSD )
+ # Add basic paths
+ path4sdk=/usr/bin:/bin:/usr/sbin:/sbin
+
+ # Find GNU make
+ make=/usr/pkg/bin/gmake
+ fileMustExist "${make}" make
+
+ umask 002
+ ;;
+
+ * )
# Windows: Differs on CYGWIN vs. MKS.
# We need to determine if we are running a CYGWIN shell or an MKS shell
@@ -154,8 +176,8 @@ else
if [ "${unix_toolset}" = CYGWIN ] ; then
path4sdk="`/usr/bin/cygpath -p ${path4sdk}`"
fi
-
-fi
+ ;;
+esac
# Export PATH setting
PATH="${path4sdk}"
diff --git a/hotspot/test/runtime/6929067/Test6929067.sh b/hotspot/test/runtime/6929067/Test6929067.sh
index 51af191..8f9e13a 100644
--- a/hotspot/test/runtime/6929067/Test6929067.sh
+++ b/hotspot/test/runtime/6929067/Test6929067.sh
@@ -29,7 +29,7 @@ case "$OS" in
PS=":"
FS="/"
;;
- SunOS | Windows_* )
+ SunOS | Windows_* | *BSD)
NULL=NUL
PS=";"
FS="\\"
diff --git a/hotspot/test/runtime/7020373/Test7020373.sh b/hotspot/test/runtime/7020373/Test7020373.sh
new file mode 100644
index 0000000..7f6b03c
--- /dev/null
+++ b/hotspot/test/runtime/7020373/Test7020373.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+##
+## @test
+## @bug 7020373 7055247
+## @key cte_test
+## @summary JSR rewriting can overflow memory address size variables
+## @ignore Ignore it until 7053586 fixed
+## @run shell Test7020373.sh
+##
+
+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
+
+BIT_FLAG=""
+
+# set platform-dependent variables
+OS=`uname -s`
+case "$OS" in
+ SunOS | Linux )
+ NULL=/dev/null
+ PS=":"
+ FS="/"
+ ## for solaris, linux it's HOME
+ FILE_LOCATION=$HOME
+ if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ]
+ then
+ BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT | grep -v '^#'`
+ fi
+ ;;
+ Windows_* )
+ NULL=NUL
+ 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 ${BIT_FLAG} -version
+
+${TESTJAVA}${FS}bin${FS}jar xvf ${TESTSRC}${FS}testcase.jar
+
+${TESTJAVA}${FS}bin${FS}java ${BIT_FLAG} OOMCrashClass4000_1 > test.out 2>&1
+
+cat test.out
+
+egrep "SIGSEGV|An unexpected error has been detected" test.out
+
+if [ $? = 0 ]
+then
+ echo "Test Failed"
+ exit 1
+else
+ grep "java.lang.LinkageError" test.out
+ if [ $? = 0 ]
+ then
+ echo "Test Passed"
+ exit 0
+ else
+ echo "Test Failed"
+ exit 1
+ fi
+fi
diff --git a/hotspot/test/runtime/7051189/Xchecksig.sh b/hotspot/test/runtime/7051189/Xchecksig.sh
new file mode 100644
index 0000000..410cdb9
--- /dev/null
+++ b/hotspot/test/runtime/7051189/Xchecksig.sh
@@ -0,0 +1,151 @@
+#
+# 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 Xchecksig.sh
+# @bug 7051189
+# @summary Need to suppress info message if -xcheck:jni used with libjsig.so
+# @run shell Xchecksig.sh
+#
+
+if [ "${TESTSRC}" = "" ]
+ then TESTSRC=.
+fi
+
+if [ "${TESTJAVA}" = "" ]
+then
+ PARENT=`dirname \`which java\``
+ TESTJAVA=`dirname ${PARENT}`
+ printf "TESTJAVA not set, selecting " ${TESTJAVA}
+ printf " If this is incorrect, try setting the variable manually.\n"
+fi
+
+
+BIT_FLAG=""
+
+OS=`uname -s`
+case "$OS" in
+ SunOS | Linux )
+ FS="/"
+ ## for solaris, linux it's HOME
+ FILE_LOCATION=$HOME
+ if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ]
+ then
+ BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT`
+ fi
+ ;;
+ Windows_* )
+ printf "Not testing libjsig.so on Windows. PASSED.\n "
+ exit 0
+ ;;
+ * )
+ printf "Not testing libjsig.so on unrecognised system. PASSED.\n "
+ exit 0
+ ;;
+esac
+
+
+JAVA=${TESTJAVA}${FS}bin${FS}java
+
+# LD_PRELOAD arch needs to match the binary we run, so run the java
+# 64-bit binary directly if we are testing 64-bit (bin/ARCH/java).
+
+# However JPRT runs: .../solaris_x64_5.10-debug/bin/java
+# ..which is 32-bit, when it has built the 64-bit version to test.
+#
+# How does this script know we are meant to run the 64-bit version?
+# Can check for the path of the binary containing "x64" on Solaris.
+
+if [ ${OS} -eq "SunOS" ]
+then
+ printf "SunOS test JAVA=${JAVA}"
+ printf ${JAVA} | grep x64 > /dev/null
+ if [ $? -eq 0 ]
+ then
+ printf "SunOS x64 test, forcing -d64\n"
+ BIT_FLAG=-d64
+ fi
+fi
+
+ARCH=`uname -p`
+case $ARCH in
+ i386)
+ if [ X${BIT_FLAG} != "X" ]
+ then
+ ARCH=amd64
+ JAVA=${TESTJAVA}${FS}bin${FS}${ARCH}${FS}java
+ fi
+ ;;
+ sparc)
+ if [ X${BIT_FLAG} != "X" ]
+ then
+ ARCH=sparcv9
+ JAVA=${TESTJAVA}${FS}bin${FS}${ARCH}${FS}java
+ fi
+ ;;
+ * )
+ printf "Not testing architecture $ARCH, skipping test.\n"
+ exit 0
+ ;;
+esac
+
+LIBJSIG=${TESTJAVA}${FS}jre${FS}lib${FS}${ARCH}${FS}libjsig.so
+
+# If libjsig and binary do not match, skip test.
+
+A=`file ${LIBJSIG} | awk '{ print $3 }'`
+B=`file ${JAVA} | awk '{ print $3 }'`
+
+if [ $A -ne $B ]
+then
+ printf "Mismatching binary and library to preload, skipping test.\n"
+ exit 0
+fi
+
+if [ ! -f ${LIBJSIG} ]
+then
+ printf "Skipping test: libjsig missing for given architecture: ${LIBJSIG}\n"
+ exit 0
+fi
+# Use java -version to test, java version info appeas on stderr,
+# the libjsig message we are removing appears on stdout.
+
+# grep returns zero meaning found, non-zero means not found:
+
+LD_PRELOAD=${LIBJSIG} ${JAVA} ${BIT_FLAG} -Xcheck:jni -version 2>&1 | grep "libjsig is activated"
+
+if [ $? -eq 0 ]; then
+ printf "Failed: -Xcheck:jni prints message when libjsig.so is loaded.\n"
+ exit 1
+fi
+
+
+LD_PRELOAD=${LIBJSIG} ${JAVA} ${BIT_FLAG} -Xcheck:jni -verbose:jni -version 2>&1 | grep "libjsig is activated"
+if [ $? != 0 ]; then
+ printf "Failed: -Xcheck:jni does not print message when libjsig.so is loaded and -verbose:jni is set.\n"
+ exit 1
+fi
+
+printf "PASSED\n"
+exit 0
+
diff --git a/jaxp/.hg/cache/branchheads b/jaxp/.hg/cache/branchheads
index 78f8688..f756663 100644
--- a/jaxp/.hg/cache/branchheads
+++ b/jaxp/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-8f35cf4570b34149634ac290ee7eee58f40582b3 245
-8f35cf4570b34149634ac290ee7eee58f40582b3 default
+3545c3f8512c1a1b143f880f7ed157bacba51c43 271
+3545c3f8512c1a1b143f880f7ed157bacba51c43 default
diff --git a/jaxp/.hg/dirstate b/jaxp/.hg/dirstate
index 64a8045..e7067b5 100644
Binary files a/jaxp/.hg/dirstate and b/jaxp/.hg/dirstate differ
diff --git a/jaxp/.hg/store/00changelog.i b/jaxp/.hg/store/00changelog.i
index 43c4d67..0ee80e6 100644
Binary files a/jaxp/.hg/store/00changelog.i and b/jaxp/.hg/store/00changelog.i differ
diff --git a/jaxp/.hg/store/00manifest.i b/jaxp/.hg/store/00manifest.i
index 9c38872..9749db2 100644
Binary files a/jaxp/.hg/store/00manifest.i and b/jaxp/.hg/store/00manifest.i differ
diff --git a/jaxp/.hg/store/data/~2ehgtags.i b/jaxp/.hg/store/data/~2ehgtags.i
index 75efbd0..f2fd9e9 100644
Binary files a/jaxp/.hg/store/data/~2ehgtags.i and b/jaxp/.hg/store/data/~2ehgtags.i differ
diff --git a/jaxp/.hg/store/undo b/jaxp/.hg/store/undo
index 72f5163..363abd7 100644
Binary files a/jaxp/.hg/store/undo and b/jaxp/.hg/store/undo differ
diff --git a/jdk/.hg/undo.bookmarks b/jaxp/.hg/undo.bookmarks
similarity index 100%
copy from jdk/.hg/undo.bookmarks
copy to jaxp/.hg/undo.bookmarks
diff --git a/jaxp/.hg/undo.desc b/jaxp/.hg/undo.desc
index ef5e6a5..36858f6 100644
--- a/jaxp/.hg/undo.desc
+++ b/jaxp/.hg/undo.desc
@@ -1,3 +1,3 @@
-260
+263
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jaxp
diff --git a/jaxp/.hg/undo.dirstate b/jaxp/.hg/undo.dirstate
index 6606670..64a8045 100644
Binary files a/jaxp/.hg/undo.dirstate and b/jaxp/.hg/undo.dirstate differ
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index feae202..6f52fcb 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -129,3 +129,10 @@ e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01
+ca4d6ad55a660f0469882e85b4dacf7822d50abf jdk8-b02
+7a74371ce0c64108b857c497ae130dfe9514532c jdk8-b03
+acbcadef0b21582abf406f07f1b74d2b8f80dc01 jdk8-b04
+ff0a3d78e7a22743eabbaa71e9d17b2f094ddf62 jdk8-b05
+d7b8192e7277c49b9c702f4c4fd99bd83ba947ea jdk8-b06
+c114306576dcc1cb871a48058b41bf7d87ce882a jdk8-b07
+de4794dd69c48b08029d158a972993ff9d5627df jdk8-b08
diff --git a/jaxws/.hg/cache/branchheads b/jaxws/.hg/cache/branchheads
index f908202..58b2c73 100644
--- a/jaxws/.hg/cache/branchheads
+++ b/jaxws/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-322004bfae89b0e3dda48d3952d60346335f6cc5 231
-322004bfae89b0e3dda48d3952d60346335f6cc5 default
+6b9c80bc1e2a2de0eee7facbad62eafd83ced0fd 266
+6b9c80bc1e2a2de0eee7facbad62eafd83ced0fd default
diff --git a/jaxws/.hg/dirstate b/jaxws/.hg/dirstate
index ab1b9d2..25bb203 100644
Binary files a/jaxws/.hg/dirstate and b/jaxws/.hg/dirstate differ
diff --git a/jaxws/.hg/store/00changelog.d b/jaxws/.hg/store/00changelog.d
index 52a9ce7..2b7029b 100644
Binary files a/jaxws/.hg/store/00changelog.d and b/jaxws/.hg/store/00changelog.d differ
diff --git a/jaxws/.hg/store/00changelog.i b/jaxws/.hg/store/00changelog.i
index d3c41b8..fd0495a 100644
Binary files a/jaxws/.hg/store/00changelog.i and b/jaxws/.hg/store/00changelog.i differ
diff --git a/jaxws/.hg/store/00manifest.d b/jaxws/.hg/store/00manifest.d
index aa08dcc..f9a4d66 100644
Binary files a/jaxws/.hg/store/00manifest.d and b/jaxws/.hg/store/00manifest.d differ
diff --git a/jaxws/.hg/store/00manifest.i b/jaxws/.hg/store/00manifest.i
index 292f7b1..d8fac2a 100644
Binary files a/jaxws/.hg/store/00manifest.i and b/jaxws/.hg/store/00manifest.i differ
diff --git a/jaxws/.hg/store/data/~2ehgtags.i b/jaxws/.hg/store/data/~2ehgtags.i
index 6d3c4da..bd632f8 100644
Binary files a/jaxws/.hg/store/data/~2ehgtags.i and b/jaxws/.hg/store/data/~2ehgtags.i differ
diff --git a/jaxws/.hg/store/undo b/jaxws/.hg/store/undo
index f8430b1..aa76847 100644
Binary files a/jaxws/.hg/store/undo and b/jaxws/.hg/store/undo differ
diff --git a/jdk/.hg/undo.bookmarks b/jaxws/.hg/undo.bookmarks
similarity index 100%
copy from jdk/.hg/undo.bookmarks
copy to jaxws/.hg/undo.bookmarks
diff --git a/jaxws/.hg/undo.desc b/jaxws/.hg/undo.desc
index a41afc9..6c4d873 100644
--- a/jaxws/.hg/undo.desc
+++ b/jaxws/.hg/undo.desc
@@ -1,3 +1,3 @@
-255
+258
pull
http://hg.openjdk.java.net/jigsaw/jigsaw/jaxws
diff --git a/jaxws/.hg/undo.dirstate b/jaxws/.hg/undo.dirstate
index 5ad3c95..ab1b9d2 100644
Binary files a/jaxws/.hg/undo.dirstate and b/jaxws/.hg/undo.dirstate differ
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 4734c0b..59f6a2e 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -129,3 +129,10 @@ c025078c8362076503bb83b8e4da14ba7b347940 jdk7-b139
05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
+1034127ed402e9d0f1ed1477238ef594e9cc8da6 jdk8-b02
+7dcb0307508f408507d878cd7c2048c102b15158 jdk8-b03
+3f6f08163331ed75b30a6de1246670ce655645c8 jdk8-b04
+7d5d91fddbceb1fc3ae7ff409e732ae4a0391b34 jdk8-b05
+acffff22a9465005e8eb206224fae9f2ea4fd469 jdk8-b06
+134b0debf7b04fe6e317394b04b8e7a4a0181b1b jdk8-b07
+1c9d4f59acf8f71477473c170239b43b2c9dee24 jdk8-b08
diff --git a/jdk/.hg/cache/branchheads b/jdk/.hg/cache/branchheads
index 69c9a0e..e3d0e84 100644
--- a/jdk/.hg/cache/branchheads
+++ b/jdk/.hg/cache/branchheads
@@ -1,2 +1,2 @@
-90808f8d462f713f13b1907bf8669683ca6b7be7 4707
-90808f8d462f713f13b1907bf8669683ca6b7be7 default
+cf4fbc24740e5edfad8a26f0bfc42aab51a8a2ba 4866
+cf4fbc24740e5edfad8a26f0bfc42aab51a8a2ba default
diff --git a/jdk/.hg/dirstate b/jdk/.hg/dirstate
index e7ab5d6..801a8a7 100644
Binary files a/jdk/.hg/dirstate and b/jdk/.hg/dirstate differ
diff --git a/jdk/.hg/store/00changelog.d b/jdk/.hg/store/00changelog.d
index 0d3ae3a..7b9585a 100644
Binary files a/jdk/.hg/store/00changelog.d and b/jdk/.hg/store/00changelog.d differ
diff --git a/jdk/.hg/store/00changelog.i b/jdk/.hg/store/00changelog.i
index c62c38e..bccfc33 100644
Binary files a/jdk/.hg/store/00changelog.i and b/jdk/.hg/store/00changelog.i differ
diff --git a/jdk/.hg/store/00manifest.d b/jdk/.hg/store/00manifest.d
index edb48ea..632a3b6 100644
Binary files a/jdk/.hg/store/00manifest.d and b/jdk/.hg/store/00manifest.d differ
diff --git a/jdk/.hg/store/00manifest.i b/jdk/.hg/store/00manifest.i
index 3475874..4352e7a 100644
Binary files a/jdk/.hg/store/00manifest.i and b/jdk/.hg/store/00manifest.i differ
diff --git a/jdk/.hg/store/data/make/_makefile.i b/jdk/.hg/store/data/make/_makefile.i
index 217b199..0579062 100644
Binary files a/jdk/.hg/store/data/make/_makefile.i and b/jdk/.hg/store/data/make/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/oracle/_makefile.i b/jdk/.hg/store/data/make/com/oracle/_makefile.i
index aa41e4c..586a5e2 100644
Binary files a/jdk/.hg/store/data/make/com/oracle/_makefile.i and b/jdk/.hg/store/data/make/com/oracle/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/crypto/provider/_makefile.i b/jdk/.hg/store/data/make/com/sun/crypto/provider/_makefile.i
index 2863c59..1df1c53 100644
Binary files a/jdk/.hg/store/data/make/com/sun/crypto/provider/_makefile.i and b/jdk/.hg/store/data/make/com/sun/crypto/provider/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/jndi/_makefile.i b/jdk/.hg/store/data/make/com/sun/jndi/_makefile.i
index 4a1d4ff..a1e3a93 100644
Binary files a/jdk/.hg/store/data/make/com/sun/jndi/_makefile.i and b/jdk/.hg/store/data/make/com/sun/jndi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/net/httpserver/_makefile.i b/jdk/.hg/store/data/make/com/sun/net/httpserver/_makefile.i
index 60b2fac..1b7b6c0 100644
Binary files a/jdk/.hg/store/data/make/com/sun/net/httpserver/_makefile.i and b/jdk/.hg/store/data/make/com/sun/net/httpserver/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/net/ssl/_makefile.i b/jdk/.hg/store/data/make/com/sun/net/ssl/_makefile.i
index 92c1547..8c93515 100644
Binary files a/jdk/.hg/store/data/make/com/sun/net/ssl/_makefile.i and b/jdk/.hg/store/data/make/com/sun/net/ssl/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/security/_makefile.i b/jdk/.hg/store/data/make/com/sun/security/_makefile.i
index 6b48a4b..f574327 100644
Binary files a/jdk/.hg/store/data/make/com/sun/security/_makefile.i and b/jdk/.hg/store/data/make/com/sun/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/com/sun/servicetag/_makefile.i b/jdk/.hg/store/data/make/com/sun/servicetag/_makefile.i
index 335b665..b560aa9 100644
Binary files a/jdk/.hg/store/data/make/com/sun/servicetag/_makefile.i and b/jdk/.hg/store/data/make/com/sun/servicetag/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-linux.gmk.i b/jdk/.hg/store/data/make/common/_defs-linux.gmk.i
index a2094c9..2474700 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-linux.gmk.i and b/jdk/.hg/store/data/make/common/_defs-linux.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-modules.gmk.i b/jdk/.hg/store/data/make/common/_defs-modules.gmk.i
index 0866d3c..414ce1a 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-modules.gmk.i and b/jdk/.hg/store/data/make/common/_defs-modules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i b/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i
index e3a5364..f739cce 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i and b/jdk/.hg/store/data/make/common/_defs-solaris.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs-windows.gmk.i b/jdk/.hg/store/data/make/common/_defs-windows.gmk.i
index 1609e84..3650ebe 100644
Binary files a/jdk/.hg/store/data/make/common/_defs-windows.gmk.i and b/jdk/.hg/store/data/make/common/_defs-windows.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_defs.gmk.i b/jdk/.hg/store/data/make/common/_defs.gmk.i
index 7a3a44d..0d56e54 100644
Binary files a/jdk/.hg/store/data/make/common/_defs.gmk.i and b/jdk/.hg/store/data/make/common/_defs.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_modules.gmk.i b/jdk/.hg/store/data/make/common/_modules.gmk.i
index 301bdaf..630f6bb 100644
Binary files a/jdk/.hg/store/data/make/common/_modules.gmk.i and b/jdk/.hg/store/data/make/common/_modules.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_release-embedded.gmk.i b/jdk/.hg/store/data/make/common/_release-embedded.gmk.i
index 9c79d4a..70f8004 100644
Binary files a/jdk/.hg/store/data/make/common/_release-embedded.gmk.i and b/jdk/.hg/store/data/make/common/_release-embedded.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/_release.gmk.i b/jdk/.hg/store/data/make/common/_release.gmk.i
index 37984d3..39b6640 100644
Binary files a/jdk/.hg/store/data/make/common/_release.gmk.i and b/jdk/.hg/store/data/make/common/_release.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i b/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i
index a06c026..85a5791 100644
Binary files a/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i and b/jdk/.hg/store/data/make/common/internal/_defs-langtools.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs-linux.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs-linux.gmk.i
index 977713b..22519a7 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs-linux.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs-linux.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs-solaris.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs-solaris.gmk.i
index 1120995..2ce14a3 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs-solaris.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs-solaris.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_defs-windows.gmk.i b/jdk/.hg/store/data/make/common/shared/_defs-windows.gmk.i
index e1cc149..d6cf9dc 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_defs-windows.gmk.i and b/jdk/.hg/store/data/make/common/shared/_defs-windows.gmk.i differ
diff --git a/jdk/.hg/store/data/make/common/shared/_platform.gmk.i b/jdk/.hg/store/data/make/common/shared/_platform.gmk.i
index 91611ae..facfd31 100644
Binary files a/jdk/.hg/store/data/make/common/shared/_platform.gmk.i and b/jdk/.hg/store/data/make/common/shared/_platform.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i
index f275c95..ea09fd9 100644
Binary files a/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/java/java/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/java/_makefile.i b/jdk/.hg/store/data/make/java/java/_makefile.i
index ff913cd..8f332ce 100644
Binary files a/jdk/.hg/store/data/make/java/java/_makefile.i and b/jdk/.hg/store/data/make/java/java/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/net/_makefile.i b/jdk/.hg/store/data/make/java/net/_makefile.i
index ccdc997..445cd75 100644
Binary files a/jdk/.hg/store/data/make/java/net/_makefile.i and b/jdk/.hg/store/data/make/java/net/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/nio/_makefile.i b/jdk/.hg/store/data/make/java/nio/_makefile.i
index 49e69b3..1e78eb3 100644
Binary files a/jdk/.hg/store/data/make/java/nio/_makefile.i and b/jdk/.hg/store/data/make/java/nio/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/redist/_makefile.i b/jdk/.hg/store/data/make/java/redist/_makefile.i
index c0da156..acc487f 100644
Binary files a/jdk/.hg/store/data/make/java/redist/_makefile.i and b/jdk/.hg/store/data/make/java/redist/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i b/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i
index 9b244b0..d656487 100644
Binary files a/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i and b/jdk/.hg/store/data/make/java/redist/sajdi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/security/_makefile.i b/jdk/.hg/store/data/make/java/security/_makefile.i
index bc9da99..322ad3d 100644
Binary files a/jdk/.hg/store/data/make/java/security/_makefile.i and b/jdk/.hg/store/data/make/java/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/sun__nio/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/java/sun__nio/_f_i_l_e_s__java.gmk.i
index e4470e3..138a1a1 100644
Binary files a/jdk/.hg/store/data/make/java/sun__nio/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/java/sun__nio/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/java/sun__nio/_makefile.i b/jdk/.hg/store/data/make/java/sun__nio/_makefile.i
index ea9addf..fbed5b9 100644
Binary files a/jdk/.hg/store/data/make/java/sun__nio/_makefile.i and b/jdk/.hg/store/data/make/java/sun__nio/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/java/util/_f_i_l_e_s__properties.gmk.i b/jdk/.hg/store/data/make/java/util/_f_i_l_e_s__properties.gmk.i
index 53bb38e..1a38ec2 100644
Binary files a/jdk/.hg/store/data/make/java/util/_f_i_l_e_s__properties.gmk.i and b/jdk/.hg/store/data/make/java/util/_f_i_l_e_s__properties.gmk.i differ
diff --git a/jdk/.hg/store/data/make/javax/_makefile.i b/jdk/.hg/store/data/make/javax/_makefile.i
index 421c642..f6cfcae 100644
Binary files a/jdk/.hg/store/data/make/javax/_makefile.i and b/jdk/.hg/store/data/make/javax/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/crypto/_makefile.i b/jdk/.hg/store/data/make/javax/crypto/_makefile.i
index 0c740a1..3020dbf 100644
Binary files a/jdk/.hg/store/data/make/javax/crypto/_makefile.i and b/jdk/.hg/store/data/make/javax/crypto/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/javax/others/_makefile.i b/jdk/.hg/store/data/make/javax/others/_makefile.i
index bea6838..9373cae 100644
Binary files a/jdk/.hg/store/data/make/javax/others/_makefile.i and b/jdk/.hg/store/data/make/javax/others/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/jprt.gmk.i b/jdk/.hg/store/data/make/jprt.gmk.i
index 99eb235..3e27019 100644
Binary files a/jdk/.hg/store/data/make/jprt.gmk.i and b/jdk/.hg/store/data/make/jprt.gmk.i differ
diff --git a/jdk/.hg/store/data/make/jprt.properties.i b/jdk/.hg/store/data/make/jprt.properties.i
index ec28199..8f57110 100644
Binary files a/jdk/.hg/store/data/make/jprt.properties.i and b/jdk/.hg/store/data/make/jprt.properties.i differ
diff --git a/jdk/.hg/store/data/make/mkdemo/_makefile.i b/jdk/.hg/store/data/make/mkdemo/_makefile.i
index 510c0e6..bca2826 100644
Binary files a/jdk/.hg/store/data/make/mkdemo/_makefile.i and b/jdk/.hg/store/data/make/mkdemo/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/mksample/_makefile.i b/jdk/.hg/store/data/make/mksample/_makefile.i
index 5b8412e..d461a18 100644
Binary files a/jdk/.hg/store/data/make/mksample/_makefile.i and b/jdk/.hg/store/data/make/mksample/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.config.i b/jdk/.hg/store/data/make/modules/modules.config.i
index 2087795..d5901dd 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.config.i and b/jdk/.hg/store/data/make/modules/modules.config.i differ
diff --git a/jdk/.hg/store/data/make/modules/modules.group.i b/jdk/.hg/store/data/make/modules/modules.group.i
index fc22baf..61f0689 100644
Binary files a/jdk/.hg/store/data/make/modules/modules.group.i and b/jdk/.hg/store/data/make/modules/modules.group.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i b/jdk/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i
index 6a26d30..9a67a9e 100644
Binary files a/jdk/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i and b/jdk/.hg/store/data/make/netbeans/_r_e_a_d_m_e.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/closed-share-view.ent.i b/jdk/.hg/store/data/make/netbeans/common/closed-share-view.ent.i
index 7353621..22bb0dc 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/closed-share-view.ent.i and b/jdk/.hg/store/data/make/netbeans/common/closed-share-view.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/java-data-native.ent.i b/jdk/.hg/store/data/make/netbeans/common/java-data-native.ent.i
index 9beb59c..0abdc7c 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/java-data-native.ent.i and b/jdk/.hg/store/data/make/netbeans/common/java-data-native.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/java-data-no-native.ent.i b/jdk/.hg/store/data/make/netbeans/common/java-data-no-native.ent.i
index b9d87fd..ff07098 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/java-data-no-native.ent.i and b/jdk/.hg/store/data/make/netbeans/common/java-data-no-native.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/jtreg-view.ent.i b/jdk/.hg/store/data/make/netbeans/common/jtreg-view.ent.i
index 2b13114..1a17124 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/jtreg-view.ent.i and b/jdk/.hg/store/data/make/netbeans/common/jtreg-view.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/sample-view.ent.i b/jdk/.hg/store/data/make/netbeans/common/sample-view.ent.i
index 12c57cf..7a18f5c 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/sample-view.ent.i and b/jdk/.hg/store/data/make/netbeans/common/sample-view.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/share-view.ent.i b/jdk/.hg/store/data/make/netbeans/common/share-view.ent.i
index 40a923e..44b12d7 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/share-view.ent.i and b/jdk/.hg/store/data/make/netbeans/common/share-view.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/unix-view.ent.i b/jdk/.hg/store/data/make/netbeans/common/unix-view.ent.i
index 10b9e3d..57cb8e2 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/unix-view.ent.i and b/jdk/.hg/store/data/make/netbeans/common/unix-view.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/common/windows-view.ent.i b/jdk/.hg/store/data/make/netbeans/common/windows-view.ent.i
index 879f8bd..e5dab9f 100644
Binary files a/jdk/.hg/store/data/make/netbeans/common/windows-view.ent.i and b/jdk/.hg/store/data/make/netbeans/common/windows-view.ent.i differ
diff --git a/jdk/.hg/store/data/make/netbeans/j2se/nbproject/project.xml.i b/jdk/.hg/store/data/make/netbeans/j2se/nbproject/project.xml.i
index 51657a3..3d15059 100644
Binary files a/jdk/.hg/store/data/make/netbeans/j2se/nbproject/project.xml.i and b/jdk/.hg/store/data/make/netbeans/j2se/nbproject/project.xml.i differ
diff --git a/jdk/.hg/store/data/make/sun/_makefile.i b/jdk/.hg/store/data/make/sun/_makefile.i
index cee8f6d..4421e31 100644
Binary files a/jdk/.hg/store/data/make/sun/_makefile.i and b/jdk/.hg/store/data/make/sun/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i
index f7dd2bc..2e732fb 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/_v_e_r_s_i_o_n.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/africa.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/africa.i
index 4edb299..dd5e064 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/africa.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/africa.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/antarctica.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/antarctica.i
index 06bba98..6bbb4a2 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/antarctica.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/antarctica.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i
index 8a24110..947a027 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/asia.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i
index c6c1d7f..3c8adfd 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/australasia.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i
index 44930cf..ac221f8 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/europe.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/iso3166.tab.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/iso3166.tab.i
index db435bf..5b7206b 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/iso3166.tab.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/iso3166.tab.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i
index e8418d5..eb63bed 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/northamerica.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i
index a9b13e7..5ac5a69 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/southamerica.i differ
diff --git a/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i b/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i
index 0451b26..68e9b4e 100644
Binary files a/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i and b/jdk/.hg/store/data/make/sun/javazic/tzdata/zone.tab.i differ
diff --git a/jdk/.hg/store/data/make/sun/net/_makefile.i b/jdk/.hg/store/data/make/sun/net/_makefile.i
index 4a115eb..a01cb50 100644
Binary files a/jdk/.hg/store/data/make/sun/net/_makefile.i and b/jdk/.hg/store/data/make/sun/net/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/net/spi/_makefile.i b/jdk/.hg/store/data/make/sun/net/spi/_makefile.i
index 6af5fa4..e2fd6e3 100644
Binary files a/jdk/.hg/store/data/make/sun/net/spi/_makefile.i and b/jdk/.hg/store/data/make/sun/net/spi/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/net/spi/nameservice/dns/_makefile.i b/jdk/.hg/store/data/make/sun/net/spi/nameservice/dns/_makefile.i
index dce3d45..a7572e9 100644
Binary files a/jdk/.hg/store/data/make/sun/net/spi/nameservice/dns/_makefile.i and b/jdk/.hg/store/data/make/sun/net/spi/nameservice/dns/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/nio/cs/_f_i_l_e_s__java.gmk.i b/jdk/.hg/store/data/make/sun/nio/cs/_f_i_l_e_s__java.gmk.i
index 7286613..6b7b436 100644
Binary files a/jdk/.hg/store/data/make/sun/nio/cs/_f_i_l_e_s__java.gmk.i and b/jdk/.hg/store/data/make/sun/nio/cs/_f_i_l_e_s__java.gmk.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/_makefile.i b/jdk/.hg/store/data/make/sun/security/_makefile.i
index 89e0bcd..1fff08b 100644
Binary files a/jdk/.hg/store/data/make/sun/security/_makefile.i and b/jdk/.hg/store/data/make/sun/security/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/ec/_makefile.i b/jdk/.hg/store/data/make/sun/security/ec/_makefile.i
index 6b717ef..42dd880 100644
Binary files a/jdk/.hg/store/data/make/sun/security/ec/_makefile.i and b/jdk/.hg/store/data/make/sun/security/ec/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/other/_makefile.i b/jdk/.hg/store/data/make/sun/security/other/_makefile.i
index 478b4f8..14a94d1 100644
Binary files a/jdk/.hg/store/data/make/sun/security/other/_makefile.i and b/jdk/.hg/store/data/make/sun/security/other/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i b/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i
index 379babe..867b87f 100644
Binary files a/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i and b/jdk/.hg/store/data/make/sun/security/pkcs11/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/sun/util/_makefile.i b/jdk/.hg/store/data/make/sun/util/_makefile.i
new file mode 100644
index 0000000..9b675dd
Binary files /dev/null and b/jdk/.hg/store/data/make/sun/util/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/tools/_charset_mapping/_single_byte-_x.java.template.i b/jdk/.hg/store/data/make/tools/_charset_mapping/_single_byte-_x.java.template.i
index 375f6f3..8bfbcf2 100644
Binary files a/jdk/.hg/store/data/make/tools/_charset_mapping/_single_byte-_x.java.template.i and b/jdk/.hg/store/data/make/tools/_charset_mapping/_single_byte-_x.java.template.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i
index d944fc0..0920fd5 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotated_dependency.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotation_parser.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotation_parser.java.i
index 955ae74..c40a2be 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotation_parser.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_annotation_parser.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_boot_analyzer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_boot_analyzer.java.i
index 35d393a..b012dbc 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_boot_analyzer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_boot_analyzer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i
index c336e2c..d9c3d55 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_analyzer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_file_parser.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_file_parser.java.i
index 1a3ba18..b1480ee 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_file_parser.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_file_parser.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i
index 0bb5e40..a3f395a 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_list_writer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i
index 692f770..ef7631a 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_class_path.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_code_attribute_parser.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_code_attribute_parser.java.i
index 100c2ed..a08ca11 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_code_attribute_parser.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_code_attribute_parser.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_analyzer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_analyzer.java.i
index 1cbb844..b99091c 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_analyzer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_analyzer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_parser.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_parser.java.i
index 7c6e129..ef821be 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_parser.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_constant_pool_parser.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependency_config.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependency_config.java.i
index 315b573..bc69404 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependency_config.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_dependency_config.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_files.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_files.java.i
index c569e1c..ce6856b 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_files.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_files.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_klass.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_klass.java.i
index 2587956..f0dd83d 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_klass.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_klass.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i
index 6401dd6..a7d4ca3 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_modularizer.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i
index 588ace9..03f9b92 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i
index e61ae97..a53746d 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_builder.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i
index aed6f4c..2c36918 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_config.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i
index 284b015..dcc50df 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_module_info.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i
index 2a1e031..5cccc79 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_package_info.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_platform_module_builder.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_platform_module_builder.java.i
index 58d6d4a..dbb156a 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_platform_module_builder.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_platform_module_builder.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resolution_info.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resolution_info.java.i
index c6ecc85..2af62d5 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resolution_info.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resolution_info.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resource_file.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resource_file.java.i
index adffea8..0be0d41 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resource_file.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_resource_file.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_trace.java.i b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_trace.java.i
index 11186d9..59c43a9 100644
Binary files a/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_trace.java.i and b/jdk/.hg/store/data/make/tools/classanalyzer/src/com/sun/classanalyzer/_trace.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/reorder/_makefile.i b/jdk/.hg/store/data/make/tools/reorder/_makefile.i
index 4fd9146..5b718cf 100644
Binary files a/jdk/.hg/store/data/make/tools/reorder/_makefile.i and b/jdk/.hg/store/data/make/tools/reorder/_makefile.i differ
diff --git a/jdk/.hg/store/data/make/tools/src/build/tools/generatecurrencydata/_generate_currency_data.java.i b/jdk/.hg/store/data/make/tools/src/build/tools/generatecurrencydata/_generate_currency_data.java.i
index 208b95f..055a23d 100644
Binary files a/jdk/.hg/store/data/make/tools/src/build/tools/generatecurrencydata/_generate_currency_data.java.i and b/jdk/.hg/store/data/make/tools/src/build/tools/generatecurrencydata/_generate_currency_data.java.i differ
diff --git a/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i b/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i
index 9a27894..5064094 100644
Binary files a/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i and b/jdk/.hg/store/data/make/tools/src/build/tools/javazic/_mappings.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_crypt.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_crypt.java.i
index 59aaa6d..385a799 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_crypt.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_crypt.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_parameters.java.i
index e2a83f1..4314d38 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_a_e_s_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_block_cipher_params_core.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_block_cipher_params_core.java.i
index 0530ac6..0cfa3bd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_block_cipher_params_core.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_block_cipher_params_core.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_blowfish_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_blowfish_parameters.java.i
index c943105..3937ec3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_blowfish_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_blowfish_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_block_chaining.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_block_chaining.java.i
index 49e8fa1..84664c5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_block_chaining.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_block_chaining.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_core.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_core.java.i
index d899bef..0d0beac 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_core.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_cipher_core.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_crypt.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_crypt.java.i
index 41c04b2..96a5e7b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_crypt.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_crypt.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key.java.i
index 13758a1..9b36ea6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key_factory.java.i
index 0f20469..c1b3e63 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_key_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_parameters.java.i
index d49aa27..3d6b6f1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_s_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key.java.i
index ca88396..067457a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key_factory.java.i
index 7a0d282..d4fdf74 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_key_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_parameters.java.i
index 933e2f4..07bf5c9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_wrap_cipher.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_wrap_cipher.java.i
index b629380..04a4ed1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_wrap_cipher.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_e_sede_wrap_cipher.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_factory.java.i
index 5e0b408..04db644 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_key_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameter_generator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameter_generator.java.i
index 59c52c8..3a06bca 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameter_generator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameter_generator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameters.java.i
index f779a62..dbb5564 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_private_key.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_private_key.java.i
index e570abd..5523003 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_private_key.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_private_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_public_key.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_public_key.java.i
index e7920aa..3dd21aa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_public_key.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_d_h_public_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_encrypted_private_key_info.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_encrypted_private_key_info.java.i
index 9c35f93..afa9328 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_encrypted_private_key_info.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_encrypted_private_key_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_hmac_core.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_hmac_core.java.i
index 91ab879..83bcaca 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_hmac_core.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_hmac_core.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_jce_key_store.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_jce_key_store.java.i
index 4d6806a..ec61d7f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_jce_key_store.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_jce_key_store.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_key_protector.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_key_protector.java.i
index 679d27a..08a77d2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_key_protector.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_key_protector.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_o_a_e_p_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_o_a_e_p_parameters.java.i
index a0ec432..caceacb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_o_a_e_p_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_o_a_e_p_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_cipher_core.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_cipher_core.java.i
index 0c220d3..10b5439 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_cipher_core.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_cipher_core.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i
index 681d4e0..476e9fd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key_factory.java.i
index bbd7fd7..b9d1428 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_key_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_parameters.java.i
index 7ed2c7d..4429b60 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_e_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_hmac_s_h_a1_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_hmac_s_h_a1_factory.java.i
index 3239275..60a9184 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_hmac_s_h_a1_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_hmac_s_h_a1_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_key_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_key_impl.java.i
index 13a3302..bfbb0a9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_key_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_b_k_d_f2_key_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_c_b_c.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_c_b_c.java.i
index d9cd8fb..a1589f0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_c_b_c.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_p_c_b_c.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_cipher.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_cipher.java.i
index 17be31b..6273c59 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_cipher.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_cipher.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_parameters.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_parameters.java.i
index 2048a00..13f5910 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_parameters.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_c2_parameters.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_s_a_cipher.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_s_a_cipher.java.i
index 9d8368a..cc570ba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_s_a_cipher.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_r_s_a_cipher.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_sun_j_c_e.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_sun_j_c_e.java.i
index 971cecb..71ed404 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_sun_j_c_e.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_sun_j_c_e.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_key_material_generator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_key_material_generator.java.i
index 3b26718..eed14c5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_key_material_generator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_key_material_generator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_master_secret_generator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_master_secret_generator.java.i
index 4f603ac..98a963c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_master_secret_generator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/crypto/provider/_tls_master_secret_generator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/imageio/plugins/jpeg/_j_f_i_f_marker_segment.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/imageio/plugins/jpeg/_j_f_i_f_marker_segment.java.i
index 5cba078..adb4293 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/imageio/plugins/jpeg/_j_f_i_f_marker_segment.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/imageio/plugins/jpeg/_j_f_i_f_marker_segment.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_file_chooser_u_i.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_file_chooser_u_i.java.i
index 9047f0d..c8001de 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_file_chooser_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_file_chooser_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_look_and_feel.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_look_and_feel.java.i
index 2d04893..be6e3b5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_look_and_feel.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/_motif_look_and_feel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i
index 0a1c3d6..bacf905 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__de.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__de.properties.i
index 6be7bb5..92a7ca1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__de.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__de.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__es.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__es.properties.i
index af4f91e..07feea0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__es.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__es.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__fr.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__fr.properties.i
index d3945ad..c653f24 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__fr.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__fr.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__it.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__it.properties.i
index ac429ec..6cd54ec 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__it.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__it.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ja.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ja.properties.i
index 63e8370..f964ba5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ja.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ja.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ko.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ko.properties.i
index 17d0686..143f3ef 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ko.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__ko.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__pt___b_r.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__pt___b_r.properties.i
index 69996fc..6152595 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__pt___b_r.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__pt___b_r.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__sv.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__sv.properties.i
index 907c708..0fc1557 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__sv.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__sv.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___c_n.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___c_n.properties.i
index cf82d18..5fa3a92 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___c_n.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___c_n.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___t_w.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___t_w.properties.i
index ba63ce1..e46ead7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___t_w.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif__zh___t_w.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_file_chooser_u_i.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_file_chooser_u_i.java.i
index 9a4be63..adeb14b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_file_chooser_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_file_chooser_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i
index 6e32081..62f04d0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/_windows_look_and_feel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i
index 083f34a..2117b49 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__de.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__de.properties.i
index 40a138b..bdbdd38 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__de.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__de.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__es.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__es.properties.i
index e51e02e..b3e3cb3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__es.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__es.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__fr.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__fr.properties.i
index 4d2e080..8173d7f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__fr.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__fr.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__it.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__it.properties.i
index c335904..8a407c2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__it.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__it.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ja.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ja.properties.i
index b68324f..371f1d9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ja.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ja.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ko.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ko.properties.i
index 9de10f8..f511fd9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ko.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__ko.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__pt___b_r.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__pt___b_r.properties.i
index b244282..768b4e9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__pt___b_r.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__pt___b_r.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__sv.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__sv.properties.i
index abf2b2e..2567b11 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__sv.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__sv.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___c_n.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___c_n.properties.i
index a972205..5bc8a98 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___c_n.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___c_n.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___t_w.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___t_w.properties.i
index d2c86d1..c44e8b9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___t_w.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows__zh___t_w.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_counter64.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_counter64.java.i
index 497e0a1..f51629e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_counter64.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_counter64.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_int.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_int.java.i
index 022b3d2..f2b971b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_int.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_int.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_null.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_null.java.i
index e034511..3127bc6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_null.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_null.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_string.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_string.java.i
index 2544767..776d795 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_string.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/_snmp_string.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/daemon/_snmp_request_handler.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/daemon/_snmp_request_handler.java.i
index 2f8f182..a0d3016 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/daemon/_snmp_request_handler.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jmx/snmp/daemon/_snmp_request_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_binding_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_binding_enumeration.java.i
index 50a51ce..d19267a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_binding_enumeration.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_binding_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_ctx.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_ctx.java.i
index 22790aa..de7ef62 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_ctx.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_ctx.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_name_parser.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_name_parser.java.i
index 796f811..347e72b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_name_parser.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_c_n_name_parser.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_exception_mapper.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_exception_mapper.java.i
index bf700cc..bec2719 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_exception_mapper.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_exception_mapper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_iiop_url.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_iiop_url.java.i
index 7577a9c..c03ed31 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_iiop_url.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/cosnaming/_iiop_url.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i
index c43ba67..3856be5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context.java.i
index 2559c8e..468e59f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context_factory.java.i
index 755c2c8..58c1d67 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_context_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_name.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_name.java.i
index b9445cf..359ae12 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_name.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_dns_name.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_name_node.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_name_node.java.i
index 2dd53ec..814ba41 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_name_node.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_name_node.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resolver.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resolver.java.i
index 4925a4e..7ffef91 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resolver.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resolver.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resource_records.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resource_records.java.i
index 48c7e5c..6eded6a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resource_records.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_resource_records.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_zone_node.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_zone_node.java.i
index 77a428a..a411257 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_zone_node.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/dns/_zone_node.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_abstract_ldap_naming_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_abstract_ldap_naming_enumeration.java.i
new file mode 100644
index 0000000..e715f9b
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_abstract_ldap_naming_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ber.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ber.java.i
index bbee4f8..cd1021b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ber.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ber.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_client_id.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_client_id.java.i
index f84f47b..605e008 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_client_id.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_client_id.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i
index 2729c78..2c88e65 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_digest_client_id.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_digest_client_id.java.i
index 977059b..d45797b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_digest_client_id.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_digest_client_id.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_queue.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_queue.java.i
index e921c81..be8371e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_queue.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_queue.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_support.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_support.java.i
index e242375..7d61643 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_support.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_event_support.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_attribute.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_attribute.java.i
index b190a15..84b63d3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_attribute.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_attribute.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_binding_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_binding_enumeration.java.i
index f6686ab..b552770 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_binding_enumeration.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_binding_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_client.java.i
index fee0efa..0963b89 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx.java.i
index 37dd038..687a1b3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx_factory.java.i
index c607315..07596e7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_ctx_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_entry.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_entry.java.i
index e6de6fc..29b2592 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_entry.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_entry.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_name.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_name.java.i
index 630e63e..1a8df2d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_name.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_name.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_naming_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_naming_enumeration.java.i
index 3ce0e14..939fac2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_naming_enumeration.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_naming_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_pool_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_pool_manager.java.i
index 0d37adc..45344ea 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_pool_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_pool_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_context.java.i
index 577c5f2..e34350e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_exception.java.i
index 3fa1e3a..43212b2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_referral_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_result.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_result.java.i
index cd0fabd..e488a8c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_result.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_result.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_ctx.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_ctx.java.i
index 262f7df..2c440ce 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_ctx.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_ctx.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_parser.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_parser.java.i
index 450ddc6..4886121 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_parser.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_schema_parser.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_search_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_search_enumeration.java.i
index 081ebe8..c1a89b7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_search_enumeration.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_ldap_search_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_naming_event_notifier.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_naming_event_notifier.java.i
index cbc035e..7dd3301 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_naming_event_notifier.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_naming_event_notifier.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_notifier_args.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_notifier_args.java.i
index a204ddb..4d54891 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_notifier_args.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_notifier_args.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_obj.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_obj.java.i
index 76fa635..9dcde34 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_obj.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_obj.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_referral_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_referral_enumeration.java.i
index a8db78d..90acdb6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_referral_enumeration.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_referral_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_service_locator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_service_locator.java.i
index 51c28fc..a86cb53 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_service_locator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_service_locator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_simple_client_id.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_simple_client_id.java.i
index a8e077e..515ecbf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_simple_client_id.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_simple_client_id.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_unsolicited_response_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_unsolicited_response_impl.java.i
index 995ec22..7f8e222 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_unsolicited_response_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_unsolicited_response_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper.java.i
index 5e75112..b7a6a47 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper12.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper12.java.i
index b59430d..168fbf5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper12.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/_version_helper12.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/ext/_start_tls_response_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/ext/_start_tls_response_impl.java.i
index 0482890..909ce5d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/ext/_start_tls_response_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/ext/_start_tls_response_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections.java.i
index 0c640a6..d3f69d9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections_weak_ref.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections_weak_ref.java.i
index b015058..7ff2096 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections_weak_ref.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_connections_weak_ref.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool.java.i
index 198f415..4703fa4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool_cleaner.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool_cleaner.java.i
index 2e63bca..1a2b674 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool_cleaner.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/pool/_pool_cleaner.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_default_callback_handler.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_default_callback_handler.java.i
index 9cb78c6..3c6546a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_default_callback_handler.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_default_callback_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_ldap_sasl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_ldap_sasl.java.i
index 99509ea..a5207e5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_ldap_sasl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/ldap/sasl/_ldap_sasl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context.java.i
index 5dc0c8c..16ad74f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context_factory.java.i
index 3127ea0..4b18fd0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/rmi/registry/_registry_context_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/corba/_corba_utils.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/corba/_corba_utils.java.i
index 65d45e5..b43c282 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/corba/_corba_utils.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/corba/_corba_utils.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_context.java.i
index 7e838e1..ce0d2a7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_dir_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_dir_context.java.i
index 1985239..2113994 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_dir_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_atomic_dir_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_context.java.i
index 64f0b6c..43378a8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_dir_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_dir_context.java.i
index f188aec..fc88368 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_dir_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_component_dir_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_continuation.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_continuation.java.i
index eda9328..24364c9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_continuation.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_continuation.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_context.java.i
index 1db1643..f544bbc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_dir_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_dir_context.java.i
index e58e860..8439cfd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_dir_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/ctx/_partial_composite_dir_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_containment_filter.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_containment_filter.java.i
index 3415473..205848a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_containment_filter.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_containment_filter.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_context_enumerator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_context_enumerator.java.i
index 026bedf..0f13a01 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_context_enumerator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_context_enumerator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_dir_search.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_dir_search.java.i
index 0e25ab4..4a83e9a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_dir_search.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_dir_search.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_hier_mem_dir_ctx.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_hier_mem_dir_ctx.java.i
index 5729f51..c42a593 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_hier_mem_dir_ctx.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_hier_mem_dir_ctx.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_lazy_search_enumeration_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_lazy_search_enumeration_impl.java.i
index 7834ccf..adfaf9b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_lazy_search_enumeration_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_lazy_search_enumeration_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_search_filter.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_search_filter.java.i
index 4bb2496..4534c29 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_search_filter.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/dir/_search_filter.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_context.java.i
index fa37ceb..30c2f32 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_dir_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_dir_context.java.i
index 7f80aa9..23ae4ed 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_dir_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/toolkit/url/_generic_u_r_l_dir_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context.java.i
index 4fc1b01..fdf47b6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context_factory.java.i
index f19bc0d..45a8abe 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/dns/dns_u_r_l_context_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context.java.i
index c5904a0..be25066 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context_factory.java.i
index 8712a90..992ac9b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/iiop/iiop_u_r_l_context_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context.java.i
index b041f9a..c137526 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context_factory.java.i
index f2d37bc..8672c1f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/ldap/ldap_u_r_l_context_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context.java.i
index 5efd689..447ddba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context_factory.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context_factory.java.i
index 67b2188..7bf762d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context_factory.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/jndi/url/rmi/rmi_u_r_l_context_factory.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_factory_enumeration.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_factory_enumeration.java.i
index ffe2db6..0bf9f6b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_factory_enumeration.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_factory_enumeration.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_named_weak_reference.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_named_weak_reference.java.i
index ead5939..14289dd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_named_weak_reference.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_named_weak_reference.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_resource_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_resource_manager.java.i
index 635e775..7b0408c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_resource_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_resource_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper.java.i
index bd1ea34..2124bb2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper12.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper12.java.i
index 1cf46f4..120e1dc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper12.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/naming/internal/_version_helper12.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_basic_authenticator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_basic_authenticator.java.i
index bbbbbc7..de7b8a3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_basic_authenticator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_basic_authenticator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_headers.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_headers.java.i
index 0952173..ac2d3d2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_headers.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/_headers.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i
index b34f142..04b6f42 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/httpserver/spi/_http_server_provider.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_s_s_l_security.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_s_s_l_security.java.i
index b9e05ab..d2ce3bd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_s_s_l_security.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/_s_s_l_security.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/_delegate_https_u_r_l_connection.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/_delegate_https_u_r_l_connection.java.i
index 03192fa..ef89762 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/_delegate_https_u_r_l_connection.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/net/ssl/internal/www/protocol/https/_delegate_https_u_r_l_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_policy_file.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_policy_file.java.i
index 37e44d5..d32c575 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_policy_file.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_policy_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_subject_code_source.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_subject_code_source.java.i
index 926eae9..866cee4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_subject_code_source.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/_subject_code_source.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_jndi_login_module.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_jndi_login_module.java.i
index 5984bfa..cc218cf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_jndi_login_module.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_jndi_login_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_key_store_login_module.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_key_store_login_module.java.i
index c52ff3b..3ed4ac9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_key_store_login_module.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_key_store_login_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i
index 59b7b91..cd05020 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_krb5_login_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_ldap_login_module.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_ldap_login_module.java.i
index dc17f21..616356e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_ldap_login_module.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_ldap_login_module.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_n_t_system.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_n_t_system.java.i
index 2acb415..254db1f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_n_t_system.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/auth/module/_n_t_system.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/jgss/_inquire_sec_context_permission.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/jgss/_inquire_sec_context_permission.java.i
index 32141c0..00629f3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/jgss/_inquire_sec_context_permission.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/jgss/_inquire_sec_context_permission.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_client.java.i
index 46803ff..981dd3e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m.java.i
index 2aeaeb3..84c5edc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m_exception.java.i
index 0a3447b..d7a306f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_n_t_l_m_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_server.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_server.java.i
index 1e9be0b..b674c28 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_server.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/ntlm/_server.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/_cram_m_d5_server.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/_cram_m_d5_server.java.i
index e077dae..fdfe93d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/_cram_m_d5_server.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/_cram_m_d5_server.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_base.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_base.java.i
index 95aeafc..e9666a2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_base.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_base.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_client.java.i
index 0cb105f..2203fff 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_server.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_server.java.i
index 04d5915..1293699 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_server.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/digest/_digest_m_d5_server.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_base.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_base.java.i
index a306e48..edc3c3a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_base.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_base.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_client.java.i
index 76668cf..e9530fe 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_server.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_server.java.i
index 237de2a..22d82c4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_server.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/gsskerb/_gss_krb5_server.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_factory_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_factory_impl.java.i
index d5b954f..39416be 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_factory_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_factory_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_client.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_client.java.i
index 4b6135f..4dc91dd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_client.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_client.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_server.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_server.java.i
index 5fda7e3..0c45d8c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_server.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/ntlm/_n_t_l_m_server.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_abstract_sasl_impl.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_abstract_sasl_impl.java.i
index c5405e3..90d6693 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_abstract_sasl_impl.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_abstract_sasl_impl.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_policy_utils.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_policy_utils.java.i
index f543606..32fb53e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_policy_utils.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/security/sasl/util/_policy_utils.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_browser_support.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_browser_support.java.i
index 7c15c93..a34a7c5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_browser_support.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_browser_support.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_installer.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_installer.java.i
index 4879890..606481a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_installer.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_installer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_registration_document.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_registration_document.java.i
index 0041ef9..cd46b7f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_registration_document.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_registration_document.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_sun_connection.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_sun_connection.java.i
index 951e086..ce0bc78 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_sun_connection.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/_sun_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/resources/javase__servicetag.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/resources/javase__servicetag.properties.i
new file mode 100644
index 0000000..ce2d8ea
Binary files /dev/null and b/jdk/.hg/store/data/src/share/classes/com/sun/servicetag/resources/javase__servicetag.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i
index 8a948ee..02605a7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__de.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__de.properties.i
index ddda2f0..b91d5d4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__de.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__de.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__es.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__es.properties.i
index 9463101..8a76795 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__es.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__es.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__fr.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__fr.properties.i
index 5ace11f..8185eb7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__fr.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__fr.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__it.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__it.properties.i
index cbe76fc..8ef84da 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__it.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__it.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ja.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ja.properties.i
index 58dbead..d93767e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ja.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ja.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ko.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ko.properties.i
index 69aff7a..2db85f1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ko.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__ko.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__pt___b_r.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__pt___b_r.properties.i
index 6335bdd..910edcf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__pt___b_r.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__pt___b_r.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__sv.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__sv.properties.i
index 2c7e17a..09004ad 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__sv.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__sv.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___c_n.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___c_n.properties.i
index b463119..915096a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___c_n.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___c_n.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___t_w.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___t_w.properties.i
index b8bf57a..559cd3c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___t_w.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic__zh___t_w.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i
index dcb0708..3daac8c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__de.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__de.properties.i
index 3fdb424..57a8770 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__de.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__de.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__es.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__es.properties.i
index 4358b6a..49379e6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__es.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__es.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__fr.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__fr.properties.i
index 1fd7a60..d854d96 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__fr.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__fr.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__it.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__it.properties.i
index 1f3b32d..8d356d6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__it.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__it.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ja.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ja.properties.i
index 598490a..abff960 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ja.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ja.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ko.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ko.properties.i
index 78dbd71..eb54153 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ko.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__ko.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__pt___b_r.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__pt___b_r.properties.i
index e257246..3d4186a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__pt___b_r.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__pt___b_r.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__sv.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__sv.properties.i
index a980ba2..b0152d4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__sv.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__sv.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___c_n.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___c_n.properties.i
index 43da18b..8c4d340 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___c_n.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___c_n.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___t_w.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___t_w.properties.i
index ed731f1..55283be 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___t_w.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal__zh___t_w.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i
index 04e0dac..c68314e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__de.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__de.properties.i
index b7d889c..7639373 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__de.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__de.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__es.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__es.properties.i
index abaf4dd..7aea820 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__es.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__es.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__fr.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__fr.properties.i
index fdd5f87..4bd4848 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__fr.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__fr.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__it.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__it.properties.i
index 97edbaa..4d2b692 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__it.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__it.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ja.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ja.properties.i
index 47afe54..a307660 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ja.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ja.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ko.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ko.properties.i
index 2d4fe06..44bcb49 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ko.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__ko.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__pt___b_r.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__pt___b_r.properties.i
index f425a9e..40fdd7e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__pt___b_r.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__pt___b_r.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__sv.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__sv.properties.i
index d56fff8..9fc9972 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__sv.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__sv.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___c_n.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___c_n.properties.i
index 39551c0..8e21834 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___c_n.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___c_n.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___t_w.properties.i b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___t_w.properties.i
index 192324e..c196e8c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___t_w.properties.i and b/jdk/.hg/store/data/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth__zh___t_w.properties.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_access_watchpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_access_watchpoint_spec.java.i
index 9e973dc..347ce1a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_access_watchpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_access_watchpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_ambiguous_method_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_ambiguous_method_exception.java.i
index f007ab5..6525d18 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_ambiguous_method_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_ambiguous_method_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_breakpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_breakpoint_spec.java.i
index f4291a3..8f5bbba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_breakpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_breakpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_child_session.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_child_session.java.i
index 7e5e6d4..c6346a0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_child_session.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_child_session.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_evaluation_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_evaluation_exception.java.i
index ac040b0..a4c3639 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_evaluation_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_evaluation_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec.java.i
index a9ccbfe..e0f2308 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec_list.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec_list.java.i
index 9e08c14..a4ddeea 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec_list.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_event_request_spec_list.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_exception_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_exception_spec.java.i
index 2db1c83..0652588 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_exception_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_exception_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_execution_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_execution_manager.java.i
index 3155c61..be67898 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_execution_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_execution_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_frame_index_out_of_bounds_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_frame_index_out_of_bounds_exception.java.i
index 667b36c..ea982f0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_frame_index_out_of_bounds_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_frame_index_out_of_bounds_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_input_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_input_listener.java.i
index 09204f1..2ba694a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_input_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_input_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_j_d_i_event_source.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_j_d_i_event_source.java.i
index 12081a8..6f476b2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_j_d_i_event_source.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_j_d_i_event_source.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_breakpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_breakpoint_spec.java.i
index 4d5ccc3..352b7a5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_breakpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_breakpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_not_found_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_not_found_exception.java.i
index 66e4dec..9a7e98d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_not_found_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_line_not_found_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_malformed_member_name_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_malformed_member_name_exception.java.i
index 88a85bc..fcfc33c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_malformed_member_name_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_malformed_member_name_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_breakpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_breakpoint_spec.java.i
index 4dd29ca..dcf885b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_breakpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_breakpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_not_found_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_not_found_exception.java.i
index b82ef8f..4f8137c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_not_found_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_method_not_found_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_modification_watchpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_modification_watchpoint_spec.java.i
index 446ac90..e08ad1d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_modification_watchpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_modification_watchpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_session_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_session_exception.java.i
index e7ebdb0..71bef0d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_session_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_session_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_thread_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_thread_exception.java.i
index ebf29a7..4fbaab7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_thread_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_no_thread_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_output_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_output_listener.java.i
index d3c5144..dca4149 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_output_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_output_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_parse_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_parse_exception.java.i
index f135a78..4e8a7da 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_parse_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_parse_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_pattern_reference_type_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_pattern_reference_type_spec.java.i
index d905ba8..f7a391e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_pattern_reference_type_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_pattern_reference_type_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_reference_type_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_reference_type_spec.java.i
index fc83ca6..daf63a6 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_reference_type_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_reference_type_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session.java.i
index d65664f..540964e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session_listener.java.i
index 5ac437a..e969913 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_session_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_source_name_reference_type_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_source_name_reference_type_spec.java.i
index 1ab9b49..dd2108e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_source_name_reference_type_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_source_name_reference_type_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_error_event.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_error_event.java.i
index 39b761f..2a3c936 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_error_event.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_error_event.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_event.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_event.java.i
index 773a2c8..fab59d9 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_event.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_event.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_listener.java.i
index ba850fc..de491c3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_spec_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_group_iterator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_group_iterator.java.i
index e9d0dd4..a7d8e33 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_group_iterator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_group_iterator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_info.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_info.java.i
index cd67181..33c0f48 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_info.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_iterator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_iterator.java.i
index 9fd553c..e0e3533 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_iterator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_thread_iterator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_utils.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_utils.java.i
index cd653d9..09f5522 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_utils.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_utils.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_launch_failure_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_launch_failure_exception.java.i
index 3e32742..9a1b3fa 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_launch_failure_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_launch_failure_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_not_interrupted_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_not_interrupted_exception.java.i
index 0dec932..879c020 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_not_interrupted_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_v_m_not_interrupted_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_watchpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_watchpoint_spec.java.i
index 5dc0ede..0eccb26 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_watchpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/bdi/_watchpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_abstract_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_abstract_event_set.java.i
index 4b53fa7..d3eb204 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_abstract_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_abstract_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_access_watchpoint_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_access_watchpoint_event_set.java.i
index d773784..24ad293 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_access_watchpoint_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_access_watchpoint_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_prepare_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_prepare_event_set.java.i
index 7003932..c40fece 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_prepare_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_prepare_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_unload_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_unload_event_set.java.i
index d5aabfe..f436d0d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_unload_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_class_unload_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_exception_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_exception_event_set.java.i
index b1d7679..b7f5018 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_exception_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_exception_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_adapter.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_adapter.java.i
index cfd58af..1523d81 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_adapter.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_adapter.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_listener.java.i
index 0aa07f5..84bd178 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_j_d_i_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_locatable_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_locatable_event_set.java.i
index 256ed2d..6da7c52 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_locatable_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_locatable_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_location_trigger_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_location_trigger_event_set.java.i
index 4c23985..bf3190b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_location_trigger_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_location_trigger_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_modification_watchpoint_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_modification_watchpoint_event_set.java.i
index c9658ec..2cb8aef 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_modification_watchpoint_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_modification_watchpoint_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_death_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_death_event_set.java.i
index 5bcdcd8..2492581 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_death_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_death_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_start_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_start_event_set.java.i
index b3c189a..af81706 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_start_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_thread_start_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_death_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_death_event_set.java.i
index 72909fa..2462a74 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_death_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_death_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_disconnect_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_disconnect_event_set.java.i
index 19b90df..858b55e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_disconnect_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_disconnect_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_start_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_start_event_set.java.i
index bf1c13b..43bf4fb 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_start_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_v_m_start_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_watchpoint_event_set.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_watchpoint_event_set.java.i
index c10080c..d671834 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_watchpoint_event_set.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/event/_watchpoint_event_set.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_a_s_c_i_i___u_code_e_s_c___char_stream.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_a_s_c_i_i___u_code_e_s_c___char_stream.java.i
index 59e5139..fc5f4d2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_a_s_c_i_i___u_code_e_s_c___char_stream.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_a_s_c_i_i___u_code_e_s_c___char_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser.java.i
index 24c5f4f..69206a5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_constants.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_constants.java.i
index e023250..96df803 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_constants.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_constants.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_token_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_token_manager.java.i
index 6a8d659..dc1e25a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_token_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_expression_parser_token_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_l_value.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_l_value.java.i
index ae22557..346f3d4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_l_value.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_l_value.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_parse_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_parse_exception.java.i
index 4ebc9d8..9c838b2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_parse_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_parse_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token.java.i
index b943933..5099829 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token_mgr_error.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token_mgr_error.java.i
index 619a5e2..2237f79 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token_mgr_error.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/expr/_token_mgr_error.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_application_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_application_tool.java.i
index 6219438..af5578d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_application_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_application_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_manager.java.i
index a3fa7d2..1606a9d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_tree_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_tree_tool.java.i
index 44ce37b..eae2936 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_tree_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_class_tree_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_interpreter.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_interpreter.java.i
index 0fa3ad9..6f35e96 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_interpreter.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_interpreter.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_tool.java.i
index c3abe22..5aa817f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_command_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_listener.java.i
index d1e8e3d..a1b15e0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_manager.java.i
index b6e7396..963150b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_context_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_current_frame_changed_event.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_current_frame_changed_event.java.i
index f6f65d6..887d886 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_current_frame_changed_event.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_current_frame_changed_event.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_environment.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_environment.java.i
index bb80e41..a9e124a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_environment.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_environment.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_g_u_i.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_g_u_i.java.i
index 062ee44..4a51669 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_g_u_i.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_g_u_i.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_icons.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_icons.java.i
index 55aaa05..e7a516b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_icons.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_icons.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_file_filter.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_file_filter.java.i
index 1f9d736..7a35f22 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_file_filter.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_file_filter.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_menu_bar.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_menu_bar.java.i
index b5041ac..3ba7fcf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_menu_bar.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_menu_bar.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_tool_bar.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_tool_bar.java.i
index 793465c..e6ca9fe 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_tool_bar.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_j_d_b_tool_bar.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_launch_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_launch_tool.java.i
index 1cc5cee..c71b2d3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_launch_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_launch_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_list_model.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_list_model.java.i
index 8997173..388988e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_list_model.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_list_model.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_tool.java.i
index 73b8f59..36f3038 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_monitor_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_output_sink.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_output_sink.java.i
index 4d2df8d..daa1d25 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_output_sink.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_output_sink.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_search_path.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_search_path.java.i
index f45bc72..11365d2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_search_path.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_search_path.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_single_leaf_tree_selection_model.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_single_leaf_tree_selection_model.java.i
index cfaaa22..a30bb30 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_single_leaf_tree_selection_model.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_single_leaf_tree_selection_model.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_listener.java.i
index 5e66d2f..7af5047 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_manager.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_manager.java.i
index 9b68035..3fbc171 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_manager.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_manager.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_model.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_model.java.i
index b703ca1..4d2ba18 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_model.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_model.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tool.java.i
index ea76ad0..fdf2600 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tree_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tree_tool.java.i
index f029ad9..3e1c101 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tree_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_source_tree_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_sourcepath_changed_event.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_sourcepath_changed_event.java.i
index f8cca03..183da1e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_sourcepath_changed_event.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_sourcepath_changed_event.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_stack_trace_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_stack_trace_tool.java.i
index ae9ee52..7c551db 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_stack_trace_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_stack_trace_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_thread_tree_tool.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_thread_tree_tool.java.i
index d0df816..4459978 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_thread_tree_tool.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_thread_tree_tool.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script.java.i
index aea6f59..1bd3291 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_output_listener.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_output_listener.java.i
index 50384b5..e77dafd 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_output_listener.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_output_listener.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_writer.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_writer.java.i
index 278d34d..1dafb02 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_writer.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/gui/_type_script_writer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_access_watchpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_access_watchpoint_spec.java.i
index 5f715b0..a574b37 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_access_watchpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_access_watchpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_ambiguous_method_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_ambiguous_method_exception.java.i
index aa06618..de73ad2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_ambiguous_method_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_ambiguous_method_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_breakpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_breakpoint_spec.java.i
index 5642028..7c944ac 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_breakpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_breakpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_commands.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_commands.java.i
index 98c992f..0a4277b 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_commands.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_commands.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_env.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_env.java.i
index ec12b70..16e945c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_env.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_env.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_handler.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_handler.java.i
index 5109e8a..26a8fcf 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_handler.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_handler.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_notifier.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_notifier.java.i
index a1e67e2..f223042 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_notifier.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_notifier.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec.java.i
index 4bb3193..f7ef35a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec_list.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec_list.java.i
index a19555f..6a71ca4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec_list.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_event_request_spec_list.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_exception_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_exception_spec.java.i
index 836c448..551ce3a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_exception_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_exception_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_line_not_found_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_line_not_found_exception.java.i
index 748323c..466d196 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_line_not_found_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_line_not_found_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_malformed_member_name_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_malformed_member_name_exception.java.i
index 7277794..94e3366 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_malformed_member_name_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_malformed_member_name_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_message_output.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_message_output.java.i
index d92bf7d..eeaa2b7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_message_output.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_message_output.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_modification_watchpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_modification_watchpoint_spec.java.i
index 9ba30a0..b70c193 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_modification_watchpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_modification_watchpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_pattern_reference_type_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_pattern_reference_type_spec.java.i
index 5cb5f83..21bcf86 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_pattern_reference_type_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_pattern_reference_type_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_reference_type_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_reference_type_spec.java.i
index 1ab6cda..babba37 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_reference_type_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_reference_type_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_source_mapper.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_source_mapper.java.i
index 61d2cb0..ada63f1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_source_mapper.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_source_mapper.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y.java.i
index fb99c21..36515d0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources.java.i
index 7dd5172..c8ab1d7 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__ja.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__ja.java.i
index d703a0d..8db1921 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__ja.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__ja.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__zh___c_n.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__zh___c_n.java.i
index e20681f..e014f3d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__zh___c_n.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_t_t_y_resources__zh___c_n.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_group_iterator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_group_iterator.java.i
index ff134e7..005bf18 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_group_iterator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_group_iterator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_info.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_info.java.i
index 4d9177e..9b309d4 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_info.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_info.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_iterator.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_iterator.java.i
index af063da..ba26f3e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_iterator.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_thread_iterator.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_connection.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_connection.java.i
index 921aa8f..d32e9df 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_connection.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_connection.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_not_connected_exception.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_not_connected_exception.java.i
index 79b6a1b..532da39 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_not_connected_exception.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_v_m_not_connected_exception.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_watchpoint_spec.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_watchpoint_spec.java.i
index 6b28271..acb6a29 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_watchpoint_spec.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/debug/tty/_watchpoint_spec.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_event_thread.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_event_thread.java.i
index d99f7e2..ec5a950 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_event_thread.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_event_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_stream_redirect_thread.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_stream_redirect_thread.java.i
index e1dd4aa..f42ef10 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_stream_redirect_thread.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_stream_redirect_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_trace.java.i b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_trace.java.i
index 98e714e..ecc5d4a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_trace.java.i and b/jdk/.hg/store/data/src/share/classes/com/sun/tools/example/trace/_trace.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i
index 5296863..11217e2 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_a_w_t_key_stroke.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_buffer_capabilities.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_buffer_capabilities.java.i
index beb1654..e66dae8 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_buffer_capabilities.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_buffer_capabilities.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i
index 7ee8600..c35c6fc 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_component.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i
index f83dd32..8c773e0 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_event_dispatch_thread.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_event_queue.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_event_queue.java.i
index 3289cd5..74e8086 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_event_queue.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_event_queue.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_grid_bag_constraints.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_grid_bag_constraints.java.i
index e489388..a28abd5 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_grid_bag_constraints.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_grid_bag_constraints.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_image_capabilities.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_image_capabilities.java.i
index 8deb196..1b97820 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_image_capabilities.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_image_capabilities.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_insets.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_insets.java.i
index cc47aca..c27397e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_insets.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_insets.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_job_attributes.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_job_attributes.java.i
index fdac4d7..af36f3d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_job_attributes.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_job_attributes.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_page_attributes.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_page_attributes.java.i
index a91c27f..6a1091f 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_page_attributes.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_page_attributes.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/_rendering_hints.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/_rendering_hints.java.i
index 2074cbc..5108c57 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/_rendering_hints.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/_rendering_hints.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/font/_text_layout.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/font/_text_layout.java.i
index b393877..844c366 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/font/_text_layout.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/font/_text_layout.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_affine_transform.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_affine_transform.java.i
index f49d950..eb45d5a 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_affine_transform.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_affine_transform.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_cubic_curve2_d.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_cubic_curve2_d.java.i
index daa8a0b..fc56f6d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_cubic_curve2_d.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_cubic_curve2_d.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_dimension2_d.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_dimension2_d.java.i
index 4cc641f..0559620 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_dimension2_d.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_dimension2_d.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_line2_d.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_line2_d.java.i
index 93a82cc..a725f0e 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_line2_d.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_line2_d.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_point2_d.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_point2_d.java.i
index 7a3f401..08aaf53 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_point2_d.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_point2_d.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_quad_curve2_d.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_quad_curve2_d.java.i
index 5302632..4d1e348 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_quad_curve2_d.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_quad_curve2_d.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_rectangular_shape.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_rectangular_shape.java.i
index e828005..b2ca156 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/geom/_rectangular_shape.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/geom/_rectangular_shape.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/image/_image_filter.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/image/_image_filter.java.i
index ad5f170..562bd54 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/image/_image_filter.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/image/_image_filter.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/awt/image/_kernel.java.i b/jdk/.hg/store/data/src/share/classes/java/awt/image/_kernel.java.i
index a02195b..67c15ce 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/awt/image/_kernel.java.i and b/jdk/.hg/store/data/src/share/classes/java/awt/image/_kernel.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_buffered_reader.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_buffered_reader.java.i
index 70b6a42..2809de1 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_buffered_reader.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_buffered_reader.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_buffered_writer.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_buffered_writer.java.i
index cf993d4..f9ed298 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_buffered_writer.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_buffered_writer.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_closeable.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_closeable.java.i
index d69bb05..39b6840 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_closeable.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_closeable.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_file_input_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_file_input_stream.java.i
index 6502331..1352e89 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_file_input_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_file_input_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_file_output_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_file_output_stream.java.i
index 09f9f1d..92edfd3 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_file_output_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_file_output_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_filter_output_stream.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_filter_output_stream.java.i
index f42e6fd..d6804ba 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_filter_output_stream.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_filter_output_stream.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i
index 57f68eb..62b9e9d 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_object_stream_class.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i b/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i
index bcfdd8a..e986f22 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i and b/jdk/.hg/store/data/src/share/classes/java/io/_random_access_file.java.i differ
diff --git a/jdk/.hg/store/data/src/share/classes/java/lang/_auto_closeable.java.i b/jdk/.hg/store/data/src/share/classes/java/lang/_auto_closeable.java.i
index 97559e2..84ac67c 100644
Binary files a/jdk/.hg/store/data/src/share/classes/java/lang/_auto_cl